gentoo resync : 10.09.2021

3 files changed, 74 insertions, 2 deletions

diff --git a/kde-frameworks/kglobalaccel/Manifest b/kde-frameworks/kglobalaccel/Manifest
index 9d74f1db6ccd..bbb3547f41a4 100644
--- a/kde-frameworks/kglobalaccel/Manifest
+++ b/kde-frameworks/kglobalaccel/Manifest
@@ -1,6 +1,7 @@
 AUX kglobalaccel-5.82.0-revert-prevent-activate-w-o-plasma.patch 7552 BLAKE2B 37de1efd65119ca8df9147a5f52da98711102215a381c9bbf9c8796558ceafab8309225281ace5ec4dd59692a37e11a051f0bc1ff0755ba8a81705f7e4a634d7 SHA512 2c8e910240c3405da9bdc5962fcb3cc2db5a9b5a61f6155d8b2673ec30c957d00819f661e605fba3c2e14734e944c766376df6cb3c3e8708b62d5b64672f3007
+AUX kglobalaccel-5.85.0-start-processes-w-kstart5-if-available.patch 2743 BLAKE2B 067e602048a9caceee71d1288f43d3da06b4d00b904f46ea2e227c7af18b8c1cf543f8f84e2bec1890187488cf81abfa0a9cfadc311bcc67169a85f8b5876393 SHA512 21c6d19fa875b920e80027ddc9122a4f6855051b3397948864e408dc2265da405eac4b5d345930f94d4eda32e0340f746e20c56c7068b99fe8f5b5a8c6fc747f
 DIST kglobalaccel-5.82.0.tar.xz 87932 BLAKE2B feed60b09b01da373b3a6b989ca465b93a67d1ba84ce45c503805e6cb49af1b7ce99afa1921414e9a616d344f95366e0e4822b58f41ea73222dacfcc448a588c SHA512 c6f757628ca8123183b1ead08fbf326bf8b6d5b97e4dc65c33a2c158103aa7915617d423692ee417059bd08a299546b7cdd373b31dbfd80f2498193da7b5aaf7
 DIST kglobalaccel-5.85.0.tar.xz 87868 BLAKE2B c76a60426406689434b8b7e90ff9f107173ffa8bb6e6f78603541c2f7fdba62719d141f01ac2a7e3ebeae06a2a891a5467e6ee87eb5d30a53ed4e3faa98a1b28 SHA512 091194d3171820c121c32356bf1dfd98416b91952b745afbf35fc75a7e944a5c80f17fb1f8418016513eaaf63ccb07c1aec822f5f3823f3f4aa604c3dd9963f2
 EBUILD kglobalaccel-5.82.0-r1.ebuild 923 BLAKE2B 70334606890e0d5f0725335e7e2bf47fa7a4f4cfc726861c6f05d3d90ea957bba3556841ba9431c81ae0901598c4738be8fa8109f666c6d19ab9f458b99d5d9a SHA512 dc744dd22f8330c36bd0adee7a898c8cbd272e4c6f9f032af8cb873c518f58735af321ba097e62152908e4117f7de8c75f6b6c384bbd93183f55989512bd6605
