gentoo resync : 20.03.2022

5 files changed, 6 insertions, 128 deletions

diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index 14b76fb3e0cf..009be8934fa3 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,7 +1,5 @@
-AUX kio-5.88.0-fix-KRun-open-URLs-twice.patch 3243 BLAKE2B 0e93a04be3fec646fccb9ef45328f0bf8e72c874a629a130f496e27185c36960841b409076606d5bb049708f09ec27156971654b584a1f6274d314736c002283 SHA512 903aacef3af878223df0fc755c7001d7e5a0a9b1e1791b672a8bd81092721f3777f0621cc79c049230eb1f05e5a7cc9a42548ca7eee5307994edf9c237589f2a
-AUX kio-5.88.0-fix-copy-between-filesystems.patch 1094 BLAKE2B 0528d84cd6cb61ee370c9f4c50c48852420a02e403f622742f71920455c8cae90fc05e0026cd59fa0d8ab9a404bc531a80ba47d231fdd273fe89a8d27f10cf4f SHA512 becdf85d9bd9c52c05d5b8b23762fa0ba3794cd617b46fa50643200bbca793a5636275f77d2dcad709f69e34bc8fa1cb6a73998f23bb9591a484b73551ced0e8
-DIST kio-5.88.0.tar.xz 3247924 BLAKE2B 3687e97b3c936c93e7ee87f314340f8e9889e2afae584d360eb44414994406a34678ea304fff081a65beb03fa98ec1f22870f3a3f86e124352bc96f51c142c1f SHA512 3d79bc90c2f6aa54080824c15da282f54d18530362ffd144f36754f1751f58c0c48c9fd12ffece49f0b455c524b8585ba6c2baa684b0992471b7ec0636350c19
 DIST kio-5.90.0.tar.xz 3264964 BLAKE2B d6925472295eacce1f08458f5d184edec7828475d8561d574180a043421c453f46daeb10b76636b9246aaa630a0f50f71f5379c36520b607bd23f75be237c002 SHA512 944d12155beb424e9359ae93dea8db2847658eafbde595c54dc193bcddaca61000be9f2141ee31c535b126eeef5a4d8ae09b079896b5a807c3d72fbea98d66b3
-EBUILD kio-5.88.0-r2.ebuild 2544 BLAKE2B da6593ee7059d1e9a47dab87a4f7aa8a3895618838e2de5d4f920c48f787bf9fb1cc061bb33604315ba344ca4686fd0204b542d1daaa4a65bdc38f589bde01f2 SHA512 67219306ff2353e93136eb23f28664b1970705732845769e9305cabfc58ca16b5d414e5a833eef59392b4223ed8e1c9ee49e7f9ca2ded647977f56dfa4704f2e
-EBUILD kio-5.90.0.ebuild 2411 BLAKE2B 024d6cc99b36ba5b0e46ba68d062d77bf992cf61dd33e53a35035a3ac27c58c816c08956edb7a009a1cff65db73b5e5b8b0dcae245cd0553ae0f49a69e18c736 SHA512 33d669a29565aca3799e34838f6ba70de715652b80cc4da8baa81c470e0a6c7fee877575e4ba947410c12180bb6867b22e32b64541d95b5c67c9220e21e7a550
+DIST kio-5.92.0.tar.xz 3304432 BLAKE2B 31b78c2cc5a543126d8494935e9956ce169f9bf6b863c0be562775ba3d5a30cf1fadc7bc48e818530eb51a5726bb528f15c51f89dfb9a7511bd6865d6f7092d9 SHA512 5064db660c5b6207eff2bb12261198118c89014f4d71a09531e72bc6185fd070fa262ef617cbbbacc1f334f69f65cc831fa91fd641d59d89303813ec5ef620b6
+EBUILD kio-5.90.0.ebuild 2408 BLAKE2B dbf6929b37fc23ecedb5452e67a6a063bddd276476f70a8c04ff18d0662dd851af960a4f83b64348c2e6ad5782bfb387ebdb4f0849a4e5dcad733b76e937997c SHA512 fda5731b4c8ccf515100b97a029c7b635e0918ab703c62b001d3096669c93de7cf717048691ec557db49bee13cbc9bab0d4104bba7f3685e6e0656b5383f3efd
+EBUILD kio-5.92.0.ebuild 2411 BLAKE2B 024d6cc99b36ba5b0e46ba68d062d77bf992cf61dd33e53a35035a3ac27c58c816c08956edb7a009a1cff65db73b5e5b8b0dcae245cd0553ae0f49a69e18c736 SHA512 33d669a29565aca3799e34838f6ba70de715652b80cc4da8baa81c470e0a6c7fee877575e4ba947410c12180bb6867b22e32b64541d95b5c67c9220e21e7a550
 MISC metadata.xml 672 BLAKE2B ed652f6e5751355ab96a5206da0184e37745e4b675e7f235648536931563b53c4f71112e81f809c88d02d01f9c77a20e9f41a2f6eb988b104636c8d450c50a18 SHA512 1fa6b33c8f146152015b0c8dbd70165022ceee580253850545c79eb3a74dbf44539e562014606a4ef4ea283a42f3946b1d3a79c0953a38fe10689137a53207ce
