summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2021-12-10 21:06:17 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2021-12-14 10:22:27 +0100
commita0ab273ef9e3895fd746f547e830b31139a5b03f (patch)
tree9597d256c29fc02fa51679da41207b4284e18ffd /kde-frameworks/kglobalaccel
parentkde-frameworks/kemoticons: drop 5.85.0* (diff)
downloadgentoo-a0ab273ef9e3895fd746f547e830b31139a5b03f.tar.gz
gentoo-a0ab273ef9e3895fd746f547e830b31139a5b03f.tar.bz2
gentoo-a0ab273ef9e3895fd746f547e830b31139a5b03f.zip
kde-frameworks/kglobalaccel: drop 5.85.0*
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-frameworks/kglobalaccel')
-rw-r--r--kde-frameworks/kglobalaccel/Manifest1
-rw-r--r--kde-frameworks/kglobalaccel/files/kglobalaccel-5.85.0-start-processes-w-kstart5-if-available.patch67
-rw-r--r--kde-frameworks/kglobalaccel/kglobalaccel-5.85.0-r1.ebuild39
3 files changed, 0 insertions, 107 deletions
diff --git a/kde-frameworks/kglobalaccel/Manifest b/kde-frameworks/kglobalaccel/Manifest
index 4f53ca3bc8ca..2d0fda5453ea 100644
--- a/kde-frameworks/kglobalaccel/Manifest
+++ b/kde-frameworks/kglobalaccel/Manifest
@@ -1,3 +1,2 @@
-DIST kglobalaccel-5.85.0.tar.xz 87868 BLAKE2B c76a60426406689434b8b7e90ff9f107173ffa8bb6e6f78603541c2f7fdba62719d141f01ac2a7e3ebeae06a2a891a5467e6ee87eb5d30a53ed4e3faa98a1b28 SHA512 091194d3171820c121c32356bf1dfd98416b91952b745afbf35fc75a7e944a5c80f17fb1f8418016513eaaf63ccb07c1aec822f5f3823f3f4aa604c3dd9963f2
DIST kglobalaccel-5.88.0.tar.xz 88180 BLAKE2B a1642db79366428c9fd1b644c03258633386a23d290545635bf787e22a362ae7c7d8701380498e9ecc5cea1ff230aeeec500f9c58d920b34d234b74f011d71ad SHA512 aeaf82a2371a9259493f89cec46f40abb6c0ddac48c4831b75a3a31c46bad63b390fd6948cd473124cdc28b2b3d8018834a986e11f4648028697ab871534787f
DIST kglobalaccel-5.89.0.tar.xz 90384 BLAKE2B 5e8a3251650343326c40cbef6e52cbf87a4043cd4228269b627652589e4555acdbeaa0a822d2e83b0eb7053e4cb5ec1ba7055fe28b9b108bd3953979e164c3b6 SHA512 a9749dc090ec38bc37d625729ea9ab7b6e87521e8376a1182dd98978309a1b7cd3888f63a47a4ad56ae734cf49e43f77824288eeb3b3c00c35f8a171c12c5dcd
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
deleted file mode 100644
index 0a5dcd5c4f37..000000000000
--- a/kde-frameworks/kglobalaccel/files/kglobalaccel-5.85.0-start-processes-w-kstart5-if-available.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-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-r1.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.85.0-r1.ebuild
deleted file mode 100644
index 52e82e49155e..000000000000
--- a/kde-frameworks/kglobalaccel/kglobalaccel-5.85.0-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework to handle global shortcuts"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="nls"
-
-DEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtx11extras-${QTMIN}:5
- =kde-frameworks/kconfig-${PVCUT}*:5
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/kcrash-${PVCUT}*:5
- =kde-frameworks/kdbusaddons-${PVCUT}*:5
- =kde-frameworks/kwindowsystem-${PVCUT}*:5[X]
- x11-libs/libxcb
- x11-libs/xcb-util-keysyms
-"
-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
-}