diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2021-08-14 18:51:47 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2021-08-14 19:08:16 +0200 |
commit | 5ad08ed1931d9cf2f12f481c9910ff2586090941 (patch) | |
tree | be37ab2be972025a6ae386b7c8dd0ad4cc32869b /kde-frameworks | |
parent | kde-frameworks/kinit: drop 5.84.0* (diff) | |
download | gentoo-5ad08ed1931d9cf2f12f481c9910ff2586090941.tar.gz gentoo-5ad08ed1931d9cf2f12f481c9910ff2586090941.tar.bz2 gentoo-5ad08ed1931d9cf2f12f481c9910ff2586090941.zip |
kde-frameworks/kio: drop 5.84.0*
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-frameworks')
5 files changed, 0 insertions, 261 deletions
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest index 2f2f102873a2..01f1ec4da314 100644 --- a/kde-frameworks/kio/Manifest +++ b/kde-frameworks/kio/Manifest @@ -1,3 +1,2 @@ DIST kio-5.82.0.tar.xz 3330028 BLAKE2B be2d22adec291f8e5f6be5227d33e4ca505b43c3888174cfe667dc7fc3bf6d1a383178238540b4598028c61c51498e5d94f3ba3c7e354d82f8dfdf11f7c7fbd0 SHA512 a14f42a8c96fb8b1f435d4120805628f877132b588c2c1f983af6409603baffbcdad99f1c296fef99dd78fb7edbf526fd95f85970ccbf91887619eb5728cb3dc -DIST kio-5.84.0.tar.xz 3191612 BLAKE2B 1d1788f4c731d6802eff504f4cba5569847dfbd506d25685f5c9d2218a88eb8ffca3d01f9290567ef368f0104ed322586015e6536e2ef07120803a2adbba5e2d SHA512 4c041b33171014562469c8ee074f85595edd503c0cb4c66aa5a17bad24937b71094826df2f3734b3d244d93b812e933f6ddc095628f2b25d5fca34c793383af9 DIST kio-5.85.0.tar.xz 3200300 BLAKE2B fd723dba761b81862bf503645a8526a246867e5a10441f3edf895e4107c189ead357615e17f3704325976ed29867c54f98bc11b4e977e21a78d429ee7efa2dde SHA512 73c69743f3d99671ced8176bf9806df54eb3afd04dbdd9dd92b79c9979428f980d3dbda9504c81aca4aa36249b3e43edcc38831497752e31a510a70ee98dc4e8 diff --git a/kde-frameworks/kio/files/kio-5.84.0-cxx17-std-mem_fn.patch b/kde-frameworks/kio/files/kio-5.84.0-cxx17-std-mem_fn.patch deleted file mode 100644 index 26383b788a01..000000000000 --- a/kde-frameworks/kio/files/kio-5.84.0-cxx17-std-mem_fn.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 36f1814b184f4d5ac628fca5db5f6cc1440b4db7 Mon Sep 17 00:00:00 2001 -From: Jan Paul Batrina <jpmbatrina01@gmail.com> -Date: Mon, 12 Jul 2021 22:06:19 +0800 -Subject: [PATCH] Use std::mem_fn instead of the deprecated/removed - std::mem_fun - -std::mem_fun was deprecated in C++11 and removed from -the standard in C++17. - -BUG: 439780 -NO_CHANGELOG ---- - src/widgets/kpropertiesdialog.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/widgets/kpropertiesdialog.cpp b/src/widgets/kpropertiesdialog.cpp -index 3f61e8ea3..1ed8bc7d8 100644 ---- a/src/widgets/kpropertiesdialog.cpp -+++ b/src/widgets/kpropertiesdialog.cpp -@@ -2273,7 +2273,7 @@ void KFilePermissionsPropsPlugin::slotShowAdvancedPermissions() - d->fileSystemSupportsACLs = fileSystemSupportsACL(path); - } - if (d->fileSystemSupportsACLs) { -- std::for_each(theNotSpecials.begin(), theNotSpecials.end(), std::mem_fun(&QWidget::hide)); -+ std::for_each(theNotSpecials.begin(), theNotSpecials.end(), std::mem_fn(&QWidget::hide)); - extendedACLs = new KACLEditWidget(&dlg); - extendedACLs->setEnabled(d->canChangePermissions); - vbox->addWidget(extendedACLs); --- -GitLab - diff --git a/kde-frameworks/kio/files/kio-5.84.0-fix-open-url-w-binary.patch b/kde-frameworks/kio/files/kio-5.84.0-fix-open-url-w-binary.patch deleted file mode 100644 index cdccada57d97..000000000000 --- a/kde-frameworks/kio/files/kio-5.84.0-fix-open-url-w-binary.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 8ad6921524c92a0cf1b58336b3ce29e159e83b7d Mon Sep 17 00:00:00 2001 -From: David Edmundson <kde@davidedmundson.co.uk> -Date: Wed, 14 Jul 2021 17:06:59 +0100 -Subject: [PATCH] Fix selecting binaries from component chooser KCM - -In the kcmshell for a component chooser we use the open with dialog to -select services for various scheme handlers. - -If you select a binary instead of a .desktop file a temporary .desktop -file is created in ~/.local/share/applications - -This is in the format -Exec=someBinary -MimeType=x-scheme-handler/http - -When we then use this application for launching KIO::DesktopExecParser -then (sort of correctly) determines that that the chosen service cannot -handle the http scheme because even though it is a scheme handler it -does not have a "%u" in the exec line. - -This leads to us potentially loading websites via kioclient or kio-fuse. - -Testing done: - - kcmshell5 component chooser - - web browser -> other -> type "/usr/bin/firefox" - - kde-open5 http://kde.org - - Previously this gave a local URL, now it is correct ---- - src/widgets/kopenwithdialog.cpp | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/src/widgets/kopenwithdialog.cpp b/src/widgets/kopenwithdialog.cpp -index 1831878ca..31295044d 100644 ---- a/src/widgets/kopenwithdialog.cpp -+++ b/src/widgets/kopenwithdialog.cpp -@@ -1088,6 +1088,14 @@ bool KOpenWithDialogPrivate::checkAccept() - KConfigGroup cg = desktopFile.desktopGroup(); - cg.writeEntry("Type", "Application"); - cg.writeEntry("Name", initialServiceName); -+ -+ // if we select a binary for a scheme handler, then it's safe to assume it can handle URLs -+ if (qMimeType.startsWith(QLatin1String("x-scheme-handler/"))) { -+ if (!typedExec.contains(QLatin1String("%u"), Qt::CaseInsensitive) && !typedExec.contains(QLatin1String("%f"), Qt::CaseInsensitive)) { -+ fullExec += QStringLiteral(" %u"); -+ } -+ } -+ - cg.writeEntry("Exec", fullExec); - cg.writeEntry("NoDisplay", true); // don't make it appear in the K menu - if (terminal->isChecked()) { --- -GitLab - 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 deleted file mode 100644 index 033b75bb00b1..000000000000 --- a/kde-frameworks/kio/files/kio-5.84.0-fix-qtconcurrent-private-link.patch +++ /dev/null @@ -1,76 +0,0 @@ -From fb9bbb6f1fbb4e6232221a851f55ca2dc43b012c Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -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 <asturm@gentoo.org> ---- - 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-r1.ebuild b/kde-frameworks/kio/kio-5.84.0-r1.ebuild deleted file mode 100644 index e4d40e939fa3..000000000000 --- a/kde-frameworks/kio/kio-5.84.0-r1.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# 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=( - "${FILESDIR}"/${P}-fix-qtconcurrent-private-link.patch # bug 784971 - "${FILESDIR}"/${P}-cxx17-std-mem_fn.patch # bug 802030 - "${FILESDIR}"/${P}-fix-open-url-w-binary.patch # KDE-bug 439477 -) - -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 -} |