[gentoo-commits] repo/gentoo:master commit in: dev-qt/qthelp/, dev-qt/qthelp/files/

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qthelp/, dev-qt/qthelp/files/

[Sam James]

commit:     73af150a536fb493d61b4f255ce2ff6d2ec760a1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri May 20 23:25:57 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 20 23:25:57 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73af150a

dev-qt/qthelp: add missing patch

Reported-by: Kobboi
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-qt/qthelp/files/qthelp-5.15.4-bogusdep.patch | 29 ++++++++++++++++++++++++
 dev-qt/qthelp/qthelp-5.15.4.ebuild               |  2 +-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/dev-qt/qthelp/files/qthelp-5.15.4-bogusdep.patch b/dev-qt/qthelp/files/qthelp-5.15.4-bogusdep.patch
new file mode 100644
index 000000000000..bc32959e4ca1
--- /dev/null
+++ b/dev-qt/qthelp/files/qthelp-5.15.4-bogusdep.patch
@@ -0,0 +1,29 @@
+https://invent.kde.org/qt/qt/qttools/-/merge_requests/2
+
+(Dropped first patch as it seems to be in 5.15.4.)
+
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Fri, 18 Mar 2022 12:43:18 +0100
+Subject: [PATCH 2/2] Drop superfluous network dependency from
+ assistant/{help,qhelpgenerator}.pro
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+--- a/src/assistant/help/help.pro
++++ b/src/assistant/help/help.pro
+@@ -1,7 +1,6 @@
+ TARGET = QtHelp
+ 
+ QT = core-private gui widgets sql
+-QT_PRIVATE = network
+ 
+ DEFINES += QHELP_LIB
+ 
+--- a/src/assistant/qhelpgenerator/qhelpgenerator.pro
++++ b/src/assistant/qhelpgenerator/qhelpgenerator.pro
+@@ -1,4 +1,4 @@
+-QT += network help-private
++QT += help-private
+ 
+ QTPLUGIN.platforms = qminimal
+ QTPLUGIN.sqldrivers = qsqlite
+GitLab

diff --git a/dev-qt/qthelp/qthelp-5.15.4.ebuild b/dev-qt/qthelp/qthelp-5.15.4.ebuild
index 0495ddc0e671..c4a559956981 100644
--- a/dev-qt/qthelp/qthelp-5.15.4.ebuild
+++ b/dev-qt/qthelp/qthelp-5.15.4.ebuild
@@ -23,7 +23,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 # https://invent.kde.org/qt/qt/qttools/-/merge_requests/2
-PATCHES=( "${FILESDIR}/${PN}-5.15.3-bogusdep.patch" )
+PATCHES=( "${FILESDIR}/${PN}-5.15.4-bogusdep.patch" )
 
 QT5_TARGET_SUBDIRS=(
 	src/assistant/help