summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2022-05-21 00:25:57 +0100
committerSam James <sam@gentoo.org>2022-05-21 00:25:57 +0100
commit73af150a536fb493d61b4f255ce2ff6d2ec760a1 (patch)
treef5bba4707ec380f2833a493bd0a04b44e959e393 /dev-qt/qthelp
parentdev-python/numpy: add 1.22.4 (diff)
downloadgentoo-73af150a536fb493d61b4f255ce2ff6d2ec760a1.tar.gz
gentoo-73af150a536fb493d61b4f255ce2ff6d2ec760a1.tar.bz2
gentoo-73af150a536fb493d61b4f255ce2ff6d2ec760a1.zip
dev-qt/qthelp: add missing patch
Reported-by: Kobboi Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-qt/qthelp')
-rw-r--r--dev-qt/qthelp/files/qthelp-5.15.4-bogusdep.patch29
-rw-r--r--dev-qt/qthelp/qthelp-5.15.4.ebuild2
2 files changed, 30 insertions, 1 deletions
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