| 1 |
commit: 73af150a536fb493d61b4f255ce2ff6d2ec760a1 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri May 20 23:25:57 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri May 20 23:25:57 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73af150a |
| 7 |
|
| 8 |
dev-qt/qthelp: add missing patch |
| 9 |
|
| 10 |
Reported-by: Kobboi |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-qt/qthelp/files/qthelp-5.15.4-bogusdep.patch | 29 ++++++++++++++++++++++++ |
| 14 |
dev-qt/qthelp/qthelp-5.15.4.ebuild | 2 +- |
| 15 |
2 files changed, 30 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/dev-qt/qthelp/files/qthelp-5.15.4-bogusdep.patch b/dev-qt/qthelp/files/qthelp-5.15.4-bogusdep.patch |
| 18 |
new file mode 100644 |
| 19 |
index 000000000000..bc32959e4ca1 |
| 20 |
--- /dev/null |
| 21 |
+++ b/dev-qt/qthelp/files/qthelp-5.15.4-bogusdep.patch |
| 22 |
@@ -0,0 +1,29 @@ |
| 23 |
+https://invent.kde.org/qt/qt/qttools/-/merge_requests/2 |
| 24 |
+ |
| 25 |
+(Dropped first patch as it seems to be in 5.15.4.) |
| 26 |
+ |
| 27 |
+From: Andreas Sturmlechner <asturm@g.o> |
| 28 |
+Date: Fri, 18 Mar 2022 12:43:18 +0100 |
| 29 |
+Subject: [PATCH 2/2] Drop superfluous network dependency from |
| 30 |
+ assistant/{help,qhelpgenerator}.pro |
| 31 |
+ |
| 32 |
+Signed-off-by: Andreas Sturmlechner <asturm@g.o> |
| 33 |
+--- a/src/assistant/help/help.pro |
| 34 |
++++ b/src/assistant/help/help.pro |
| 35 |
+@@ -1,7 +1,6 @@ |
| 36 |
+ TARGET = QtHelp |
| 37 |
+ |
| 38 |
+ QT = core-private gui widgets sql |
| 39 |
+-QT_PRIVATE = network |
| 40 |
+ |
| 41 |
+ DEFINES += QHELP_LIB |
| 42 |
+ |
| 43 |
+--- a/src/assistant/qhelpgenerator/qhelpgenerator.pro |
| 44 |
++++ b/src/assistant/qhelpgenerator/qhelpgenerator.pro |
| 45 |
+@@ -1,4 +1,4 @@ |
| 46 |
+-QT += network help-private |
| 47 |
++QT += help-private |
| 48 |
+ |
| 49 |
+ QTPLUGIN.platforms = qminimal |
| 50 |
+ QTPLUGIN.sqldrivers = qsqlite |
| 51 |
+GitLab |
| 52 |
|
| 53 |
diff --git a/dev-qt/qthelp/qthelp-5.15.4.ebuild b/dev-qt/qthelp/qthelp-5.15.4.ebuild |
| 54 |
index 0495ddc0e671..c4a559956981 100644 |
| 55 |
--- a/dev-qt/qthelp/qthelp-5.15.4.ebuild |
| 56 |
+++ b/dev-qt/qthelp/qthelp-5.15.4.ebuild |
| 57 |
@@ -23,7 +23,7 @@ DEPEND=" |
| 58 |
RDEPEND="${DEPEND}" |
| 59 |
|
| 60 |
# https://invent.kde.org/qt/qt/qttools/-/merge_requests/2 |
| 61 |
-PATCHES=( "${FILESDIR}/${PN}-5.15.3-bogusdep.patch" ) |
| 62 |
+PATCHES=( "${FILESDIR}/${PN}-5.15.4-bogusdep.patch" ) |
| 63 |
|
| 64 |
QT5_TARGET_SUBDIRS=( |
| 65 |
src/assistant/help |
Archives