[arch-commits] Commit in khotkeys/trunk (PKGBUILD fix-shortcuts.patch)

[Andrea Scarpino]

    Date: Friday, October 24, 2014 @ 20:21:19
  Author: andrea
Revision: 225275

upgpkg: khotkeys 5.1.0.1-2

Patch to make shortcuts working again

Added:
  khotkeys/trunk/fix-shortcuts.patch
Modified:
  khotkeys/trunk/PKGBUILD

---------------------+
 PKGBUILD            |   11 ++++++++---
 fix-shortcuts.patch |   24 ++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-10-24 18:21:00 UTC (rev 225274)
+++ PKGBUILD	2014-10-24 18:21:19 UTC (rev 225275)
@@ -4,7 +4,7 @@
 
 pkgname=khotkeys
 pkgver=5.1.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc='KHotKeys'
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/workspace/khotkeys'
@@ -12,11 +12,16 @@
 depends=('plasma-workspace')
 makedepends=('extra-cmake-modules' 'kdoctools' 'python')
 conflicts=('kdebase-workspace')
-source=("http://download.kde.org/stable/plasma/5.1.0/$pkgname-$pkgver.tar.xz")
-md5sums=('50123581b85df285bd2ea5d7f722e7d0')
+source=("http://download.kde.org/stable/plasma/5.1.0/$pkgname-$pkgver.tar.xz"
+        'fix-shortcuts.patch')
+md5sums=('50123581b85df285bd2ea5d7f722e7d0'
+         'db701291f62d72780ec0cfd6c18635c6')
 
 prepare() {
   mkdir -p build
+
+  cd $pkgname-5.1.0
+  patch -p1 -i "${srcdir}"/fix-shortcuts.patch
 }
 
 build() {

Added: fix-shortcuts.patch
===================================================================
--- fix-shortcuts.patch	                        (rev 0)
+++ fix-shortcuts.patch	2014-10-24 18:21:19 UTC (rev 225275)
@@ -0,0 +1,24 @@
+commit e1faf20d79d63f45afd5fcdafdecc4cb59aaaf2e
+Author: David Edmundson <kde at davidedmundson.co.uk>
+Date:   Fri Oct 24 12:44:11 2014 +0200
+
+    When loading the configuration set active shortcut not the default shortcut
+    
+    Otherwise hotkeys don't work
+    
+    BUG: 337230
+    FIXED-IN: 5.1.1
+
+diff --git a/libkhotkeysprivate/shortcuts_handler.cpp b/libkhotkeysprivate/shortcuts_handler.cpp
+index 54aaf7c..e6c9b47 100644
+--- a/libkhotkeysprivate/shortcuts_handler.cpp
++++ b/libkhotkeysprivate/shortcuts_handler.cpp
+@@ -89,7 +89,7 @@ QAction *ShortcutsHandler::addAction(
+         newAction->setProperty("isConfigurationAction", QVariant(true));
+         }
+     newAction->setText(text);
+-    KGlobalAccel::self()->setDefaultShortcut(newAction, QList<QKeySequence>() << shortcut.primary());
++    KGlobalAccel::self()->setShortcut(newAction, QList<QKeySequence>() << shortcut.primary());
+     // Enable global shortcut. If that fails there is no sense in proceeding
+     if (!KGlobalAccel::self()->hasShortcut(newAction))
+         {