[gentoo-commits] proj/kde:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/

[Andreas Sturmlechner]

commit:     d6ea63eb367b1da7f3461b441580ac38d841bb78
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 30 06:06:30 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jun 30 06:06:30 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d6ea63eb

kde-frameworks/kio: Rebase fix-qtconcurrent-private-link.patch

Reported-by: Duncan <1i5t5.duncan <AT> cox.net>
Closes: https://bugs.gentoo.org/799215
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ... => kio-5.84.0-fix-qtconcurrent-private-link.patch} | 18 +++++++++++-------
 kde-frameworks/kio/kio-9999.ebuild                     |  2 +-
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/kde-frameworks/kio/files/kio-5.81.0-fix-qtconcurrent-private-link.patch b/kde-frameworks/kio/files/kio-5.84.0-fix-qtconcurrent-private-link.patch
similarity index 67%
rename from kde-frameworks/kio/files/kio-5.81.0-fix-qtconcurrent-private-link.patch
rename to kde-frameworks/kio/files/kio-5.84.0-fix-qtconcurrent-private-link.patch
index 42637cd6e1..13ae80db4e 100644
--- a/kde-frameworks/kio/files/kio-5.81.0-fix-qtconcurrent-private-link.patch
+++ b/kde-frameworks/kio/files/kio-5.84.0-fix-qtconcurrent-private-link.patch
@@ -1,13 +1,17 @@
-From e6825658b7f59a3a933559def9aebf21ff0efb7f Mon Sep 17 00:00:00 2001
+From fd019eca92a423e83e49a94f16ebca930e0fe51d Mon Sep 17 00:00:00 2001
 From: Andreas Sturmlechner <asturm@g.o>
 Date: Fri, 23 Apr 2021 20:10:31 +0200
-Subject: [PATCH] Drop find_dependency(Qt5Concurrent) from
+Subject: [PATCH] Move Qt5Concurrent to private link libraries, drop from
  KF5KIOConfig.cmake.in
 
 This was added in 2f83dde2c8e8a25f0fe3dd52012bb49cb69e1ea5 but as far as I can
 see it is only a KIO build time dependency with no Qt5Concurrent header being
 used in KIO headers.
 
+Test-built various revdeps successfully against the patched KIO with/without
+Qt5Concurrent installed, fixing implicit deps while at it. KDE Gear packages
+are fixed in >=21.04.2, KDE Plasma in >=5.21.5.
+
 Signed-off-by: Andreas Sturmlechner <asturm@g.o>
 ---
  KF5KIOConfig.cmake.in   | 1 -
@@ -27,20 +31,20 @@ index 687ec512..749e9b9b 100644
  
  include("${CMAKE_CURRENT_LIST_DIR}/KF5KIOTargets.cmake")
 diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
-index 76c3061c..fe4be56b 100644
+index b35258a7..16c83d59 100644
 --- a/src/core/CMakeLists.txt
 +++ b/src/core/CMakeLists.txt
-@@ -188,9 +188,9 @@ PUBLIC
+@@ -201,9 +201,9 @@ PUBLIC
   KF5::CoreAddons   # KJob
   KF5::Service # TODO KF6 move to PRIVATE
   Qt5::Network
-- Qt5::Concurrent            # QtConcurrentRun in hostinfo.cpp
+- Qt5::Concurrent            # QtConcurrentRun in hostinfo.cpp # TODO KF6 move to PRIVATE
   Qt5::DBus
  PRIVATE
-+ Qt5::Concurrent            # QtConcurrentRun in hostinfo.cpp
++ Qt5::Concurrent            # QtConcurrentRun in hostinfo.cpp # TODO KF6 move to PRIVATE
   Qt5::Xml                   # davjob.cpp uses QDom
   KF5::ConfigCore
   KF5::I18n
 -- 
-2.31.1
+2.32.0
 

diff --git a/kde-frameworks/kio/kio-9999.ebuild b/kde-frameworks/kio/kio-9999.ebuild
index 522952a13d..a247d1aa41 100644
--- a/kde-frameworks/kio/kio-9999.ebuild
+++ b/kde-frameworks/kio/kio-9999.ebuild
@@ -74,7 +74,7 @@ PDEPEND="
 
 PATCHES=(
 	# pending https://invent.kde.org/frameworks/kio/-/merge_requests/426
-	"${FILESDIR}"/${PN}-5.81.0-fix-qtconcurrent-private-link.patch # bug 784971
+	"${FILESDIR}"/${PN}-5.84.0-fix-qtconcurrent-private-link.patch # bug 784971
 )
 
 src_configure() {