| 1 |
commit: f4f8dbb2a4d596dd71903a46b8955f1aad83b375 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Apr 23 19:37:59 2021 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 2 07:53:52 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f4f8dbb2 |
| 7 |
|
| 8 |
kde-frameworks/kio: Fix public link interface |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/784971 |
| 11 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
| 12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 13 |
|
| 14 |
.../kio-5.81.0-fix-qtconcurrent-private-link.patch | 46 ++++++++++++++++++++++ |
| 15 |
kde-frameworks/kio/kio-9999.ebuild | 5 +++ |
| 16 |
2 files changed, 51 insertions(+) |
| 17 |
|
| 18 |
diff --git a/kde-frameworks/kio/files/kio-5.81.0-fix-qtconcurrent-private-link.patch b/kde-frameworks/kio/files/kio-5.81.0-fix-qtconcurrent-private-link.patch |
| 19 |
new file mode 100644 |
| 20 |
index 0000000000..42637cd6e1 |
| 21 |
--- /dev/null |
| 22 |
+++ b/kde-frameworks/kio/files/kio-5.81.0-fix-qtconcurrent-private-link.patch |
| 23 |
@@ -0,0 +1,46 @@ |
| 24 |
+From e6825658b7f59a3a933559def9aebf21ff0efb7f Mon Sep 17 00:00:00 2001 |
| 25 |
+From: Andreas Sturmlechner <asturm@g.o> |
| 26 |
+Date: Fri, 23 Apr 2021 20:10:31 +0200 |
| 27 |
+Subject: [PATCH] Drop find_dependency(Qt5Concurrent) from |
| 28 |
+ KF5KIOConfig.cmake.in |
| 29 |
+ |
| 30 |
+This was added in 2f83dde2c8e8a25f0fe3dd52012bb49cb69e1ea5 but as far as I can |
| 31 |
+see it is only a KIO build time dependency with no Qt5Concurrent header being |
| 32 |
+used in KIO headers. |
| 33 |
+ |
| 34 |
+Signed-off-by: Andreas Sturmlechner <asturm@g.o> |
| 35 |
+--- |
| 36 |
+ KF5KIOConfig.cmake.in | 1 - |
| 37 |
+ src/core/CMakeLists.txt | 2 +- |
| 38 |
+ 2 files changed, 1 insertion(+), 2 deletions(-) |
| 39 |
+ |
| 40 |
+diff --git a/KF5KIOConfig.cmake.in b/KF5KIOConfig.cmake.in |
| 41 |
+index 687ec512..749e9b9b 100644 |
| 42 |
+--- a/KF5KIOConfig.cmake.in |
| 43 |
++++ b/KF5KIOConfig.cmake.in |
| 44 |
+@@ -21,7 +21,6 @@ find_dependency(KF5WindowSystem "@KF_DEP_VERSION@") |
| 45 |
+ endif() |
| 46 |
+ |
| 47 |
+ find_dependency(Qt5Network "@REQUIRED_QT_VERSION@") |
| 48 |
+-find_dependency(Qt5Concurrent "@REQUIRED_QT_VERSION@") |
| 49 |
+ find_dependency(Qt5DBus "@REQUIRED_QT_VERSION@") |
| 50 |
+ |
| 51 |
+ include("${CMAKE_CURRENT_LIST_DIR}/KF5KIOTargets.cmake") |
| 52 |
+diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt |
| 53 |
+index 76c3061c..fe4be56b 100644 |
| 54 |
+--- a/src/core/CMakeLists.txt |
| 55 |
++++ b/src/core/CMakeLists.txt |
| 56 |
+@@ -188,9 +188,9 @@ PUBLIC |
| 57 |
+ KF5::CoreAddons # KJob |
| 58 |
+ KF5::Service # TODO KF6 move to PRIVATE |
| 59 |
+ Qt5::Network |
| 60 |
+- Qt5::Concurrent # QtConcurrentRun in hostinfo.cpp |
| 61 |
+ Qt5::DBus |
| 62 |
+ PRIVATE |
| 63 |
++ Qt5::Concurrent # QtConcurrentRun in hostinfo.cpp |
| 64 |
+ Qt5::Xml # davjob.cpp uses QDom |
| 65 |
+ KF5::ConfigCore |
| 66 |
+ KF5::I18n |
| 67 |
+-- |
| 68 |
+2.31.1 |
| 69 |
+ |
| 70 |
|
| 71 |
diff --git a/kde-frameworks/kio/kio-9999.ebuild b/kde-frameworks/kio/kio-9999.ebuild |
| 72 |
index 64aaff51d1..d05142638a 100644 |
| 73 |
--- a/kde-frameworks/kio/kio-9999.ebuild |
| 74 |
+++ b/kde-frameworks/kio/kio-9999.ebuild |
| 75 |
@@ -71,6 +71,11 @@ PDEPEND=" |
| 76 |
>=kde-frameworks/kded-${PVCUT}:5 |
| 77 |
" |
| 78 |
|
| 79 |
+PATCHES=( |
| 80 |
+ # pending https://invent.kde.org/frameworks/kio/-/merge_requests/426 |
| 81 |
+ "${FILESDIR}"/${PN}-5.81.0-fix-qtconcurrent-private-link.patch # bug 784971 |
| 82 |
+) |
| 83 |
+ |
| 84 |
src_configure() { |
| 85 |
local mycmakeargs=( |
| 86 |
$(cmake_use_find_package acl ACL) |
Archives