[arch-commits] Commit in plasma-workspace/trunk (PKGBUILD dbus.patch)

[Felix Yan]

    Date: Thursday, January 22, 2015 @ 18:31:27
  Author: fyan
Revision: 229650

upgpkg: plasma-workspace 5.1.2-4

add patch for new dbus

Added:
  plasma-workspace/trunk/dbus.patch
Modified:
  plasma-workspace/trunk/PKGBUILD

------------+
 PKGBUILD   |   12 +++++++++---
 dbus.patch |   38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-01-22 17:26:55 UTC (rev 229649)
+++ PKGBUILD	2015-01-22 17:31:27 UTC (rev 229650)
@@ -5,7 +5,7 @@
 
 pkgname=plasma-workspace
 pkgver=5.1.2
-pkgrel=3
+pkgrel=4
 pkgdesc='KDE Plasma Workspace'
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/workspace/plasma-workspace'
@@ -22,14 +22,20 @@
 options=('!buildflags')
 source=("http://download.kde.org/stable/plasma/${pkgver}/$pkgname-$pkgver.tar.xz"
         'kde.pam'
-        'screenlocker-input.patch' 'screenlocker-network.patch')
+        'screenlocker-input.patch' 'screenlocker-network.patch' 'dbus.patch')
 md5sums=('8a01835179b25e3a7ff644fd7e52ec96'
          '929b182dec8a096206ad493477c09d2c'
          '7e426d07806d8887879d932791bba869'
-         'd67e504422a7e80a91b7adf3f41563f5')
+         'd67e504422a7e80a91b7adf3f41563f5'
+         '45f12d6fec8a5e08ce1080f5efb8fb21')
 
 prepare() {
   mkdir -p build
+
+  cd ${pkgname}-${pkgver}
+  #patch -p1 -i ../screenlocker-input.patch
+  patch -p1 -i ../screenlocker-network.patch
+  patch -p1 -i ../dbus.patch
 }
 
 build() {

Added: dbus.patch
===================================================================
--- dbus.patch	                        (rev 0)
+++ dbus.patch	2015-01-22 17:31:27 UTC (rev 229650)
@@ -0,0 +1,38 @@
+commit c0ace3a3994ab024ba5301b0c6be24a907d57eaf
+Author: Lukáš Tinkl <lukas at kde.org>
+Date:   Thu Jan 8 16:57:30 2015 +0100
+
+    make the call on the right path
+    
+    as dbus says
+
+diff --git a/startkde/ksyncdbusenv/ksyncdbusenv.cpp b/startkde/ksyncdbusenv/ksyncdbusenv.cpp
+index 05ffb0e..8a01e7d 100644
+--- a/startkde/ksyncdbusenv/ksyncdbusenv.cpp
++++ b/startkde/ksyncdbusenv/ksyncdbusenv.cpp
+@@ -23,6 +23,7 @@
+ #include <QDBusMetaType>
+ #include <QDBusPendingCall>
+ #include <QProcessEnvironment>
++#include <QDebug>
+ 
+ typedef QMap<QString,QString> EnvMap;
+ Q_DECLARE_METATYPE(EnvMap)
+@@ -39,7 +40,7 @@ int main(int argc, char **argv)
+     }
+ 
+     QDBusMessage msg = QDBusMessage::createMethodCall(QStringLiteral("org.freedesktop.DBus"),
+-                                                      QStringLiteral("/"),
++                                                      QStringLiteral("/org/freedesktop/DBus"),
+                                                       QStringLiteral("org.freedesktop.DBus"),
+                                                       QStringLiteral("UpdateActivationEnvironment"));
+     qDBusRegisterMetaType<EnvMap>();
+@@ -47,5 +48,8 @@ int main(int argc, char **argv)
+ 
+     QDBusPendingCall reply = QDBusConnection::sessionBus().asyncCall(msg);
+     reply.waitForFinished();
++    if (reply.isError()) {
++	qDebug() << reply.error().name() << reply.error().message();
++    }
+     return reply.isError() ? 1 : 0;
+ }