From 5ed13142b06050c1f45617acc956aadadcbe4359 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Sun, 16 Jan 2022 07:23:29 +0000 Subject: Sun Jan 16 07:23:29 UTC 2022 a/aaa_base-15.0-x86_64-3.txz: Rebuilt. In initial email to root, use the new /var/lib/pkgtools/ paths to the files for packages and scripts. Thanks to franzen. a/btrfs-progs-5.16-x86_64-1.txz: Upgraded. d/python3-3.9.10-x86_64-1.txz: Upgraded. d/rust-1.58.0-x86_64-1.txz: Upgraded. kde/digikam-7.5.0-x86_64-1.txz: Upgraded. kde/kglobalaccel-5.90.0-x86_64-2.txz: Rebuilt. Applied patch: [PATCH] Prevent kglobalaccel5 getting activated on non-Plasma systems. Although this patch was later reverted, I'm on board with the need for it. If it causes any problems, please let me know soon. Thanks to Lockywolf. kde/kid3-3.9.1-x86_64-1.txz: Upgraded. kde/plasma-wayland-protocols-1.6.0-x86_64-1.txz: Upgraded. kde/sddm-0.19.0-x86_64-10.txz: Rebuilt. Allow the init program to properly supervise sddm when entering runlevel 4. Thanks to mumahendras3. l/neon-0.32.2-x86_64-1.txz: Upgraded. l/netpbm-10.97.02-x86_64-1.txz: Upgraded. n/postfix-3.6.4-x86_64-1.txz: Upgraded. x/mesa-21.3.4-x86_64-1.txz: Upgraded. x/xterm-370-x86_64-2.txz: Rebuilt. Use upstream app-defaults again. Thanks to OldHolborn. --- source/kde/kde/patch/kglobalaccel.patch | 1 + .../48c3376927e5e9c13377bf3cfc8b0c411783e7f3.patch | 235 +++++++++++++++++++++ 2 files changed, 236 insertions(+) create mode 100644 source/kde/kde/patch/kglobalaccel.patch create mode 100644 source/kde/kde/patch/kglobalaccel/48c3376927e5e9c13377bf3cfc8b0c411783e7f3.patch (limited to 'source/kde/kde/patch') diff --git a/source/kde/kde/patch/kglobalaccel.patch b/source/kde/kde/patch/kglobalaccel.patch new file mode 100644 index 000000000..a7dfeb06e --- /dev/null +++ b/source/kde/kde/patch/kglobalaccel.patch @@ -0,0 +1 @@ +cat $CWD/patch/kglobalaccel/48c3376927e5e9c13377bf3cfc8b0c411783e7f3.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/kde/kde/patch/kglobalaccel/48c3376927e5e9c13377bf3cfc8b0c411783e7f3.patch b/source/kde/kde/patch/kglobalaccel/48c3376927e5e9c13377bf3cfc8b0c411783e7f3.patch new file mode 100644 index 000000000..05b2f2c52 --- /dev/null +++ b/source/kde/kde/patch/kglobalaccel/48c3376927e5e9c13377bf3cfc8b0c411783e7f3.patch @@ -0,0 +1,235 @@ +From 48c3376927e5e9c13377bf3cfc8b0c411783e7f3 Mon Sep 17 00:00:00 2001 +From: Nicolas Fella +Date: Sat, 10 Apr 2021 17:08:58 +0200 +Subject: [PATCH] Prevent kglobalaccel5 getting activated on non-Plasma systems + +While in theory kglobalaccel works on any X11 system we don't want it to run on non-Plasma systems. It isn't very useful and may interfere with the desktop's native shortcut system. + +Calling some API of KGlobalAccel may result in a DBus call to the daemon which then may launch by DBus activation. Prevent that from happening on non-Plasma systems. + +BUG: 435420 +CCBUG: 430691 +--- + src/kglobalaccel.cpp | 80 ++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 80 insertions(+) + +--- ./src/kglobalaccel.cpp.orig 2022-01-01 06:30:27.000000000 -0600 ++++ ./src/kglobalaccel.cpp 2022-01-15 23:01:56.683914925 -0600 +@@ -30,6 +30,11 @@ + #endif + #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 +@@ -150,6 +155,11 @@ + 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); + } +@@ -157,6 +167,10 @@ + // static + bool KGlobalAccel::cleanComponent(const QString &componentUnique) + { ++ if (!active()) { ++ return false; ++ } ++ + org::kde::kglobalaccel::Component *component = self()->getComponent(componentUnique); + if (!component) { + return false; +@@ -168,6 +182,10 @@ + // static + bool KGlobalAccel::isComponentActive(const QString &componentUnique) + { ++ if (!active()) { ++ return false; ++ } ++ + org::kde::kglobalaccel::Component *component = self()->getComponent(componentUnique); + if (!component) { + return false; +@@ -185,6 +203,10 @@ + + org::kde::kglobalaccel::Component *KGlobalAccel::getComponent(const QString &componentUnique) + { ++ if (!active()) { ++ return nullptr; ++ } ++ + return d->getComponent(componentUnique); + } + +@@ -528,6 +550,10 @@ + #if KGLOBALACCEL_BUILD_DEPRECATED_SINCE(4, 2) + QList KGlobalAccel::allMainComponents() + { ++ if (!active()) { ++ return {}; ++ } ++ + return d->iface()->allMainComponents(); + } + #endif +@@ -535,6 +561,9 @@ + #if KGLOBALACCEL_BUILD_DEPRECATED_SINCE(4, 2) + QList KGlobalAccel::allActionsForComponent(const QStringList &actionId) + { ++ if (!active()) { ++ return {}; ++ } + return d->iface()->allActionsForComponent(actionId); + } + #endif +@@ -543,6 +572,10 @@ + #if KGLOBALACCEL_BUILD_DEPRECATED_SINCE(4, 2) + QStringList KGlobalAccel::findActionNameSystemwide(const QKeySequence &seq) + { ++ if (!active()) { ++ return {}; ++ } ++ + return self()->d->iface()->actionList(seq); + } + #endif +@@ -550,6 +583,10 @@ + #if KGLOBALACCEL_BUILD_DEPRECATED_SINCE(5, 90) + QList KGlobalAccel::getGlobalShortcutsByKey(const QKeySequence &seq) + { ++ if (!active()) { ++ return {}; ++ } ++ + return globalShortcutsByKey(seq); + } + #endif +@@ -561,6 +598,10 @@ + + bool KGlobalAccel::isGlobalShortcutAvailable(const QKeySequence &seq, const QString &comp) + { ++ if (!active()) { ++ return false; ++ } ++ + return self()->d->iface()->globalShortcutAvailable(seq, comp); + } + +@@ -568,6 +609,10 @@ + #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; + } +@@ -590,6 +635,10 @@ + // static + bool KGlobalAccel::promptStealShortcutSystemwide(QWidget *parent, const QList &shortcuts, const QKeySequence &seq) + { ++ if (!active()) { ++ return false; ++ } ++ + if (shortcuts.isEmpty()) { + // Usage error. Just say no + return false; +@@ -622,6 +671,10 @@ + // 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()->actionList(seq); + if (actionId.size() < 4) { // not a global shortcut +@@ -659,6 +712,10 @@ + + bool KGlobalAccel::setDefaultShortcut(QAction *action, const QList &shortcut, GlobalShortcutLoading loadFlag) + { ++ if (!active()) { ++ return false; ++ } ++ + if (checkGarbageKeycode(shortcut)) { + return false; + } +@@ -674,6 +731,10 @@ + + bool KGlobalAccel::setShortcut(QAction *action, const QList &shortcut, GlobalShortcutLoading loadFlag) + { ++ if (!active()) { ++ return false; ++ } ++ + if (checkGarbageKeycode(shortcut)) { + return false; + } +@@ -699,6 +760,9 @@ + + QList 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: +@@ -711,11 +775,19 @@ + + 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); + } + +@@ -728,6 +800,10 @@ + + bool KGlobalAccel::setGlobalShortcut(QAction *action, const QList &shortcut) + { ++ if (!active()) { ++ return false; ++ } ++ + KGlobalAccel *g = KGlobalAccel::self(); + return g->d->setShortcutWithDefault(action, shortcut, Autoloading); + } +@@ -739,6 +815,10 @@ + + bool KGlobalAccelPrivate::setShortcutWithDefault(QAction *action, const QList &shortcut, KGlobalAccel::GlobalShortcutLoading loadFlag) + { ++ if (!active()) { ++ return false; ++ } ++ + if (checkGarbageKeycode(shortcut)) { + return false; + } -- cgit v1.2.3