* [gentoo-commits] repo/gentoo:master commit in: app-misc/brewtarget/, app-misc/brewtarget/files/
@ 2025-02-19 21:17 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2025-02-19 21:17 UTC (permalink / raw
To: gentoo-commits
commit: f408fff21e7bbab0c4c7ca2925fb9ba7e47c74d9
Author: Christopher Byrne <salah.coronya <AT> gmail <DOT> com>
AuthorDate: Fri Feb 16 05:45:16 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 19 21:16:54 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f408fff2
app-misc/brewtarget: Add 4.0.17
Closes: https://bugs.gentoo.org/609056
Closes: https://bugs.gentoo.org/943181
Signed-off-by: Christopher Byrne <salah.coronya <AT> gmail.com>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-misc/brewtarget/Manifest | 1 +
app-misc/brewtarget/brewtarget-4.0.17.ebuild | 52 ++++++++++++++++++++++
.../brewtarget-4.0.17-dont-touch-CFLAGS.patch | 13 ++++++
.../files/brewtarget-4.0.17-find-lupdate.patch | 15 +++++++
.../files/brewtarget-4.0.17-fix-docdir.patch | 13 ++++++
.../brewtarget-4.0.17-no-boost-libbacktrace.patch | 49 ++++++++++++++++++++
.../brewtarget-4.0.17-silence-compiler-noise.patch | 49 ++++++++++++++++++++
.../brewtarget-4.0.17-unbundle-valijson.patch | 29 ++++++++++++
8 files changed, 221 insertions(+)
diff --git a/app-misc/brewtarget/Manifest b/app-misc/brewtarget/Manifest
index f73d703c8b43..fe2144aced59 100644
--- a/app-misc/brewtarget/Manifest
+++ b/app-misc/brewtarget/Manifest
@@ -1 +1,2 @@
+DIST brewtarget-4.0.17.tar.gz 14504859 BLAKE2B 8362f75509faa80a426cb1475333d818e43ca159ee7048361672fd70fe4ebe16ab37d088fecc70953c6e59b51a8c7c83639c210dabd419b55316bde2b02fb808 SHA512 cc8d8fb0b02ec3dbc581d4055b9b46c013795479832340309da5ca19b4a28bad96d4614fe57647281c0e59f1e0d1d6ac5822f5f2b759b1023efd83e8b6c1618b
DIST brewtarget_2.3.1.orig.tar.xz 9449200 BLAKE2B 00eda709c6665b2353380d013d55a59068d79f70368e843296f43d2f947c741ed526d4f6820f18c4d5e96866274bce76b2235cc50595882f58f397f651858bf3 SHA512 2ff29496df6df1b4507594905f5b3cdedd472a3e767c5f5dda00d306d092a7bec6f9d67350a830416f0ab457553339ba2f9dd2ea8476ed1dfa7dd4c49adda086
diff --git a/app-misc/brewtarget/brewtarget-4.0.17.ebuild b/app-misc/brewtarget/brewtarget-4.0.17.ebuild
new file mode 100644
index 000000000000..b98b22546f71
--- /dev/null
+++ b/app-misc/brewtarget/brewtarget-4.0.17.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# All tests currently timeout even with a large timeout multiliplier
+# so they are commented out and disabled for now
+
+EAPI=8
+
+inherit meson xdg
+
+DESCRIPTION="Application to create and manage beer recipes"
+HOMEPAGE="https://www.brewtarget.beer/"
+SRC_URI="https://github.com/Brewtarget/brewtarget/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3 WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+ dev-cpp/valijson
+ dev-qt/qttools:6[linguist]
+ virtual/pandoc
+"
+DEPEND="
+ dev-libs/boost:=[stacktrace]
+ dev-libs/openssl:=
+ dev-libs/xalan-c
+ dev-libs/xerces-c
+ dev-qt/qtbase:6[gui,network,sql,sqlite,widgets,xml]
+ dev-qt/qtmultimedia:6
+ dev-qt/qtsvg:6
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ # This patch must come first. The next patch requires it.
+ "${FILESDIR}/${PN}-4.0.17-no-boost-libbacktrace.patch"
+ "${FILESDIR}/${PN}-4.0.17-unbundle-valijson.patch"
+ "${FILESDIR}/${PN}-4.0.17-find-lupdate.patch"
+ "${FILESDIR}/${PN}-4.0.17-fix-docdir.patch"
+ # These 2 patches must come last
+ # sed -i -e "/^[^#]/ s/static : true/static : false/g" meson.build
+ "${FILESDIR}/${PN}-4.0.17-silence-compiler-noise.patch"
+ # sed -i -e "s/if compiler.get_id() == 'gcc'/if false/" meson.build
+ "${FILESDIR}/${PN}-4.0.17-dont-touch-CFLAGS.patch"
+)
+
+src_test() {
+ local -x QT_QPA_PLATFORM=offscreen
+
+ meson_src_test
+}
diff --git a/app-misc/brewtarget/files/brewtarget-4.0.17-dont-touch-CFLAGS.patch b/app-misc/brewtarget/files/brewtarget-4.0.17-dont-touch-CFLAGS.patch
new file mode 100644
index 000000000000..36d62865329e
--- /dev/null
+++ b/app-misc/brewtarget/files/brewtarget-4.0.17-dont-touch-CFLAGS.patch
@@ -0,0 +1,13 @@
+diff --git a/meson.build b/meson.build
+index 4952a515..d22a6cac 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1568,7 +1568,7 @@ endif
+ #=======================================================================================================================
+ #========================================= Compiler-specific settings & flags ==========================================
+ #=======================================================================================================================
+-if compiler.get_id() == 'gcc'
++if false
+ #
+ # -g3 should give even more debugging information than -g (which is equivalent to -g2)
+ #
diff --git a/app-misc/brewtarget/files/brewtarget-4.0.17-find-lupdate.patch b/app-misc/brewtarget/files/brewtarget-4.0.17-find-lupdate.patch
new file mode 100644
index 000000000000..393e16b08cd6
--- /dev/null
+++ b/app-misc/brewtarget/files/brewtarget-4.0.17-find-lupdate.patch
@@ -0,0 +1,15 @@
+diff --git a/meson.build b/meson.build
+index 506e5aa0..0ea58970 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1272,7 +1272,9 @@ if host_machine.system() == 'windows'
+ elif host_machine.system() == 'linux'
+ lupdate_name = 'lupdate'
+ endif
+-lupdate_executable = find_program(lupdate_name, required : true)
++lupdate_executable = find_program(lupdate_name,
++ dirs: qtCommonDependencies.get_variable(pkgconfig: 'bindir'),
++ required : true)
+
+ #
+ # Call lupdate to ensure the .ts files are synced with the source code. We need:
diff --git a/app-misc/brewtarget/files/brewtarget-4.0.17-fix-docdir.patch b/app-misc/brewtarget/files/brewtarget-4.0.17-fix-docdir.patch
new file mode 100644
index 000000000000..2548810910e9
--- /dev/null
+++ b/app-misc/brewtarget/files/brewtarget-4.0.17-fix-docdir.patch
@@ -0,0 +1,13 @@
+diff --git a/meson.build b/meson.build
+index 506e5aa0..04b2c81f 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1205,7 +1205,7 @@ filesToInstall_license = 'LICENSE'
+ if host_machine.system() == 'linux'
+ #============================================= Linux Install Directories ============================================
+ installSubDir_data = 'share/' + projectName
+- installSubDir_doc = 'share/doc/' + projectName
++ installSubDir_doc = 'share/doc/' + projectName + '-' + meson.project_version()
+ installSubDir_bin = 'bin'
+ # According to https://specifications.freedesktop.org/menu-spec/menu-spec-1.0.html#paths, .desktop files need to live
+ # in one of the $XDG_DATA_DIRS/applications/. (Note that $XDG_DATA_DIRS is a colon-separated list of directories,
diff --git a/app-misc/brewtarget/files/brewtarget-4.0.17-no-boost-libbacktrace.patch b/app-misc/brewtarget/files/brewtarget-4.0.17-no-boost-libbacktrace.patch
new file mode 100644
index 000000000000..77dee642e4da
--- /dev/null
+++ b/app-misc/brewtarget/files/brewtarget-4.0.17-no-boost-libbacktrace.patch
@@ -0,0 +1,49 @@
+diff --git a/meson.build b/meson.build
+index 506e5aa0..a044596d 100644
+--- a/meson.build
++++ b/meson.build
+@@ -419,11 +419,6 @@ qtTestRunnerDependencies = dependency('qt6', version : minVersionOfQt, modules:
+ # For Boost, per https://mesonbuild.com/Dependencies.html#boost, we only need to supply module names for libraries we
+ # need to link against. For the header-only Boost libraries, the 'boost' dependency suffices.
+ boostModules = []
+-if host_machine.system() == 'linux'
+- boostModules += 'stacktrace_backtrace'
+- add_global_arguments('-DBOOST_STACKTRACE_LINK', language : 'cpp')
+- add_global_arguments('-DBOOST_STACKTRACE_USE_BACKTRACE', language : 'cpp')
+-endif
+ boostDependency = dependency('boost',
+ version : '>=1.79.0',
+ modules : boostModules,
+@@ -479,14 +474,6 @@ if host_machine.system() != 'windows'
+ endif
+ endif
+
+-# Note that, unlike, say, the parameters to include_directories(), the dirs argument to find_library() must be absolute
+-# paths
+-libbacktraceDir = join_paths(meson.project_source_root(), 'third-party/libbacktrace/.libs')
+-backtraceDependency = compiler.find_library('backtrace',
+- required : true,
+- static : true,
+- dirs : [libbacktraceDir])
+-
+ #======================================== Find the other libraries we depend on ========================================
+ #
+ # See https://mesonbuild.com/Reference-manual_returned_dep.html for what info we can pull from a dependency object
+@@ -537,7 +524,6 @@ message('OpenSSL Library:', openSslDependency.name(), 'found =', openSslDependen
+
+ #==================================================== Other headers ====================================================
+ # Other directories to search in for headers. Meson will barf an error if any of these directories does not exist.
+-includeDirs = include_directories('src', 'third-party/valijson/include', 'third-party/libbacktrace')
+
+
+ #=======================================================================================================================
+@@ -1311,8 +1297,7 @@ commonDependencies = [qtCommonDependencies,
+ xalanDependency,
+ boostDependency,
+ dlDependency,
+- openSslDependency, # This isn't strictly needed for the testRunner, but no harm comes from including it
+- backtraceDependency]
++ openSslDependency] # This isn't strictly needed for the testRunner, but no harm comes from including it
+ mainExeDependencies = commonDependencies + qtMainExeDependencies
+ testRunnerDependencies = commonDependencies + qtTestRunnerDependencies
+
diff --git a/app-misc/brewtarget/files/brewtarget-4.0.17-silence-compiler-noise.patch b/app-misc/brewtarget/files/brewtarget-4.0.17-silence-compiler-noise.patch
new file mode 100644
index 000000000000..bd96184d24fc
--- /dev/null
+++ b/app-misc/brewtarget/files/brewtarget-4.0.17-silence-compiler-noise.patch
@@ -0,0 +1,49 @@
+diff --git a/meson.build b/meson.build
+index 4952a515..17b99d26 100644
+--- a/meson.build
++++ b/meson.build
+@@ -343,7 +343,7 @@ qtCommonDependencies = dependency('qt6',
+ 'Widgets',
+ 'Xml'], # TBD: Not sure we need this any more
+ include_type : 'system',
+- static : true)
++ static : false)
+ # The Qt Gui module is only needed for the main program. (We don't want the tests to try to load it or it could barf
+ # in a GitHub action that does not have a display running.)
+ qtMainExeDependencies = dependency('qt6', version : minVersionOfQt, modules: ['Gui'])
+@@ -422,7 +422,7 @@ boostModules = []
+ boostDependency = dependency('boost',
+ version : '>=1.79.0',
+ modules : boostModules,
+- static : true)
++ static : false)
+ message('Boost:', boostDependency.name(), 'found =', boostDependency.found(), 'version =', boostDependency.version())
+
+ #
+@@ -489,7 +489,7 @@ endif
+ xercesDependency = dependency('XercesC',
+ version : '>=3.2.2',
+ required : true,
+- static : true)
++ static : false)
+ xercesLibPaths = xercesDependency.get_variable(cmake : 'PACKAGE_LIBRARIES')
+ message('Xerces Library:', xercesDependency.name(), 'found =', xercesDependency.found(),
+ 'version =', xercesDependency.version(), 'path(s)=', xercesLibPaths)
+@@ -497,7 +497,7 @@ sharedLibraryPaths += xercesLibPaths
+ xalanDependency = dependency('XalanC',
+ version : '>=1.11.0',
+ required : true,
+- static : true)
++ static : false)
+ xalanLibPaths = xalanDependency.get_variable(cmake : 'PACKAGE_LIBRARIES')
+ message('Xalan Library:', xalanDependency.name(), 'found =', xalanDependency.found(),
+ 'version =', xalanDependency.version(), 'path(s)=', xalanLibPaths)
+@@ -512,7 +512,7 @@ sharedLibraryPaths += xalanLibPaths
+ openSslDependency = dependency('OpenSSL',
+ version : '>=3.0.2',
+ required : true,
+- static : true)
++ static : false)
+ #openSslLibPaths = openSslDependency.get_variable(cmake : 'PACKAGE_LIBRARIES')
+ message('OpenSSL Library:', openSslDependency.name(), 'found =', openSslDependency.found(),
+ 'version =', openSslDependency.version())
diff --git a/app-misc/brewtarget/files/brewtarget-4.0.17-unbundle-valijson.patch b/app-misc/brewtarget/files/brewtarget-4.0.17-unbundle-valijson.patch
new file mode 100644
index 000000000000..f6e5475441ee
--- /dev/null
+++ b/app-misc/brewtarget/files/brewtarget-4.0.17-unbundle-valijson.patch
@@ -0,0 +1,29 @@
+diff --git a/meson.build b/meson.build
+index a044596d..381a7d79 100644
+--- a/meson.build
++++ b/meson.build
+@@ -519,12 +519,10 @@ message('OpenSSL Library:', openSslDependency.name(), 'found =', openSslDependen
+ #sharedLibraryPaths += openSslLibPaths
+
+ #====================================================== Valijson =======================================================
+-# Don't need to do anything special, other than set include directories below, as it's header-only and we pull it in as
+-# a Git submodule.
+-
++valijsonDependency = declare_dependency(include_directories: get_option('prefix')/get_option('includedir')/'valijson')
+ #==================================================== Other headers ====================================================
+ # Other directories to search in for headers. Meson will barf an error if any of these directories does not exist.
+-
++includeDirs = include_directories('src', 'third-party/libbacktrace')
+
+ #=======================================================================================================================
+ #============================================= Extra Windows dependencies ==============================================
+@@ -1297,7 +1295,8 @@ commonDependencies = [qtCommonDependencies,
+ xalanDependency,
+ boostDependency,
+ dlDependency,
+- openSslDependency] # This isn't strictly needed for the testRunner, but no harm comes from including it
++ openSslDependency, # This isn't strictly needed for the testRunner, but no harm comes from including it
++ valijsonDependency]
+ mainExeDependencies = commonDependencies + qtMainExeDependencies
+ testRunnerDependencies = commonDependencies + qtTestRunnerDependencies
+
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-misc/brewtarget/, app-misc/brewtarget/files/
@ 2025-02-19 21:17 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2025-02-19 21:17 UTC (permalink / raw
To: gentoo-commits
commit: 348b1ae5d51facdda00a0a956d25fb3294e6aa2d
Author: Christopher Byrne <salah.coronya <AT> gmail <DOT> com>
AuthorDate: Mon Nov 11 20:40:09 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 19 21:16:54 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=348b1ae5
app-misc/brewtarget: drop 2.3.1-r1
Signed-off-by: Christopher Byrne <salah.coronya <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/39278
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-misc/brewtarget/Manifest | 1 -
app-misc/brewtarget/brewtarget-2.3.1-r1.ebuild | 62 --------
.../files/brewtarget-2.3.1-no-compress-docs.patch | 22 ---
.../files/brewtarget-2.3.1-no-qtwebkit.patch | 164 ---------------------
4 files changed, 249 deletions(-)
diff --git a/app-misc/brewtarget/Manifest b/app-misc/brewtarget/Manifest
index fe2144aced59..5e4d7088e6e9 100644
--- a/app-misc/brewtarget/Manifest
+++ b/app-misc/brewtarget/Manifest
@@ -1,2 +1 @@
DIST brewtarget-4.0.17.tar.gz 14504859 BLAKE2B 8362f75509faa80a426cb1475333d818e43ca159ee7048361672fd70fe4ebe16ab37d088fecc70953c6e59b51a8c7c83639c210dabd419b55316bde2b02fb808 SHA512 cc8d8fb0b02ec3dbc581d4055b9b46c013795479832340309da5ca19b4a28bad96d4614fe57647281c0e59f1e0d1d6ac5822f5f2b759b1023efd83e8b6c1618b
-DIST brewtarget_2.3.1.orig.tar.xz 9449200 BLAKE2B 00eda709c6665b2353380d013d55a59068d79f70368e843296f43d2f947c741ed526d4f6820f18c4d5e96866274bce76b2235cc50595882f58f397f651858bf3 SHA512 2ff29496df6df1b4507594905f5b3cdedd472a3e767c5f5dda00d306d092a7bec6f9d67350a830416f0ab457553339ba2f9dd2ea8476ed1dfa7dd4c49adda086
diff --git a/app-misc/brewtarget/brewtarget-2.3.1-r1.ebuild b/app-misc/brewtarget/brewtarget-2.3.1-r1.ebuild
deleted file mode 100644
index bbae6d873d61..000000000000
--- a/app-misc/brewtarget/brewtarget-2.3.1-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="ca cs da de el en es et eu fr gl hu it lv nb nl pl pt ru sr sv tr zh"
-inherit cmake plocale
-
-DESCRIPTION="Application to create and manage beer recipes"
-HOMEPAGE="http://www.brewtarget.org/"
-SRC_URI="https://github.com/Brewtarget/${PN}/releases/download/v${PV}/${PN}_${PV}.orig.tar.xz"
-
-LICENSE="GPL-3 WTFPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-BDEPEND="
- dev-qt/linguist-tools:5
-"
-DEPEND="
- dev-qt/qtcore:5
- dev-qt/qtdeclarative:5
- dev-qt/qtgui:5
- dev-qt/qtmultimedia:5
- dev-qt/qtnetwork:5
- dev-qt/qtprintsupport:5
- dev-qt/qtsql:5[sqlite]
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${P}-no-qtwebkit.patch"
- "${FILESDIR}/${P}-no-compress-docs.patch"
-)
-
-remove_locale() {
- sed -i -e "/bt_${1}\.ts/d" CMakeLists.txt || die
-}
-
-src_prepare() {
- cmake_src_prepare
-
- plocale_find_changes translations bt_ .ts
- plocale_for_each_disabled_locale remove_locale
-
- # Tests are bogus, don't build them
- sed -i -e '/Qt5Test/d' CMakeLists.txt || die
- sed -i -e '/=Tests=/,/=Installs=/d' src/CMakeLists.txt || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}
- -DDO_RELEASE_BUILD=ON
- -DNO_MESSING_WITH_FLAGS=ON
- )
- cmake_src_configure
-}
diff --git a/app-misc/brewtarget/files/brewtarget-2.3.1-no-compress-docs.patch b/app-misc/brewtarget/files/brewtarget-2.3.1-no-compress-docs.patch
deleted file mode 100644
index f437a72e5917..000000000000
--- a/app-misc/brewtarget/files/brewtarget-2.3.1-no-compress-docs.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/CMakeLists.txt 2020-02-17 02:07:48.201051509 +0100
-+++ b/CMakeLists.txt 2020-02-17 02:10:26.790061722 +0100
-@@ -176,18 +176,7 @@
- ENDIF()
-
- #=========================Changelog custom target==============================
--FIND_PROGRAM( GZIP_CMD gzip )
--IF( GZIP_CMD )
-- SET( CHANGELOG_UNCOMPRESSED "${CMAKE_CURRENT_SOURCE_DIR}/CHANGES.markdown" )
-- SET( CHANGELOG "${CMAKE_CURRENT_BINARY_DIR}/changelog.gz" )
-- ADD_CUSTOM_COMMAND(
-- OUTPUT ${CHANGELOG}
-- COMMAND ${GZIP_CMD} -9 -n -c ${CHANGELOG_UNCOMPRESSED} > ${CHANGELOG}
-- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-- MAIN_DEPENDENCY ${CHANGELOG_UNCOMPRESSED}
-- )
-- ADD_CUSTOM_TARGET(changelog ALL DEPENDS ${CHANGELOG})
--ENDIF()
-+SET( CHANGELOG "${CMAKE_CURRENT_SOURCE_DIR}/CHANGES.markdown" )
-
- #=========================Detect Debian========================================
- IF( EXISTS "/etc/debian_version" )
diff --git a/app-misc/brewtarget/files/brewtarget-2.3.1-no-qtwebkit.patch b/app-misc/brewtarget/files/brewtarget-2.3.1-no-qtwebkit.patch
deleted file mode 100644
index ec149c8f4108..000000000000
--- a/app-misc/brewtarget/files/brewtarget-2.3.1-no-qtwebkit.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-From 761bb3882c4c243a49279b67e53c87e5e5d2928f Mon Sep 17 00:00:00 2001
-From: Mik Firestone <mikfire@gmail.com>
-Date: Sat, 19 Mar 2016 23:01:54 -0400
-Subject: [PATCH 1/2] Closes #127 - TravisCI can't find webkit
-
-Qt 5.6 did away with the web kit, but none of our build environment have the
-replacement yet. This patch replaces all the WebDocs with TextBrowser, which
-seems to work and should compile.
-
-I removed the webkit requirement from the CMakeLists file, but I wasn't sure
-if the webkitwidgets needed axed as well. Although writing it out makes the
-answer somewhat obvious.
----
- src/BrewDayScrollWidget.cpp | 2 +-
- src/BrewDayScrollWidget.h | 4 ++--
- src/BrewDayWidget.cpp | 4 ++--
- src/BrewDayWidget.h | 4 ++--
- src/CMakeLists.txt | 2 --
- src/RecipeFormatter.cpp | 2 +-
- src/RecipeFormatter.h | 4 ++--
- 7 files changed, 10 insertions(+), 12 deletions(-)
-
-diff --git a/src/BrewDayScrollWidget.cpp b/src/BrewDayScrollWidget.cpp
-index 760d2dc5..0846d791 100644
---- a/src/BrewDayScrollWidget.cpp
-+++ b/src/BrewDayScrollWidget.cpp
-@@ -35,7 +35,7 @@
- #include "mash.h"
-
- BrewDayScrollWidget::BrewDayScrollWidget(QWidget* parent)
-- : QWidget(parent), doc(new QWebView())
-+ : QWidget(parent), doc(new QTextBrowser())
- {
- setupUi(this);
- setObjectName("BrewDayScrollWidget");
---- a/src/BrewDayScrollWidget.h
-+++ b/src/BrewDayScrollWidget.h
-@@ -27,7 +27,7 @@ class BrewDayScrollWidget;
- #include "ui_brewDayScrollWidget.h"
- #include <QWidget>
- #include <QSize>
--#include <QWebView>
-+#include <QTextBrowser>
- #include <QPrinter>
- #include <QPrintDialog>
- #include <QFile>
-@@ -90,7 +90,7 @@ private slots:
-
- Recipe* recObs;
- QPrinter* printer;
-- QWebView* doc;
-+ QTextBrowser* doc;
- //! Internal list of recipe instructions, always sorted by instruction number.
- QList<Instruction*> recIns;
-
---- a/src/BrewDayWidget.cpp
-+++ b/src/BrewDayWidget.cpp
-@@ -37,7 +37,7 @@
-
- // NOTE: QPrinter has no parent? Will it get destroyed properly?
- BrewDayWidget::BrewDayWidget(QWidget* parent) :
-- QWidget(parent), recObs(0), printer(new QPrinter()), doc(new QWebView(this))
-+ QWidget(parent), recObs(0), printer(new QPrinter()), doc(new QTextBrowser(this))
- {
- setupUi(this);
-
-@@ -291,7 +291,7 @@ void BrewDayWidget::pushInstructionPrint()
- QString pDoc;
- QPrintDialog *dialog = new QPrintDialog(printer, this);
-
-- /* Instantiate the Webview and then connect its signal */
-+ /* Instantiate the TextBrowser and then connect its signal */
- connect( doc, SIGNAL(loadFinished(bool)), this, SLOT(loadComplete(bool)) );
-
- dialog->setWindowTitle(tr("Print Document"));
---- a/src/BrewDayWidget.h
-+++ b/src/BrewDayWidget.h
-@@ -27,7 +27,7 @@ class BrewDayWidget;
- #include "ui_brewDayWidget.h"
- #include <QWidget>
- #include <QSize>
--#include <QWebView>
-+#include <QTextBrowser>
- #include <QMetaProperty>
- #include <QVariant>
-
-@@ -70,7 +70,7 @@ public slots:
-
- Recipe* recObs;
- QPrinter* printer;
-- QWebView* doc;
-+ QTextBrowser* doc;
-
- QString cssName;
-
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -424,7 +424,5 @@ SET( QT5_USE_MODULES_LIST
- Sql
- Svg
- Xml
-- WebKit
-- WebKitWidgets
- )
-
-diff --git a/src/RecipeFormatter.cpp b/src/RecipeFormatter.cpp
-index bb6a9295..f8a1ab4c 100644
---- a/src/RecipeFormatter.cpp
-+++ b/src/RecipeFormatter.cpp
-@@ -52,7 +52,7 @@ RecipeFormatter::RecipeFormatter(QObject* parent)
- docDialog->setWindowTitle("Print Preview");
- if( docDialog->layout() == 0 )
- docDialog->setLayout(new QVBoxLayout(docDialog));
-- doc = new QWebView(docDialog);
-+ doc = new QTextBrowser(docDialog);
- docDialog->layout()->addWidget(doc);
- /*
- // Add a print button at the bottom.
---- a/src/RecipeFormatter.h
-+++ b/src/RecipeFormatter.h
-@@ -28,7 +28,7 @@ class RecipeFormatter;
- #include <QObject>
- #include <QPrinter>
- #include <QPrintDialog>
--#include <QWebView>
-+#include <QTextBrowser>
- #include <QDialog>
- #include <QFile>
- #include "recipe.h"
-@@ -114,7 +114,7 @@ public slots:
- Recipe* rec;
-
- QPrinter* printer;
-- QWebView* doc;
-+ QTextBrowser* doc;
- QDialog* docDialog;
- QString cssName;
-
-
-From 3e0223a3b95c0e1169115cd14d0ede7f17c4f30f Mon Sep 17 00:00:00 2001
-From: Mik Firestone <mikfire@gmail.com>
-Date: Sat, 19 Mar 2016 23:09:41 -0400
-Subject: [PATCH 2/2] Missed a few edits.
-
-Missed some entries in the CMakeList files.
----
- CMakeLists.txt | 6 ------
- 1 file changed, 6 deletions(-)
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -153,12 +153,6 @@ INCLUDE_DIRECTORIES(${Qt5Sql_INCLUDE_DIRS})
- FIND_PACKAGE(Qt5Svg REQUIRED)
- INCLUDE_DIRECTORIES(${Qt5Svg_INCLUDE_DIRS})
-
--FIND_PACKAGE(Qt5WebKit REQUIRED)
--INCLUDE_DIRECTORIES(${Qt5WebKit_INCLUDE_DIRS})
--
--FIND_PACKAGE(Qt5WebKitWidgets REQUIRED)
--INCLUDE_DIRECTORIES(${Qt5WebKitWidgets_INCLUDE_DIRS})
--
- FIND_PACKAGE(Qt5Xml REQUIRED)
- INCLUDE_DIRECTORIES(${Qt5Xml_INCLUDE_DIRS})
-
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-misc/brewtarget/, app-misc/brewtarget/files/
@ 2020-02-23 0:32 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2020-02-23 0:32 UTC (permalink / raw
To: gentoo-commits
commit: c2066655d57ee59c27329610c08854a083dd8df3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 17 00:54:22 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 23 00:17:32 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2066655
app-misc/brewtarget: EAPI-7, use cmake.eclass, drop dev-qt/qtwebkit
Fixing QA warning about wrong doc install dir and compressed file along the way.
Closes: https://bugs.gentoo.org/684772
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-misc/brewtarget/brewtarget-2.3.1-r1.ebuild | 62 ++++++++
.../files/brewtarget-2.3.1-no-compress-docs.patch | 22 +++
.../files/brewtarget-2.3.1-no-qtwebkit.patch | 164 +++++++++++++++++++++
3 files changed, 248 insertions(+)
diff --git a/app-misc/brewtarget/brewtarget-2.3.1-r1.ebuild b/app-misc/brewtarget/brewtarget-2.3.1-r1.ebuild
new file mode 100644
index 00000000000..03780974f84
--- /dev/null
+++ b/app-misc/brewtarget/brewtarget-2.3.1-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="ca cs da de el en es et eu fr gl hu it lv nb nl pl pt ru sr sv tr zh"
+inherit cmake l10n
+
+DESCRIPTION="Application to create and manage beer recipes"
+HOMEPAGE="http://www.brewtarget.org/"
+SRC_URI="https://github.com/Brewtarget/${PN}/releases/download/v${PV}/${PN}_${PV}.orig.tar.xz"
+
+LICENSE="GPL-3 WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+BDEPEND="
+ dev-qt/linguist-tools:5
+"
+DEPEND="
+ dev-qt/qtcore:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qtmultimedia:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtsql:5[sqlite]
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-no-qtwebkit.patch"
+ "${FILESDIR}/${P}-no-compress-docs.patch"
+)
+
+remove_locale() {
+ sed -i -e "/bt_${1}\.ts/d" CMakeLists.txt || die
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ l10n_find_plocales_changes translations bt_ .ts
+ l10n_for_each_disabled_locale_do remove_locale
+
+ # Tests are bogus, don't build them
+ sed -i -e '/Qt5Test/d' CMakeLists.txt || die
+ sed -i -e '/=Tests=/,/=Installs=/d' src/CMakeLists.txt || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}
+ -DDO_RELEASE_BUILD=ON
+ -DNO_MESSING_WITH_FLAGS=ON
+ )
+ cmake_src_configure
+}
diff --git a/app-misc/brewtarget/files/brewtarget-2.3.1-no-compress-docs.patch b/app-misc/brewtarget/files/brewtarget-2.3.1-no-compress-docs.patch
new file mode 100644
index 00000000000..f437a72e591
--- /dev/null
+++ b/app-misc/brewtarget/files/brewtarget-2.3.1-no-compress-docs.patch
@@ -0,0 +1,22 @@
+--- a/CMakeLists.txt 2020-02-17 02:07:48.201051509 +0100
++++ b/CMakeLists.txt 2020-02-17 02:10:26.790061722 +0100
+@@ -176,18 +176,7 @@
+ ENDIF()
+
+ #=========================Changelog custom target==============================
+-FIND_PROGRAM( GZIP_CMD gzip )
+-IF( GZIP_CMD )
+- SET( CHANGELOG_UNCOMPRESSED "${CMAKE_CURRENT_SOURCE_DIR}/CHANGES.markdown" )
+- SET( CHANGELOG "${CMAKE_CURRENT_BINARY_DIR}/changelog.gz" )
+- ADD_CUSTOM_COMMAND(
+- OUTPUT ${CHANGELOG}
+- COMMAND ${GZIP_CMD} -9 -n -c ${CHANGELOG_UNCOMPRESSED} > ${CHANGELOG}
+- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+- MAIN_DEPENDENCY ${CHANGELOG_UNCOMPRESSED}
+- )
+- ADD_CUSTOM_TARGET(changelog ALL DEPENDS ${CHANGELOG})
+-ENDIF()
++SET( CHANGELOG "${CMAKE_CURRENT_SOURCE_DIR}/CHANGES.markdown" )
+
+ #=========================Detect Debian========================================
+ IF( EXISTS "/etc/debian_version" )
diff --git a/app-misc/brewtarget/files/brewtarget-2.3.1-no-qtwebkit.patch b/app-misc/brewtarget/files/brewtarget-2.3.1-no-qtwebkit.patch
new file mode 100644
index 00000000000..ec149c8f410
--- /dev/null
+++ b/app-misc/brewtarget/files/brewtarget-2.3.1-no-qtwebkit.patch
@@ -0,0 +1,164 @@
+From 761bb3882c4c243a49279b67e53c87e5e5d2928f Mon Sep 17 00:00:00 2001
+From: Mik Firestone <mikfire@gmail.com>
+Date: Sat, 19 Mar 2016 23:01:54 -0400
+Subject: [PATCH 1/2] Closes #127 - TravisCI can't find webkit
+
+Qt 5.6 did away with the web kit, but none of our build environment have the
+replacement yet. This patch replaces all the WebDocs with TextBrowser, which
+seems to work and should compile.
+
+I removed the webkit requirement from the CMakeLists file, but I wasn't sure
+if the webkitwidgets needed axed as well. Although writing it out makes the
+answer somewhat obvious.
+---
+ src/BrewDayScrollWidget.cpp | 2 +-
+ src/BrewDayScrollWidget.h | 4 ++--
+ src/BrewDayWidget.cpp | 4 ++--
+ src/BrewDayWidget.h | 4 ++--
+ src/CMakeLists.txt | 2 --
+ src/RecipeFormatter.cpp | 2 +-
+ src/RecipeFormatter.h | 4 ++--
+ 7 files changed, 10 insertions(+), 12 deletions(-)
+
+diff --git a/src/BrewDayScrollWidget.cpp b/src/BrewDayScrollWidget.cpp
+index 760d2dc5..0846d791 100644
+--- a/src/BrewDayScrollWidget.cpp
++++ b/src/BrewDayScrollWidget.cpp
+@@ -35,7 +35,7 @@
+ #include "mash.h"
+
+ BrewDayScrollWidget::BrewDayScrollWidget(QWidget* parent)
+- : QWidget(parent), doc(new QWebView())
++ : QWidget(parent), doc(new QTextBrowser())
+ {
+ setupUi(this);
+ setObjectName("BrewDayScrollWidget");
+--- a/src/BrewDayScrollWidget.h
++++ b/src/BrewDayScrollWidget.h
+@@ -27,7 +27,7 @@ class BrewDayScrollWidget;
+ #include "ui_brewDayScrollWidget.h"
+ #include <QWidget>
+ #include <QSize>
+-#include <QWebView>
++#include <QTextBrowser>
+ #include <QPrinter>
+ #include <QPrintDialog>
+ #include <QFile>
+@@ -90,7 +90,7 @@ private slots:
+
+ Recipe* recObs;
+ QPrinter* printer;
+- QWebView* doc;
++ QTextBrowser* doc;
+ //! Internal list of recipe instructions, always sorted by instruction number.
+ QList<Instruction*> recIns;
+
+--- a/src/BrewDayWidget.cpp
++++ b/src/BrewDayWidget.cpp
+@@ -37,7 +37,7 @@
+
+ // NOTE: QPrinter has no parent? Will it get destroyed properly?
+ BrewDayWidget::BrewDayWidget(QWidget* parent) :
+- QWidget(parent), recObs(0), printer(new QPrinter()), doc(new QWebView(this))
++ QWidget(parent), recObs(0), printer(new QPrinter()), doc(new QTextBrowser(this))
+ {
+ setupUi(this);
+
+@@ -291,7 +291,7 @@ void BrewDayWidget::pushInstructionPrint()
+ QString pDoc;
+ QPrintDialog *dialog = new QPrintDialog(printer, this);
+
+- /* Instantiate the Webview and then connect its signal */
++ /* Instantiate the TextBrowser and then connect its signal */
+ connect( doc, SIGNAL(loadFinished(bool)), this, SLOT(loadComplete(bool)) );
+
+ dialog->setWindowTitle(tr("Print Document"));
+--- a/src/BrewDayWidget.h
++++ b/src/BrewDayWidget.h
+@@ -27,7 +27,7 @@ class BrewDayWidget;
+ #include "ui_brewDayWidget.h"
+ #include <QWidget>
+ #include <QSize>
+-#include <QWebView>
++#include <QTextBrowser>
+ #include <QMetaProperty>
+ #include <QVariant>
+
+@@ -70,7 +70,7 @@ public slots:
+
+ Recipe* recObs;
+ QPrinter* printer;
+- QWebView* doc;
++ QTextBrowser* doc;
+
+ QString cssName;
+
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -424,7 +424,5 @@ SET( QT5_USE_MODULES_LIST
+ Sql
+ Svg
+ Xml
+- WebKit
+- WebKitWidgets
+ )
+
+diff --git a/src/RecipeFormatter.cpp b/src/RecipeFormatter.cpp
+index bb6a9295..f8a1ab4c 100644
+--- a/src/RecipeFormatter.cpp
++++ b/src/RecipeFormatter.cpp
+@@ -52,7 +52,7 @@ RecipeFormatter::RecipeFormatter(QObject* parent)
+ docDialog->setWindowTitle("Print Preview");
+ if( docDialog->layout() == 0 )
+ docDialog->setLayout(new QVBoxLayout(docDialog));
+- doc = new QWebView(docDialog);
++ doc = new QTextBrowser(docDialog);
+ docDialog->layout()->addWidget(doc);
+ /*
+ // Add a print button at the bottom.
+--- a/src/RecipeFormatter.h
++++ b/src/RecipeFormatter.h
+@@ -28,7 +28,7 @@ class RecipeFormatter;
+ #include <QObject>
+ #include <QPrinter>
+ #include <QPrintDialog>
+-#include <QWebView>
++#include <QTextBrowser>
+ #include <QDialog>
+ #include <QFile>
+ #include "recipe.h"
+@@ -114,7 +114,7 @@ public slots:
+ Recipe* rec;
+
+ QPrinter* printer;
+- QWebView* doc;
++ QTextBrowser* doc;
+ QDialog* docDialog;
+ QString cssName;
+
+
+From 3e0223a3b95c0e1169115cd14d0ede7f17c4f30f Mon Sep 17 00:00:00 2001
+From: Mik Firestone <mikfire@gmail.com>
+Date: Sat, 19 Mar 2016 23:09:41 -0400
+Subject: [PATCH 2/2] Missed a few edits.
+
+Missed some entries in the CMakeList files.
+---
+ CMakeLists.txt | 6 ------
+ 1 file changed, 6 deletions(-)
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -153,12 +153,6 @@ INCLUDE_DIRECTORIES(${Qt5Sql_INCLUDE_DIRS})
+ FIND_PACKAGE(Qt5Svg REQUIRED)
+ INCLUDE_DIRECTORIES(${Qt5Svg_INCLUDE_DIRS})
+
+-FIND_PACKAGE(Qt5WebKit REQUIRED)
+-INCLUDE_DIRECTORIES(${Qt5WebKit_INCLUDE_DIRS})
+-
+-FIND_PACKAGE(Qt5WebKitWidgets REQUIRED)
+-INCLUDE_DIRECTORIES(${Qt5WebKitWidgets_INCLUDE_DIRS})
+-
+ FIND_PACKAGE(Qt5Xml REQUIRED)
+ INCLUDE_DIRECTORIES(${Qt5Xml_INCLUDE_DIRS})
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-02-19 21:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-02-19 21:17 [gentoo-commits] repo/gentoo:master commit in: app-misc/brewtarget/, app-misc/brewtarget/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2025-02-19 21:17 Andreas Sturmlechner
2020-02-23 0:32 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox