From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7260E13933E for ; Wed, 30 Jun 2021 06:08:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7D1F5E01B5; Wed, 30 Jun 2021 06:08:01 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C702FE07FE for ; Wed, 30 Jun 2021 06:08:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 599BF33BEAE for ; Wed, 30 Jun 2021 06:07:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 12AF4744 for ; Wed, 30 Jun 2021 06:07:58 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1625033190.d6ea63eb367b1da7f3461b441580ac38d841bb78.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/ X-VCS-Repository: proj/kde X-VCS-Files: kde-frameworks/kio/files/kio-5.81.0-fix-qtconcurrent-private-link.patch kde-frameworks/kio/files/kio-5.84.0-fix-qtconcurrent-private-link.patch kde-frameworks/kio/kio-9999.ebuild X-VCS-Directories: kde-frameworks/kio/files/ kde-frameworks/kio/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: d6ea63eb367b1da7f3461b441580ac38d841bb78 X-VCS-Branch: master Date: Wed, 30 Jun 2021 06:07:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2e1a5707-c3a1-4ac3-8a70-852cf516877c X-Archives-Hash: e086e809c253bd51a7ea27c829cd7e46 commit: d6ea63eb367b1da7f3461b441580ac38d841bb78 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jun 30 06:06:30 2021 +0000 Commit: Andreas Sturmlechner gentoo 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 cox.net> Closes: https://bugs.gentoo.org/799215 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner 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 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 --- 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() {