diff options
Diffstat (limited to 'kde-frameworks/kglobalaccel')
-rw-r--r-- | kde-frameworks/kglobalaccel/Manifest | 9 | ||||
-rw-r--r-- | kde-frameworks/kglobalaccel/files/kglobalaccel-5.82.0-revert-prevent-activate-w-o-plasma.patch | 242 | ||||
-rw-r--r-- | kde-frameworks/kglobalaccel/kglobalaccel-5.85.0-r1.ebuild | 2 | ||||
-rw-r--r-- | kde-frameworks/kglobalaccel/kglobalaccel-5.86.0.ebuild (renamed from kde-frameworks/kglobalaccel/kglobalaccel-5.82.0-r1.ebuild) | 8 | ||||
-rw-r--r-- | kde-frameworks/kglobalaccel/metadata.xml | 2 |
5 files changed, 8 insertions, 255 deletions
diff --git a/kde-frameworks/kglobalaccel/Manifest b/kde-frameworks/kglobalaccel/Manifest index bbb3547f41a4..db8919a33b23 100644 --- a/kde-frameworks/kglobalaccel/Manifest +++ b/kde-frameworks/kglobalaccel/Manifest @@ -1,7 +1,6 @@ -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-r1.ebuild 937 BLAKE2B 418871e9de4816a2b702e3b7d855fe7f7c5685d0885d7a1f72b5b4ff5c1235cd02f8c1b761a07e42a60d2e7e221964ba550038e5b558fbbb219e1b1963aa8ee5 SHA512 72d074d786140d9fce8954fb8c5d3cd7874c0da4342996816c2a0de65cba000d5f647e855658e86931017a32ae98f6a70f21368a9e04643a597bc55802d8c612 -MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73 +DIST kglobalaccel-5.86.0.tar.xz 88000 BLAKE2B 3c9d361ddf8a85fef783dedafa508f98e90da22652e057298b68a6957d882ddd2c7a28cc13278520c9d5672b1d3954e634d1df0963c7b78c18bfc6183c4db9a7 SHA512 ee1b700cd0c7f9162f6b649e61164e5e0915be3acdc52c504c85f133b64ec8d2ea962503d60d772efb127b6537c3bbd7d61f2b018b9846a791e9cf8caa4c0eb6 +EBUILD kglobalaccel-5.85.0-r1.ebuild 934 BLAKE2B 3dcd7e5e9972800ab25e50094761cd7b5eafaffeed22239c88936a348074457e91396dfc3e419f826cb7564706af374e2277dd30fea4970c513b15d96787e651 SHA512 56074522a4948ea9419639234851fb63f8bb29241d1d4403b1544581c810282be1ba01a29e188c29f5ded374de9922eea1290e50086e8217d85e385022cfc34d +EBUILD kglobalaccel-5.86.0.ebuild 842 BLAKE2B 1489f22563189291286d7976e8568ad38a5131d57a550d409cd7c25372eca559f95ef69b1417670749c42a71fc6f132f854dda8d86ea11811f36d9269c28b0db SHA512 1cc8b8adf61d121b697ac2033f4aa29a8305f2259d3bccb4cc2b542317e32ccd63d5665478eee69a9cc961047681fef8242a6ff5e3f0d7cf0c09faf5d6cc336a +MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80 diff --git a/kde-frameworks/kglobalaccel/files/kglobalaccel-5.82.0-revert-prevent-activate-w-o-plasma.patch b/kde-frameworks/kglobalaccel/files/kglobalaccel-5.82.0-revert-prevent-activate-w-o-plasma.patch deleted file mode 100644 index 1cea821ebe96..000000000000 --- a/kde-frameworks/kglobalaccel/files/kglobalaccel-5.82.0-revert-prevent-activate-w-o-plasma.patch +++ /dev/null @@ -1,242 +0,0 @@ -From 9a48818abf50340e31d718cc675501dec6c51429 Mon Sep 17 00:00:00 2001 -From: Nate Graham <nate@kde.org> -Date: Wed, 26 May 2021 13:14:13 -0600 -Subject: [PATCH] Revert "Prevent kglobalaccel5 getting activated on non-Plasma - systems" - -This reverts commit 48c3376927e5e9c13377bf3cfc8b0c411783e7f3. - -This change broke users of KGlobalAccel run outside of the Plasma -Desktop. This sort of behavior change probably needs to be made during -a major transition like KF6 so that developers have some notice and it -doesn't randomly change and break stuff unexpectedly. - -CCBUG: 435420 -BUG: 437034 -FIXED-IN: 5.83 ---- - src/kglobalaccel.cpp | 80 -------------------------------------------- - 1 file changed, 80 deletions(-) - -diff --git a/src/kglobalaccel.cpp b/src/kglobalaccel.cpp -index 8bb43e5..154caed 100644 ---- a/src/kglobalaccel.cpp -+++ b/src/kglobalaccel.cpp -@@ -25,11 +25,6 @@ - #include <QX11Info> - #endif - --bool active() --{ -- return qgetenv("XDG_CURRENT_DESKTOP") == QByteArrayLiteral("KDE"); --} -- - org::kde::kglobalaccel::Component *KGlobalAccelPrivate::getComponent(const QString &componentUnique, bool remember = false) - { - // Check if we already have this component -@@ -148,11 +143,6 @@ KGlobalAccel::~KGlobalAccel() - void KGlobalAccel::activateGlobalShortcutContext(const QString &contextUnique, const QString &contextFriendly, const QString &programName) - { - Q_UNUSED(contextFriendly); -- -- if (!active()) { -- return; -- } -- - // TODO: provide contextFriendly - self()->d->iface()->activateGlobalShortcutContext(programName, contextUnique); - } -@@ -160,10 +150,6 @@ void KGlobalAccel::activateGlobalShortcutContext(const QString &contextUnique, c - // static - bool KGlobalAccel::cleanComponent(const QString &componentUnique) - { -- if (!active()) { -- return false; -- } -- - org::kde::kglobalaccel::Component *component = self()->getComponent(componentUnique); - if (!component) { - return false; -@@ -175,10 +161,6 @@ bool KGlobalAccel::cleanComponent(const QString &componentUnique) - // static - bool KGlobalAccel::isComponentActive(const QString &componentUnique) - { -- if (!active()) { -- return false; -- } -- - org::kde::kglobalaccel::Component *component = self()->getComponent(componentUnique); - if (!component) { - return false; -@@ -196,10 +178,6 @@ bool KGlobalAccel::isEnabled() const - - org::kde::kglobalaccel::Component *KGlobalAccel::getComponent(const QString &componentUnique) - { -- if (!active()) { -- return nullptr; -- } -- - return d->getComponent(componentUnique); - } - -@@ -526,10 +504,6 @@ void KGlobalAccelPrivate::reRegisterAll() - #if KGLOBALACCEL_BUILD_DEPRECATED_SINCE(4, 2) - QList<QStringList> KGlobalAccel::allMainComponents() - { -- if (!active()) { -- return {}; -- } -- - return d->iface()->allMainComponents(); - } - #endif -@@ -537,9 +511,6 @@ QList<QStringList> KGlobalAccel::allMainComponents() - #if KGLOBALACCEL_BUILD_DEPRECATED_SINCE(4, 2) - QList<QStringList> KGlobalAccel::allActionsForComponent(const QStringList &actionId) - { -- if (!active()) { -- return {}; -- } - return d->iface()->allActionsForComponent(actionId); - } - #endif -@@ -548,29 +519,17 @@ QList<QStringList> KGlobalAccel::allActionsForComponent(const QStringList &actio - #if KGLOBALACCEL_BUILD_DEPRECATED_SINCE(4, 2) - QStringList KGlobalAccel::findActionNameSystemwide(const QKeySequence &seq) - { -- if (!active()) { -- return {}; -- } -- - return self()->d->iface()->action(seq[0]); - } - #endif - - QList<KGlobalShortcutInfo> KGlobalAccel::getGlobalShortcutsByKey(const QKeySequence &seq) - { -- if (!active()) { -- return {}; -- } -- - return self()->d->iface()->getGlobalShortcutsByKey(seq[0]); - } - - bool KGlobalAccel::isGlobalShortcutAvailable(const QKeySequence &seq, const QString &comp) - { -- if (!active()) { -- return false; -- } -- - return self()->d->iface()->isGlobalShortcutAvailable(seq[0], comp); - } - -@@ -578,10 +537,6 @@ bool KGlobalAccel::isGlobalShortcutAvailable(const QKeySequence &seq, const QStr - #if KGLOBALACCEL_BUILD_DEPRECATED_SINCE(4, 2) - bool KGlobalAccel::promptStealShortcutSystemwide(QWidget *parent, const QStringList &actionIdentifier, const QKeySequence &seq) - { -- if (!active()) { -- return false; -- } -- - if (actionIdentifier.size() < 4) { - return false; - } -@@ -604,10 +559,6 @@ bool KGlobalAccel::promptStealShortcutSystemwide(QWidget *parent, const QStringL - // static - bool KGlobalAccel::promptStealShortcutSystemwide(QWidget *parent, const QList<KGlobalShortcutInfo> &shortcuts, const QKeySequence &seq) - { -- if (!active()) { -- return false; -- } -- - if (shortcuts.isEmpty()) { - // Usage error. Just say no - return false; -@@ -640,10 +591,6 @@ bool KGlobalAccel::promptStealShortcutSystemwide(QWidget *parent, const QList<KG - // static - void KGlobalAccel::stealShortcutSystemwide(const QKeySequence &seq) - { -- if (!active()) { -- return; -- } -- - // get the shortcut, remove seq, and set the new shortcut - const QStringList actionId = self()->d->iface()->action(seq[0]); - if (actionId.size() < 4) { // not a global shortcut -@@ -676,10 +623,6 @@ bool checkGarbageKeycode(const QList<QKeySequence> &shortcut) - - bool KGlobalAccel::setDefaultShortcut(QAction *action, const QList<QKeySequence> &shortcut, GlobalShortcutLoading loadFlag) - { -- if (!active()) { -- return false; -- } -- - if (checkGarbageKeycode(shortcut)) { - return false; - } -@@ -695,10 +638,6 @@ bool KGlobalAccel::setDefaultShortcut(QAction *action, const QList<QKeySequence> - - bool KGlobalAccel::setShortcut(QAction *action, const QList<QKeySequence> &shortcut, GlobalShortcutLoading loadFlag) - { -- if (!active()) { -- return false; -- } -- - if (checkGarbageKeycode(shortcut)) { - return false; - } -@@ -724,9 +663,6 @@ QList<QKeySequence> KGlobalAccel::shortcut(const QAction *action) const - - QList<QKeySequence> KGlobalAccel::globalShortcut(const QString &componentName, const QString &actionId) const - { -- if (!active()) { -- return {}; -- } - // see also d->updateGlobalShortcut(action, KGlobalAccelPrivate::ActiveShortcut, KGlobalAccel::Autoloading); - - // how componentName and actionId map to QAction, e.g: -@@ -740,19 +676,11 @@ QList<QKeySequence> KGlobalAccel::globalShortcut(const QString &componentName, c - - void KGlobalAccel::removeAllShortcuts(QAction *action) - { -- if (!active()) { -- return; -- } -- - d->remove(action, KGlobalAccelPrivate::UnRegister); - } - - bool KGlobalAccel::hasShortcut(const QAction *action) const - { -- if (!active()) { -- return false; -- } -- - return d->actionShortcuts.contains(action) || d->actionDefaultShortcuts.contains(action); - } - -@@ -765,10 +693,6 @@ bool KGlobalAccel::eventFilter(QObject *watched, QEvent *event) - - bool KGlobalAccel::setGlobalShortcut(QAction *action, const QList<QKeySequence> &shortcut) - { -- if (!active()) { -- return false; -- } -- - KGlobalAccel *g = KGlobalAccel::self(); - return g->d->setShortcutWithDefault(action, shortcut, Autoloading); - } -@@ -780,10 +704,6 @@ bool KGlobalAccel::setGlobalShortcut(QAction *action, const QKeySequence &shortc - - bool KGlobalAccelPrivate::setShortcutWithDefault(QAction *action, const QList<QKeySequence> &shortcut, KGlobalAccel::GlobalShortcutLoading loadFlag) - { -- if (!active()) { -- return false; -- } -- - if (checkGarbageKeycode(shortcut)) { - return false; - } --- -GitLab - diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.85.0-r1.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.85.0-r1.ebuild index f50a9bbc7b53..52e82e49155e 100644 --- a/kde-frameworks/kglobalaccel/kglobalaccel-5.85.0-r1.ebuild +++ b/kde-frameworks/kglobalaccel/kglobalaccel-5.85.0-r1.ebuild @@ -11,7 +11,7 @@ inherit ecm kde.org DESCRIPTION="Framework to handle global shortcuts" LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" IUSE="nls" DEPEND=" diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.82.0-r1.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.86.0.ebuild index 5cf9c27bbefb..43fdf06f50f9 100644 --- a/kde-frameworks/kglobalaccel/kglobalaccel-5.82.0-r1.ebuild +++ b/kde-frameworks/kglobalaccel/kglobalaccel-5.86.0.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 @@ -11,7 +11,7 @@ inherit ecm kde.org DESCRIPTION="Framework to handle global shortcuts" LICENSE="LGPL-2+" -KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" IUSE="nls" DEPEND=" @@ -30,10 +30,6 @@ DEPEND=" RDEPEND="${DEPEND}" BDEPEND="nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )" -PATCHES=( - "${FILESDIR}"/${P}-revert-prevent-activate-w-o-plasma.patch # KDE-bug 437034 -) - src_test() { XDG_CURRENT_DESKTOP="KDE" ecm_src_test # bug 789342 } diff --git a/kde-frameworks/kglobalaccel/metadata.xml b/kde-frameworks/kglobalaccel/metadata.xml index 85b864e35960..506ecf605bc4 100644 --- a/kde-frameworks/kglobalaccel/metadata.xml +++ b/kde-frameworks/kglobalaccel/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>kde@gentoo.org</email> |