Date: Friday, October 24, 2014 @ 20:22:31 Author: andrea Revision: 225276
archrelease: copy trunk to extra-i686, extra-x86_64 Added: khotkeys/repos/extra-i686/PKGBUILD (from rev 225275, khotkeys/trunk/PKGBUILD) khotkeys/repos/extra-i686/fix-shortcuts.patch (from rev 225275, khotkeys/trunk/fix-shortcuts.patch) khotkeys/repos/extra-x86_64/PKGBUILD (from rev 225275, khotkeys/trunk/PKGBUILD) khotkeys/repos/extra-x86_64/fix-shortcuts.patch (from rev 225275, khotkeys/trunk/fix-shortcuts.patch) Deleted: khotkeys/repos/extra-i686/PKGBUILD khotkeys/repos/extra-x86_64/PKGBUILD ----------------------------------+ /PKGBUILD | 82 +++++++++++++++++++++++++++++++++++++ extra-i686/PKGBUILD | 36 ---------------- extra-i686/fix-shortcuts.patch | 24 ++++++++++ extra-x86_64/PKGBUILD | 36 ---------------- extra-x86_64/fix-shortcuts.patch | 24 ++++++++++ 5 files changed, 130 insertions(+), 72 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2014-10-24 18:21:19 UTC (rev 225275) +++ extra-i686/PKGBUILD 2014-10-24 18:22:31 UTC (rev 225276) @@ -1,36 +0,0 @@ -# $Id$ -# Maintainer: Andrea Scarpino <and...@archlinux.org> -# Contributor: Antonio Rojas - -pkgname=khotkeys -pkgver=5.1.0.1 -pkgrel=1 -pkgdesc='KHotKeys' -arch=('i686' 'x86_64') -url='https://projects.kde.org/projects/kde/workspace/khotkeys' -license=('LGPL') -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') - -prepare() { - mkdir -p build -} - -build() { - cd build - cmake ../$pkgname-5.1.0 \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_INSTALL_DIR=lib \ - -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ - -DBUILD_TESTING=OFF - make -} - -package() { - cd build - make DESTDIR="${pkgdir}" install -} Copied: khotkeys/repos/extra-i686/PKGBUILD (from rev 225275, khotkeys/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2014-10-24 18:22:31 UTC (rev 225276) @@ -0,0 +1,41 @@ +# $Id$ +# Maintainer: Andrea Scarpino <and...@archlinux.org> +# Contributor: Antonio Rojas + +pkgname=khotkeys +pkgver=5.1.0.1 +pkgrel=2 +pkgdesc='KHotKeys' +arch=('i686' 'x86_64') +url='https://projects.kde.org/projects/kde/workspace/khotkeys' +license=('LGPL') +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" + 'fix-shortcuts.patch') +md5sums=('50123581b85df285bd2ea5d7f722e7d0' + 'db701291f62d72780ec0cfd6c18635c6') + +prepare() { + mkdir -p build + + cd $pkgname-5.1.0 + patch -p1 -i "${srcdir}"/fix-shortcuts.patch +} + +build() { + cd build + cmake ../$pkgname-5.1.0 \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIB_INSTALL_DIR=lib \ + -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ + -DBUILD_TESTING=OFF + make +} + +package() { + cd build + make DESTDIR="${pkgdir}" install +} Copied: khotkeys/repos/extra-i686/fix-shortcuts.patch (from rev 225275, khotkeys/trunk/fix-shortcuts.patch) =================================================================== --- extra-i686/fix-shortcuts.patch (rev 0) +++ extra-i686/fix-shortcuts.patch 2014-10-24 18:22:31 UTC (rev 225276) @@ -0,0 +1,24 @@ +commit e1faf20d79d63f45afd5fcdafdecc4cb59aaaf2e +Author: David Edmundson <k...@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)) + { Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2014-10-24 18:21:19 UTC (rev 225275) +++ extra-x86_64/PKGBUILD 2014-10-24 18:22:31 UTC (rev 225276) @@ -1,36 +0,0 @@ -# $Id$ -# Maintainer: Andrea Scarpino <and...@archlinux.org> -# Contributor: Antonio Rojas - -pkgname=khotkeys -pkgver=5.1.0.1 -pkgrel=1 -pkgdesc='KHotKeys' -arch=('i686' 'x86_64') -url='https://projects.kde.org/projects/kde/workspace/khotkeys' -license=('LGPL') -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') - -prepare() { - mkdir -p build -} - -build() { - cd build - cmake ../$pkgname-5.1.0 \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_INSTALL_DIR=lib \ - -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ - -DBUILD_TESTING=OFF - make -} - -package() { - cd build - make DESTDIR="${pkgdir}" install -} Copied: khotkeys/repos/extra-x86_64/PKGBUILD (from rev 225275, khotkeys/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2014-10-24 18:22:31 UTC (rev 225276) @@ -0,0 +1,41 @@ +# $Id$ +# Maintainer: Andrea Scarpino <and...@archlinux.org> +# Contributor: Antonio Rojas + +pkgname=khotkeys +pkgver=5.1.0.1 +pkgrel=2 +pkgdesc='KHotKeys' +arch=('i686' 'x86_64') +url='https://projects.kde.org/projects/kde/workspace/khotkeys' +license=('LGPL') +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" + 'fix-shortcuts.patch') +md5sums=('50123581b85df285bd2ea5d7f722e7d0' + 'db701291f62d72780ec0cfd6c18635c6') + +prepare() { + mkdir -p build + + cd $pkgname-5.1.0 + patch -p1 -i "${srcdir}"/fix-shortcuts.patch +} + +build() { + cd build + cmake ../$pkgname-5.1.0 \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIB_INSTALL_DIR=lib \ + -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ + -DBUILD_TESTING=OFF + make +} + +package() { + cd build + make DESTDIR="${pkgdir}" install +} Copied: khotkeys/repos/extra-x86_64/fix-shortcuts.patch (from rev 225275, khotkeys/trunk/fix-shortcuts.patch) =================================================================== --- extra-x86_64/fix-shortcuts.patch (rev 0) +++ extra-x86_64/fix-shortcuts.patch 2014-10-24 18:22:31 UTC (rev 225276) @@ -0,0 +1,24 @@ +commit e1faf20d79d63f45afd5fcdafdecc4cb59aaaf2e +Author: David Edmundson <k...@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)) + {