-EBUILD kglobalaccel-5.85.0.ebuild 842 BLAKE2B 218c70491ecb4cfc10087ceaff5d2773e28f849e740e6087629eb2a6f560cd3badb29d69c69f42bc0f272d54f0ada804589c0bb265d908fa845807dc8758fe74 SHA512 d97ce1ef94be40ef56e17cb14634818ba9da0deabed0d20856426cc48fb48076ed9787a9cc2f57c88db745d7dba3b11b5467200807eb849150a38c0251bde0a6
+EBUILD kglobalaccel-5.85.0-r1.ebuild 937 BLAKE2B 418871e9de4816a2b702e3b7d855fe7f7c5685d0885d7a1f72b5b4ff5c1235cd02f8c1b761a07e42a60d2e7e221964ba550038e5b558fbbb219e1b1963aa8ee5 SHA512 72d074d786140d9fce8954fb8c5d3cd7874c0da4342996816c2a0de65cba000d5f647e855658e86931017a32ae98f6a70f21368a9e04643a597bc55802d8c612
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/kglobalaccel/files/kglobalaccel-5.85.0-start-processes-w-kstart5-if-available.patch b/kde-frameworks/kglobalaccel/files/kglobalaccel-5.85.0-start-processes-w-kstart5-if-available.patch
new file mode 100644
index 000000000000..0a5dcd5c4f37
--- /dev/null
+++ b/kde-frameworks/kglobalaccel/files/kglobalaccel-5.85.0-start-processes-w-kstart5-if-available.patch
@@ -0,0 +1,67 @@
+From c6c14830a98050cbee5aa48dd8812e2197515de3 Mon Sep 17 00:00:00 2001
+From: David Redondo <kde@david-redondo.de>
+Date: Mon, 30 Aug 2021 15:45:36 +0200
+Subject: [PATCH] Start processes with kstart5 if available
+
+The intention of 717e4ea9f8e9d3f9ea5e6c8de2efbffd5ef2af82 was to start
+processes with kstart5 so they are in the correct cgroup. We should
+always check if it's available first as we still want to prefer it once
+klauncher is registered.
+BUG:433362
+
+* asturm 2021-09-04: Merged with:
+
+From 061c45df933f6a346c85c34fe10df6f1bd857908 Mon Sep 17 00:00:00 2001
+From: Nikos Chantziaras <realnc@gmail.com>
+Date: Thu, 2 Sep 2021 09:42:51 -0600
+Subject: [PATCH] Fix launching commands with args using kstart5
+
+By prepending "--" to the command, kstart5 parses it all as one thing,
+so additional arguments are executed as expected.
+
+BUG: 433362
+---
+ src/runtime/kserviceactioncomponent.cpp | 17 +++++++++--------
+ 1 file changed, 9 insertions(+), 8 deletions(-)
+
+diff --git a/src/runtime/kserviceactioncomponent.cpp b/src/runtime/kserviceactioncomponent.cpp
+index 8bb6962..09b3d7a 100644
+--- a/src/runtime/kserviceactioncomponent.cpp
++++ b/src/runtime/kserviceactioncomponent.cpp
+@@ -48,7 +48,13 @@
+     }
+ 
+     const QString command = parts.takeFirst();
+-    if (klauncherAvailable) {
++
++    const auto kstart = QStandardPaths::findExecutable(QStringLiteral("kstart5"));
++    if (!kstart.isEmpty()) {
++        parts.prepend(command);
++        parts.prepend(QStringLiteral("--"));
++        QProcess::startDetached(kstart, parts);
++    } else if (klauncherAvailable) {
+         QDBusMessage msg = QDBusMessage::createMethodCall(QStringLiteral("org.kde.klauncher5"),
+                                                           QStringLiteral("/KLauncher"),
+                                                           QStringLiteral("org.kde.KLauncher"),
+@@ -57,18 +63,14 @@
+ 
+         QDBusConnection::sessionBus().asyncCall(msg);
+     } else {
+-        const auto kstart = QStandardPaths::findExecutable(QStringLiteral("kstart5"));
+-        if (kstart.isEmpty()) {
+-            QProcess::startDetached(command, parts);
+-        } else {
+-            parts.prepend(command);
+-            QProcess::startDetached(kstart, parts);
+-        }
++        QProcess::startDetached(command, parts);
+     }
+ }
+ 
+ void KServiceActionComponent::emitGlobalShortcutPressed(const GlobalShortcut &shortcut)
+ {
++    // TODO KF6 use ApplicationLauncherJob to start processes when it's available in a framework that we depend on
++
+     // DBusActivatatable spec as per https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#dbus
+     if (m_desktopFile->desktopGroup().readEntry("DBusActivatable", false)) {
+         QString method;
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.85.0.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.85.0-r1.ebuild
index 0b456b3676f0..f50a9bbc7b53 100644
--- a/kde-frameworks/kglobalaccel/kglobalaccel-5.85.0.ebuild
+++ b/kde-frameworks/kglobalaccel/kglobalaccel-5.85.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PVCUT=$(ver_cut 1-2)
 QTMIN=5.15.2
@@ -30,6 +30,10 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND="nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-start-processes-w-kstart5-if-available.patch # KDE-bug 433362
+)
+
 src_test() {
 	XDG_CURRENT_DESKTOP="KDE" ecm_src_test # bug 789342
 }