gentoo resync : 17.07.2021

5 files changed, 90 insertions, 105 deletions

diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index 77e6555fa0b9..48e93d49b91a 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -6,11 +6,11 @@ AUX kio-5.82.0-MimeTypeFinderJob-memleak-4.patch 2467 BLAKE2B e32cf57531afd4532a
 AUX kio-5.82.0-fix-filenamesearch-crashes.patch 1046 BLAKE2B 3024bc3b143b1e5f261097ad47bf7c12ea54bdefba32faff9040a0128dd837453324f3b5b2cd2926b8f5ec2b899ff91daf4cbb3ae5c53cb401af88d78ff1fc01 SHA512 ae4ee91602dd0a7b54e9081db61056c775c2998542c326716fce4f8027173bb9893350a29b8d38ecb9e0a3194a314f6de97dc6a4e27a703c89cf77ee00d2f7f0
 AUX kio-5.82.0-no-cache-kcm.patch 2801 BLAKE2B 6779c2d1e77aff1e530beeb002b9aa7a993b365d8bdb22b7f77532038314cae62a237666b6d033a92f1219761f845c678b8367d86a757e5fc499165455f6345e SHA512 422ac748100d1e227ffc29da898437e4c4142b4c7f85ce46239ac6c76ae8feffe048fa1a44f3484b5859eb37baa3be96047652016c96c10b5fa2a262ce85b51a
 AUX kio-5.82.0-no-useragent-kcm.patch 3751 BLAKE2B 09ea333db392f0b35a531ff6921f4d9b0f8059ecc3bf48c8229c39815c49b4e6cbd6516fb2f99489ac468c33317260bb714915e971884d93dfa8b6284ba96039 SHA512 3641673476efab1c8e69408bc8472b1c6490209805d4039776ba397c39c98b59feed28cce9c03c55a8f87379d351cb87358773695dcdb5398aadb5cc1b89c4a4
+AUX kio-5.84.0-cxx17-std-mem_fn.patch 1191 BLAKE2B 32cda44666613cc47e8e9945350b3428f04db76353dc00daa5dcbd3af37395a4767d98bf2b9b2508aa7b3d3d2b07f911eaef8b1af2eb782bd94224a7bb31dde4 SHA512 6b078bfde67160bc44bbcb480a72b7ac61d50ae544a7f03a19efbe1a7129a49eebe2ebc57f1ecfd80b978ed25bc65d66f4a794764fa618b692071d56d65c5826
+AUX kio-5.84.0-fix-open-url-w-binary.patch 2153 BLAKE2B e6d57d77f95675a9e283c7a653575f676fc22e9e254984b2b91b46f0e14ba08bc91232a6f9bf83eb3ccab633bf97440fa06520d186eeed32a40d7b86529fe60f SHA512 3dcc1fd0c70aacd6c4417654e741e28540c6f583ed7bd21ce27c2728bf6a4a9f910d92cb6445c6c10d2f6eceff40d4a0d7b8c3ac7ac678e4299745998a0f9fd8
 AUX kio-5.84.0-fix-qtconcurrent-private-link.patch 2836 BLAKE2B 03c1b039360b7fc18101691d5fcb3464478fd9a3cb641456290e3fc3cde914669c1c47b4d0fc7c7243f3921d1e224baabeae20c70d88529226e62ca1432bac42 SHA512 17aadef9e7131391862aa7cb89de08156bebbb22de0c0b6474e9979bcbb77c1f7434a726038345705b707413a8c188bd5c7f15bdf3ae7dc31b777f4ea8bccf20
 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
 EBUILD kio-5.82.0-r2.ebuild 2933 BLAKE2B 0a5403e19ca99bfd4aca781fe39db28da02d1cd83717aebed1ca51d245ac49e57ee0fa4ca60c98ee675b331ef7947a2768728dfe6e5a5bc78c27a52a0b07d58b SHA512 e7172bcc1813bca6f08486db2af8dd33a3de5ebb2dd46ccaf137c74b34a4ab74237cc1dd7a13aa732667353f70020aa1b8a6977318537a08901849edb165bea3
-EBUILD kio-5.83.0.ebuild 2535 BLAKE2B 8b33c4923592ef379ca9f77bc6ea29c3d99aab924639f2c7f48bea35210c23685fa2cbe2ab8bc99909f9491eb0978cb3ff6fcadd2a47e21b9496254168c85c2d SHA512 5973eef46e6c54fa14e222a2b642c2fc6b1929272d1b1fa7c8165a34c5c2def28dd04a7f3ab2b5a5f8a34f2bca76a52085d502f696ea2d95e6e15f47749fc872
-EBUILD kio-5.84.0.ebuild 2566 BLAKE2B 98a309499991d11c2373e97d96a842e5b7328a9403be67f7ae2781016457a750528391edda1bba3df884764902bf23e69f73543c7321bb4e35b6ce45011777e8 SHA512 e9070dd2b17d6a2cb5005f4402e9d4ded2c442f3247e27989114b916e901af02f59eb5d165ec29550b9168c64472b18f8a29a58608c482a8754972c4d1dbd692
+EBUILD kio-5.84.0-r1.ebuild 2609 BLAKE2B 6764504a38bb3224c0417df814bf3658a09170826aea67ab059345cbfb5c418625a95354b04cc67bc2e71fe96e8675f82980d7fb52c8f87264a8cefbf4ca0d1a SHA512 f3b3d2643f248756d67a6903858e3d04114aed4dbbff2fd3629afbe445d1876476e4beb2f49d8a89f38e2d39647e10fcb87ee212a387b34ee3d16266ef916960
 MISC metadata.xml 465 BLAKE2B f419d817ff7a98c06ebb921974d1c68f1c50eef4548f1d7bb819fb907b7379ad4d4b4424b598f9f216dc96f00a4e9acf7f051cc628af067954b13c3cb80ddada SHA512 6fae28d51cefecbf80962e976366b86ef54ac666421477787b8a438ae18101ea936865db76464b6a95e8ec6559138a063b269b1a17ff1687c73bb6ad398d4f89
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
new file mode 100644
index 000000000000..26383b788a01
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.84.0-cxx17-std-mem_fn.patch
@@ -0,0 +1,31 @@
+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
new file mode 100644
index 000000000000..cdccada57d97
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.84.0-fix-open-url-w-binary.patch
@@ -0,0 +1,53 @@
+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/kio-5.83.0.ebuild b/kde-frameworks/kio/kio-5.83.0.ebuild
deleted file mode 100644
index 154cff27d395..000000000000
--- a/kde-frameworks/kio/kio-5.83.0.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=(
-	# 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)
-		$(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
-}
diff --git a/kde-frameworks/kio/kio-5.84.0.ebuild b/kde-frameworks/kio/kio-5.84.0-r1.ebuild
index cc327525d7b5..e4d40e939fa3 100644
--- a/kde-frameworks/kio/kio-5.84.0.ebuild
+++ b/kde-frameworks/kio/kio-5.84.0-r1.ebuild
@@ -71,8 +71,9 @@ DEPEND="${RDEPEND}
 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
+	"${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() {