[arch-commits] Commit in kdebase-workspace/trunk (PKGBUILD khotkeys-qt4.patch)

[Andrea Scarpino]

    Date: Wednesday, March 5, 2014 @ 20:13:53
  Author: andrea
Revision: 206908

upgpkg: kdebase-workspace 4.11.7-2

Make khotkeys working with Qt4

Added:
  kdebase-workspace/trunk/khotkeys-qt4.patch
Modified:
  kdebase-workspace/trunk/PKGBUILD

--------------------+
 PKGBUILD           |   10 +++++++---
 khotkeys-qt4.patch |   22 ++++++++++++++++++++++
 2 files changed, 29 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-05 18:47:13 UTC (rev 206907)
+++ PKGBUILD	2014-03-05 19:13:53 UTC (rev 206908)
@@ -6,7 +6,7 @@
 _pkgname=kde-workspace
 pkgver=4.11.7
 _pkgver=4.12.3
-pkgrel=1
+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'
@@ -28,7 +28,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')
+        'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch'
+        'khotkeys-qt4.patch')
 sha1sums=('515c687a5a967e14e0470012e99ca2ae4cd86700'
           '660eae40a707d2711d8d7f32a93214865506b795'
           '6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe'
@@ -37,7 +38,8 @@
           'bbe55f2000217474ce7246f12ee437ceaaf7e9ae'
           'c079ebd157c836ba996190f0d2bcea1a7828d02c'
           'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
-          'd509dac592bd8b310df27991b208c95b6d907514')
+          'd509dac592bd8b310df27991b208c95b6d907514'
+          'aa9d2e5a69986c4c3d47829721ea99edb473be12')
 
 prepare() {
         mkdir build
@@ -48,6 +50,8 @@
         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

Added: khotkeys-qt4.patch
===================================================================
--- khotkeys-qt4.patch	                        (rev 0)
+++ khotkeys-qt4.patch	2014-03-05 19:13:53 UTC (rev 206908)
@@ -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();
+     }
+