Fri Mar 7 03:48:12 UTC 2014

3 files changed, 31 insertions, 42 deletions

diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD
index d08be502f..c12819dfb 100644
--- a/extra/kdebase-workspace/PKGBUILD
+++ b/extra/kdebase-workspace/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 206679 2014-03-04 18:38:55Z andrea $
+# $Id: PKGBUILD 207098 2014-03-06 12:15:46Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdebase-workspace
 _pkgname=kde-workspace
-pkgver=4.11.6
-_pkgver=4.12.2
-pkgrel=3
+pkgver=4.11.7
+_pkgver=4.12.3
+pkgrel=2
 pkgdesc="Provides the interface and basic tools for the KDE workspace"
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kde-workspace'
@@ -29,8 +29,8 @@ backup=('usr/share/config/kdm/kdmrc')
 source=("http://download.kde.org/stable/${_pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
         'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' 'kdm.logrotate'
         'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch'
-        'systemd209.patch')
-sha1sums=('f1da23a472064307dcd244605a7004701982e5de'
+        'khotkeys-qt4.patch')
+sha1sums=('515c687a5a967e14e0470012e99ca2ae4cd86700'
           '660eae40a707d2711d8d7f32a93214865506b795'
           '6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe'
           '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
@@ -39,7 +39,7 @@ sha1sums=('f1da23a472064307dcd244605a7004701982e5de'
           'c079ebd157c836ba996190f0d2bcea1a7828d02c'
           'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
           'd509dac592bd8b310df27991b208c95b6d907514'
-          'cf57f90debbdabb359272e87696280f8df423fba')
+          'aa9d2e5a69986c4c3d47829721ea99edb473be12')
 
 prepare() {
         mkdir build
@@ -50,12 +50,11 @@ prepare() {
         patch -p0 -i "${srcdir}"/etc-scripts.patch
         # FS#26120
         patch -p1 -i "${srcdir}"/kdm-xinitrd.patch
+        # FS#39188
+        patch -p1 -i "${srcdir}"/khotkeys-qt4.patch
 
         # KDEBUG#202629
         patch -p0 -i "${srcdir}"/terminate-server.patch
-
-        # KDEBUG#331403
-        patch -p1 -i "${srcdir}"/systemd209.patch
 }
 
 build() {
diff --git a/extra/kdebase-workspace/khotkeys-qt4.patch b/extra/kdebase-workspace/khotkeys-qt4.patch
new file mode 100644
index 000000000..2fac860a6
--- /dev/null
+++ b/extra/kdebase-workspace/khotkeys-qt4.patch
@@ -0,0 +1,22 @@
+--- kde-workspace-4.11.7/khotkeys/kcm_hotkeys/actions/dbus_action_widget.cpp~	2014-03-05 18:41:23.126818552 +0000
++++ kde-workspace-4.11.7/khotkeys/kcm_hotkeys/actions/dbus_action_widget.cpp	2014-03-05 18:42:05.563172036 +0000
+@@ -117,7 +117,7 @@
+ 
+ void DbusActionWidget::launchDbusBrowser() const
+     {
+-    if( KRun::runCommand( "qdbusviewer", window()) == 0 )
++    if( KRun::runCommand( "qdbusviewer-qt4", window()) == 0 )
+         {
+         KMessageBox::sorry( window(), i18n( "Failed to run qdbusviewer" ));
+         }
+--- kde-workspace-4.11.7/khotkeys/libkhotkeysprivate/actions/dbus_action.cpp~	2014-03-05 18:41:29.120107842 +0000
++++ kde-workspace-4.11.7/khotkeys/libkhotkeysprivate/actions/dbus_action.cpp	2014-03-05 18:41:52.349936188 +0000
+@@ -133,7 +133,7 @@
+         }
+     kDebug() << "D-Bus call:" << _application << ":" << _object << ":" << _function << ":" << args_list;
+     KProcess proc;
+-    proc << "qdbus" << _application << _object << _function << args_list;
++    proc << "qdbus-qt4" << _application << _object << _function << args_list;
+     proc.startDetached();
+     }
+ 
diff --git a/extra/kdebase-workspace/systemd209.patch b/extra/kdebase-workspace/systemd209.patch
deleted file mode 100644
index 42b3f5efe..000000000
--- a/extra/kdebase-workspace/systemd209.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-commit 7584a63924620bac3bd87277c11cdb8cdb5018b1
-Author: Raymond Wooninck <tittiatcoke@gmail.com>
-Date:   Tue Feb 25 20:12:58 2014 +0100
-
-    Perform the systemd version evaluation through a regular expression to be more flexible for changes in the version string that systemd returns (Based on Review request 115271)
-
-diff --git a/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp b/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp
-index cc3b6ad..70124ad 100644
---- a/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp
-+++ b/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp
-@@ -41,13 +41,17 @@
- 
- bool checkSystemdVersion(uint requiredVersion)
- {
--    bool ok;
- 
-     QDBusInterface systemdIface("org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager",
-                                 QDBusConnection::systemBus(), 0);
--    const uint version = systemdIface.property("Version").toString().section(' ', 1).toUInt(&ok);
--    if (ok) {
--       return (version >= requiredVersion);
-+
-+    const QString reply = systemdIface.property("Version").toString();
-+
-+    QRegExp expsd("(systemd )?([0-9]+)");
-+
-+    if (expsd.exactMatch(reply)) {
-+        const uint version = expsd.cap(2).toUInt();
-+        return (version >= requiredVersion);
-     }
- 
-     // Since version 1.11 Upstart user sessions implement the exact same API as logind