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 9A3AB13933E for ; Sun, 11 Jul 2021 20:47:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F195EE0D2B; Sun, 11 Jul 2021 20:47:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 C5B48E0D2B for ; Sun, 11 Jul 2021 20:47:16 +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 A8EB0342B6E for ; Sun, 11 Jul 2021 20:47:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2908A7D6 for ; Sun, 11 Jul 2021 20:47:13 +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: <1626036391.f6aafb2c8814829263d26757bd420d5fbfe9bac6.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/files/, kde-frameworks/kio/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-frameworks/kio/Manifest kde-frameworks/kio/files/kio-5.84.0-fix-qtconcurrent-private-link.patch kde-frameworks/kio/kio-5.84.0.ebuild X-VCS-Directories: kde-frameworks/kio/ kde-frameworks/kio/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: f6aafb2c8814829263d26757bd420d5fbfe9bac6 X-VCS-Branch: master Date: Sun, 11 Jul 2021 20:47:13 +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: c6ed9936-6cd2-492e-b9c0-b42cbce16a3d X-Archives-Hash: 47f8c8f3df4f9e113b1003ef68a75ad2 commit: f6aafb2c8814829263d26757bd420d5fbfe9bac6 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jul 10 16:45:26 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jul 11 20:46:31 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6aafb2c kde-frameworks/kio: 5.84.0 version bump Signed-off-by: Andreas Sturmlechner gentoo.org> kde-frameworks/kio/Manifest | 1 + .../kio-5.84.0-fix-qtconcurrent-private-link.patch | 76 +++++++++++++++++ kde-frameworks/kio/kio-5.84.0.ebuild | 99 ++++++++++++++++++++++ 3 files changed, 176 insertions(+) diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest index 0cc32fbcb63..4e880781978 100644 --- a/kde-frameworks/kio/Manifest +++ b/kde-frameworks/kio/Manifest @@ -1,2 +1,3 @@ DIST kio-5.82.0.tar.xz 3330028 BLAKE2B be2d22adec291f8e5f6be5227d33e4ca505b43c3888174cfe667dc7fc3bf6d1a383178238540b4598028c61c51498e5d94f3ba3c7e354d82f8dfdf11f7c7fbd0 SHA512 a14f42a8c96fb8b1f435d4120805628f877132b588c2c1f983af6409603baffbcdad99f1c296fef99dd78fb7edbf526fd95f85970ccbf91887619eb5728cb3dc DIST kio-5.83.0.tar.xz 3187064 BLAKE2B 2a11566cae3bbe48d57ffc188d6ccd9b98796139fc34c6e68535e7c126e376874364f9d338ebc92f5996e9c32318ba69a2c8743b87183f775ec4c1309813c862 SHA512 0b2b9effdf8ceef148176852428256dcdfb49dcb256478f2400130b2bcf091a2a2e4f54a5baeb38c7c74b83d7560fc4e699fd3d8c476c530ae6828e0eef0bfb0 +DIST kio-5.84.0.tar.xz 3191612 BLAKE2B 1d1788f4c731d6802eff504f4cba5569847dfbd506d25685f5c9d2218a88eb8ffca3d01f9290567ef368f0104ed322586015e6536e2ef07120803a2adbba5e2d SHA512 4c041b33171014562469c8ee074f85595edd503c0cb4c66aa5a17bad24937b71094826df2f3734b3d244d93b812e933f6ddc095628f2b25d5fca34c793383af9 diff --git a/kde-frameworks/kio/files/kio-5.84.0-fix-qtconcurrent-private-link.patch b/kde-frameworks/kio/files/kio-5.84.0-fix-qtconcurrent-private-link.patch new file mode 100644 index 00000000000..033b75bb00b --- /dev/null +++ b/kde-frameworks/kio/files/kio-5.84.0-fix-qtconcurrent-private-link.patch @@ -0,0 +1,76 @@ +From fb9bbb6f1fbb4e6232221a851f55ca2dc43b012c Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Fri, 23 Apr 2021 20:10:31 +0200 +Subject: [PATCH] Introduce KIO_NO_PUBLIC_QTCONCURRENT option + +If set, move Qt5Concurrent to private link interface, drop from +KF5KIOConfig.cmake.in. Originally added in 2f83dde2, but only used +in the implementation, not the API. + +Test-built various revdeps successfully against the patched KIO +with/without Qt5Concurrent installed, fixing implicit deps while +at it. KDE Gear packages fixed in >=21.04.2, Plasma in >=5.21.5. + +Signed-off-by: Andreas Sturmlechner +--- + CMakeLists.txt | 3 +++ + KF5KIOConfig.cmake.in | 2 ++ + src/core/CMakeLists.txt | 7 ++++++- + 3 files changed, 11 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e0063c2c..63aef43c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -49,6 +49,9 @@ option(KIO_ASSERT_SLAVE_STATES + "Used to control whether slave state assertions are enabled. When not enabled only warnings are generated." + ${ASSERT_SLAVE_STATES_DEFAULT}) + ++# TODO KF6: remove ++option(KIO_NO_PUBLIC_QTCONCURRENT "Privatize QtConcurrent linking, so KIO does not provide the target to revdeps.") ++ + option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF) + add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)") + +diff --git a/KF5KIOConfig.cmake.in b/KF5KIOConfig.cmake.in +index 687ec512..69564b3d 100644 +--- a/KF5KIOConfig.cmake.in ++++ b/KF5KIOConfig.cmake.in +@@ -21,7 +21,9 @@ find_dependency(KF5WindowSystem "@KF_DEP_VERSION@") + endif() + + find_dependency(Qt5Network "@REQUIRED_QT_VERSION@") ++if (NOT @KIO_NO_PUBLIC_QTCONCURRENT@) + find_dependency(Qt5Concurrent "@REQUIRED_QT_VERSION@") ++endif() + 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 c09d408a..f6efee23 100644 +--- a/src/core/CMakeLists.txt ++++ b/src/core/CMakeLists.txt +@@ -201,7 +201,6 @@ PUBLIC + KF5::CoreAddons # KJob + KF5::Service # TODO KF6 move to PRIVATE + Qt5::Network +- Qt5::Concurrent # QtConcurrentRun in hostinfo.cpp # TODO KF6 move to PRIVATE + Qt5::DBus + PRIVATE + Qt5::Xml # davjob.cpp uses QDom +@@ -211,6 +210,12 @@ PRIVATE + KF5::DBusAddons # KDEInitInterface + ) + ++if(KIO_NO_PUBLIC_QTCONCURRENT) ++ target_link_libraries(KF5KIOCore PRIVATE Qt5::Concurrent) # QtConcurrentRun in hostinfo.cpp ++else() ++ target_link_libraries(KF5KIOCore PUBLIC Qt5::Concurrent) # TODO KF6: remove ++endif() ++ + if (UNIX) + target_link_libraries(KF5KIOCore PRIVATE KF5::AuthCore) #SlaveBase uses KAuth::Action + endif() +-- +2.32.0 + diff --git a/kde-frameworks/kio/kio-5.84.0.ebuild b/kde-frameworks/kio/kio-5.84.0.ebuild new file mode 100644 index 00000000000..cc327525d7b --- /dev/null +++ b/kde-frameworks/kio/kio-5.84.0.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_DESIGNERPLUGIN="true" +ECM_TEST="forceoptional" +PVCUT=$(ver_cut 1-2) +QTMIN=5.15.2 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org xdg-utils + +DESCRIPTION="Framework providing transparent file and data management" + +LICENSE="LGPL-2+" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="acl +handbook kerberos +kwallet X" + +# tests hang +RESTRICT+=" test" + +RDEPEND=" + dev-libs/libxml2 + dev-libs/libxslt + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5[ssl] + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + =kde-frameworks/kauth-${PVCUT}*:5 + =kde-frameworks/karchive-${PVCUT}*:5 + =kde-frameworks/kbookmarks-${PVCUT}*:5 + =kde-frameworks/kcodecs-${PVCUT}*:5 + =kde-frameworks/kcompletion-${PVCUT}*:5 + =kde-frameworks/kconfig-${PVCUT}*:5 + =kde-frameworks/kconfigwidgets-${PVCUT}*:5 + =kde-frameworks/kcoreaddons-${PVCUT}*:5 + =kde-frameworks/kcrash-${PVCUT}*:5 + =kde-frameworks/kdbusaddons-${PVCUT}*:5 + =kde-frameworks/kguiaddons-${PVCUT}*:5 + =kde-frameworks/ki18n-${PVCUT}*:5 + =kde-frameworks/kiconthemes-${PVCUT}*:5 + =kde-frameworks/kitemviews-${PVCUT}*:5 + =kde-frameworks/kjobwidgets-${PVCUT}*:5 + =kde-frameworks/knotifications-${PVCUT}*:5 + =kde-frameworks/kservice-${PVCUT}*:5 + =kde-frameworks/ktextwidgets-${PVCUT}*:5 + =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 + =kde-frameworks/kwindowsystem-${PVCUT}*:5 + =kde-frameworks/kxmlgui-${PVCUT}*:5 + =kde-frameworks/solid-${PVCUT}*:5 + acl? ( + sys-apps/attr + virtual/acl + ) + handbook? ( =kde-frameworks/kdoctools-${PVCUT}*:5 ) + kerberos? ( virtual/krb5 ) + kwallet? ( =kde-frameworks/kwallet-${PVCUT}*:5 ) + X? ( >=dev-qt/qtx11extras-${QTMIN}:5 ) +" +DEPEND="${RDEPEND} + >=dev-qt/qtconcurrent-${QTMIN}:5 + test? ( sys-libs/zlib ) + X? ( + x11-base/xorg-proto + x11-libs/libX11 + x11-libs/libXrender + ) +" +PDEPEND=">=kde-frameworks/kded-${PVCUT}:5" + +PATCHES=( + # pending https://invent.kde.org/frameworks/kio/-/merge_requests/426 + "${FILESDIR}"/${PN}-5.84.0-fix-qtconcurrent-private-link.patch # bug 784971 +) + +src_configure() { + local mycmakeargs=( + -DKIO_NO_PUBLIC_QTCONCURRENT=ON + $(cmake_use_find_package acl ACL) + $(cmake_use_find_package handbook KF5DocTools) + $(cmake_use_find_package kerberos GSSAPI) + $(cmake_use_find_package kwallet KF5Wallet) + $(cmake_use_find_package X X11) + ) + + ecm_src_configure +} + +pkg_postinst() { + ecm_pkg_postinst + xdg_desktop_database_update +} + +pkg_postrm() { + ecm_pkg_postrm + xdg_desktop_database_update +}