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 AE8711382C5 for ; Sun, 2 May 2021 07:58:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 80D47E081E; Sun, 2 May 2021 07:58:36 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 60428E081E for ; Sun, 2 May 2021 07:58:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 0A6843402FE for ; Sun, 2 May 2021 07:58:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9A5F866A for ; Sun, 2 May 2021 07:58:33 +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: <1619942032.f4f8dbb2a4d596dd71903a46b8955f1aad83b375.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-frameworks/kio/files/, kde-frameworks/kio/ X-VCS-Repository: proj/kde X-VCS-Files: kde-frameworks/kio/files/kio-5.81.0-fix-qtconcurrent-private-link.patch kde-frameworks/kio/kio-9999.ebuild X-VCS-Directories: kde-frameworks/kio/ kde-frameworks/kio/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: f4f8dbb2a4d596dd71903a46b8955f1aad83b375 X-VCS-Branch: master Date: Sun, 2 May 2021 07:58:33 +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: d48f0f69-4458-4a98-a4f9-eaa6d506e3fd X-Archives-Hash: 681d9d9d50c41dfcadffa395ec89a4bd commit: f4f8dbb2a4d596dd71903a46b8955f1aad83b375 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Apr 23 19:37:59 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun May 2 07:53:52 2021 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f4f8dbb2 kde-frameworks/kio: Fix public link interface Closes: https://bugs.gentoo.org/784971 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> .../kio-5.81.0-fix-qtconcurrent-private-link.patch | 46 ++++++++++++++++++++++ kde-frameworks/kio/kio-9999.ebuild | 5 +++ 2 files changed, 51 insertions(+) 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 new file mode 100644 index 0000000000..42637cd6e1 --- /dev/null +++ b/kde-frameworks/kio/files/kio-5.81.0-fix-qtconcurrent-private-link.patch @@ -0,0 +1,46 @@ +From e6825658b7f59a3a933559def9aebf21ff0efb7f 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 + 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. + +Signed-off-by: Andreas Sturmlechner +--- + KF5KIOConfig.cmake.in | 1 - + src/core/CMakeLists.txt | 2 +- + 2 files changed, 1 insertion(+), 2 deletions(-) + +diff --git a/KF5KIOConfig.cmake.in b/KF5KIOConfig.cmake.in +index 687ec512..749e9b9b 100644 +--- a/KF5KIOConfig.cmake.in ++++ b/KF5KIOConfig.cmake.in +@@ -21,7 +21,6 @@ find_dependency(KF5WindowSystem "@KF_DEP_VERSION@") + endif() + + find_dependency(Qt5Network "@REQUIRED_QT_VERSION@") +-find_dependency(Qt5Concurrent "@REQUIRED_QT_VERSION@") + find_dependency(Qt5DBus "@REQUIRED_QT_VERSION@") + + include("${CMAKE_CURRENT_LIST_DIR}/KF5KIOTargets.cmake") +diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt +index 76c3061c..fe4be56b 100644 +--- a/src/core/CMakeLists.txt ++++ b/src/core/CMakeLists.txt +@@ -188,9 +188,9 @@ PUBLIC + KF5::CoreAddons # KJob + KF5::Service # TODO KF6 move to PRIVATE + Qt5::Network +- Qt5::Concurrent # QtConcurrentRun in hostinfo.cpp + Qt5::DBus + PRIVATE ++ Qt5::Concurrent # QtConcurrentRun in hostinfo.cpp + Qt5::Xml # davjob.cpp uses QDom + KF5::ConfigCore + KF5::I18n +-- +2.31.1 + diff --git a/kde-frameworks/kio/kio-9999.ebuild b/kde-frameworks/kio/kio-9999.ebuild index 64aaff51d1..d05142638a 100644 --- a/kde-frameworks/kio/kio-9999.ebuild +++ b/kde-frameworks/kio/kio-9999.ebuild @@ -71,6 +71,11 @@ PDEPEND=" >=kde-frameworks/kded-${PVCUT}:5 " +PATCHES=( + # pending https://invent.kde.org/frameworks/kio/-/merge_requests/426 + "${FILESDIR}"/${PN}-5.81.0-fix-qtconcurrent-private-link.patch # bug 784971 +) + src_configure() { local mycmakeargs=( $(cmake_use_find_package acl ACL)