diff --git a/kde-frameworks/kio/files/kio-5.88.0-fix-KRun-open-URLs-twice.patch b/kde-frameworks/kio/files/kio-5.88.0-fix-KRun-open-URLs-twice.patch
deleted file mode 100644
index 0d3bf2aeca3a..000000000000
--- a/kde-frameworks/kio/files/kio-5.88.0-fix-KRun-open-URLs-twice.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 25f3a6937a80f2748790265b9b688d64126e43d0 Mon Sep 17 00:00:00 2001
-From: Aleix Pol <aleixpol@kde.org>
-Date: Tue, 30 Nov 2021 17:33:18 +0100
-Subject: [PATCH] Fix KRun::runApplication when xdg activation is involved
-
-Has waitForStarted account for xdg activation token request.
-
-BUG: 446272
----
- src/gui/kprocessrunner.cpp | 13 ++++++++++---
- src/gui/kprocessrunner_p.h |  1 +
- 2 files changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/src/gui/kprocessrunner.cpp b/src/gui/kprocessrunner.cpp
-index 130dade75..82c959afe 100644
---- a/src/gui/kprocessrunner.cpp
-+++ b/src/gui/kprocessrunner.cpp
-@@ -32,6 +32,7 @@
- #include <QProcess>
- #include <QStandardPaths>
- #include <QString>
-+#include <QTimer>
- #include <QUuid>
- 
- #ifdef Q_OS_WIN
-@@ -259,7 +260,6 @@ void KProcessRunner::init(const KService::Ptr &service,
-     Q_UNUSED(iconName);
- #endif
- 
--    bool waitingForXdgToken = false;
-     if (KWindowSystem::isPlatformWayland()) {
-         if (!asn.isEmpty()) {
-             m_process->setEnv(QStringLiteral("XDG_ACTIVATION_TOKEN"), QString::fromUtf8(asn));
-@@ -274,7 +274,7 @@ void KProcessRunner::init(const KService::Ptr &service,
-                 }
-                 if (window) {
-                     const int launchedSerial = KWindowSystem::lastInputSerial(window);
--                    waitingForXdgToken = true;
-+                    m_waitingForXdgToken = true;
-                     connect(this, &KProcessRunner::xdgActivationTokenArrived, m_process.get(), [this] {
-                         startProcess();
-                     });
-@@ -285,6 +285,7 @@ void KProcessRunner::init(const KService::Ptr &service,
-                                 if (tokenSerial == launchedSerial) {
-                                     m_process->setEnv(QStringLiteral("XDG_ACTIVATION_TOKEN"), token);
-                                     Q_EMIT xdgActivationTokenArrived();
-+                                    m_waitingForXdgToken = false;
-                                 }
-                             });
-                     KWindowSystem::requestXdgActivationToken(window, launchedSerial, QFileInfo(m_serviceEntryPath).completeBaseName());
-@@ -316,7 +317,7 @@ void KProcessRunner::init(const KService::Ptr &service,
-         m_description = userVisibleName;
-     }
- 
--    if (!waitingForXdgToken) {
-+    if (!m_waitingForXdgToken) {
-         startProcess();
-     }
- }
-@@ -331,6 +332,12 @@ void ForkingProcessRunner::startProcess()
- 
- bool ForkingProcessRunner::waitForStarted(int timeout)
- {
-+    if (m_process->state() == QProcess::NotRunning && m_waitingForXdgToken) {
-+        QEventLoop loop;
-+        QObject::connect(m_process.get(), &QProcess::stateChanged, &loop, &QEventLoop::quit);
-+        QTimer::singleShot(timeout, &loop, &QEventLoop::quit);
-+        loop.exec();
-+    }
-     return m_process->waitForStarted(timeout);
- }
- 
-diff --git a/src/gui/kprocessrunner_p.h b/src/gui/kprocessrunner_p.h
-index 1f94df7a2..df6f08f64 100644
---- a/src/gui/kprocessrunner_p.h
-+++ b/src/gui/kprocessrunner_p.h
-@@ -140,6 +140,7 @@ protected:
-     qint64 m_pid = 0;
-     KService::Ptr m_service;
-     QString m_serviceEntryPath;
-+    bool m_waitingForXdgToken = false;
- 
- private:
-     void emitDelayedError(const QString &errorMsg);
--- 
-GitLab
-
diff --git a/kde-frameworks/kio/files/kio-5.88.0-fix-copy-between-filesystems.patch b/kde-frameworks/kio/files/kio-5.88.0-fix-copy-between-filesystems.patch
deleted file mode 100644
index a6a4877cf0f4..000000000000
--- a/kde-frameworks/kio/files/kio-5.88.0-fix-copy-between-filesystems.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From aef544ebbb11e842209f3b071eaa9d1c2f26fa40 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Wed, 17 Nov 2021 23:45:17 +0100
-Subject: [PATCH] Fix copying between different filesystems on Linux < 5.3
-
-From the copy_file_range manpage
-
-EXDEV  The files referred to by fd_in and fd_out are not on the same mounted filesystem (pre Linux 5.3).
----
- src/ioslaves/file/file_unix.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/ioslaves/file/file_unix.cpp b/src/ioslaves/file/file_unix.cpp
-index b4eca2ae9..02b5dc14c 100644
---- a/src/ioslaves/file/file_unix.cpp
-+++ b/src/ioslaves/file/file_unix.cpp
-@@ -813,7 +813,7 @@ void FileProtocol::copy(const QUrl &srcUrl, const QUrl &destUrl, int _mode, JobF
-         const ssize_t copiedBytes = ::copy_file_range(srcFile.handle(), nullptr, destFile.handle(), nullptr, s_maxIPCSize, 0);
- 
-         if (copiedBytes == -1) {
--            if (errno == EINVAL) {
-+            if (errno == EINVAL || errno == EXDEV) {
-                 break; // will continue with next copy mechanism
-             }
- 
--- 
-GitLab
-
diff --git a/kde-frameworks/kio/kio-5.90.0.ebuild b/kde-frameworks/kio/kio-5.90.0.ebuild
index 4c11583c2aea..aca994a76c51 100644
--- a/kde-frameworks/kio/kio-5.90.0.ebuild
+++ b/kde-frameworks/kio/kio-5.90.0.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org xdg-utils
 DESCRIPTION="Framework providing transparent file and data management"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="acl +handbook kerberos +kwallet X"
 
 # tests hang
diff --git a/kde-frameworks/kio/kio-5.88.0-r2.ebuild b/kde-frameworks/kio/kio-5.92.0.ebuild
index d262628dccb5..4c11583c2aea 100644
--- a/kde-frameworks/kio/kio-5.88.0-r2.ebuild
+++ b/kde-frameworks/kio/kio-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ inherit ecm kde.org xdg-utils
 DESCRIPTION="Framework providing transparent file and data management"
 
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="acl +handbook kerberos +kwallet X"
 
 # tests hang
@@ -70,11 +70,6 @@ DEPEND="${RDEPEND}
 "
 PDEPEND=">=kde-frameworks/kded-${PVCUT}:5"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-copy-between-filesystems.patch
-	"${FILESDIR}"/${P}-fix-KRun-open-URLs-twice.patch # KDE-bug 446272
-)
-
 src_configure() {
 	local mycmakeargs=(
 		-DKIO_NO_PUBLIC_QTCONCURRENT=ON