diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2023-06-13 08:59:12 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2023-06-13 08:59:12 +0200 |
| commit | c9ca2776c7b8773b1080afd985a027b91d600db8 (patch) | |
| tree | 05ecce60993ff407bf431531d788b6954d1231b6 /dev-qt | |
| parent | dev-qt/*: Rebased to 5.15.10 branch (diff) | |
| download | qt-c9ca2776c7b8773b1080afd985a027b91d600db8.tar.gz qt-c9ca2776c7b8773b1080afd985a027b91d600db8.tar.bz2 qt-c9ca2776c7b8773b1080afd985a027b91d600db8.zip | |
dev-qt/qthelp: Drop upstreamed patch
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'dev-qt')
| -rw-r--r-- | dev-qt/qthelp/files/qthelp-5.15.4-bogusdep.patch | 37 | ||||
| -rw-r--r-- | dev-qt/qthelp/qthelp-5.15.10.9999.ebuild | 3 |
2 files changed, 0 insertions, 40 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 deleted file mode 100644 index d5aa932b..00000000 --- a/dev-qt/qthelp/files/qthelp-5.15.4-bogusdep.patch +++ /dev/null @@ -1,37 +0,0 @@ -From ae461db5d111b15ee5bb211b3703cc0832aa1402 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Fri, 18 Mar 2022 12:43:18 +0100 -Subject: [PATCH] Drop superfluous network dependency from - assistant/{help,qhelpgenerator}.pro - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - src/assistant/help/help.pro | 1 - - src/assistant/qhelpgenerator/qhelpgenerator.pro | 2 +- - 2 files changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/assistant/help/help.pro b/src/assistant/help/help.pro -index 800c4a38d..7556f451b 100644 ---- 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 - -diff --git a/src/assistant/qhelpgenerator/qhelpgenerator.pro b/src/assistant/qhelpgenerator/qhelpgenerator.pro -index bb22000c8..415347a00 100644 ---- 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 --- -2.35.1 - diff --git a/dev-qt/qthelp/qthelp-5.15.10.9999.ebuild b/dev-qt/qthelp/qthelp-5.15.10.9999.ebuild index 102a630d..7b9619c5 100644 --- a/dev-qt/qthelp/qthelp-5.15.10.9999.ebuild +++ b/dev-qt/qthelp/qthelp-5.15.10.9999.ebuild @@ -23,9 +23,6 @@ DEPEND=" " RDEPEND="${DEPEND}" -# https://invent.kde.org/qt/qt/qttools/-/merge_requests/2 -PATCHES=( "${FILESDIR}/${PN}-5.15.4-bogusdep.patch" ) - QT5_TARGET_SUBDIRS=( src/assistant/help src/assistant/qcollectiongenerator |