author | Andrea Scarpino
<andrea@archlinux.org> 2014-11-09 22:47:37 UTC |
committer | Andrea Scarpino
<andrea@archlinux.org> 2014-11-09 22:47:37 UTC |
parent | 8a802f57bf5ce7da7036ecc75fd6c414f45e25ca |
PKGBUILD | +2 | -7 |
fix-shortcuts.patch | +0 | -24 |
diff --git a/PKGBUILD b/PKGBUILD index 00aa66c..708a2b0 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -11,16 +11,11 @@ license=('LGPL') depends=('plasma-workspace') makedepends=('extra-cmake-modules' 'kdoctools' 'python') conflicts=('kdebase-workspace') -source=("http://download.kde.org/stable/plasma/${pkgver}/$pkgname-$pkgver.tar.xz" - 'fix-shortcuts.patch') -md5sums=('1588df491b42cbe2dcd3d1ce525d05de' - 'db701291f62d72780ec0cfd6c18635c6') +source=("http://download.kde.org/stable/plasma/${pkgver}/$pkgname-$pkgver.tar.xz") +md5sums=('1588df491b42cbe2dcd3d1ce525d05de') prepare() { mkdir -p build - - cd ${pkgname}-${pkgver} - patch -p1 -i "${srcdir}"/fix-shortcuts.patch } build() { diff --git a/fix-shortcuts.patch b/fix-shortcuts.patch deleted file mode 100644 index c35338e..0000000 --- a/fix-shortcuts.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit e1faf20d79d63f45afd5fcdafdecc4cb59aaaf2e -Author: David Edmundson <kde@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)) - {