[arch-commits] Commit in plasma-workspace/trunk (2 files)

[Jan Steffens]

    Date: Friday, September 25, 2015 @ 19:39:58
  Author: heftig
Revision: 247483

fix dbus activation

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

-------------------------------+
 PKGBUILD                      |    9 ++++++---
 dbus-update-environment.patch |   24 ++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-09-25 17:39:36 UTC (rev 247482)
+++ PKGBUILD	2015-09-25 17:39:58 UTC (rev 247483)
@@ -7,7 +7,7 @@
 pkgbase=plasma-workspace
 pkgname=('plasma-workspace' 'drkonqi')
 pkgver=5.4.1
-pkgrel=2
+pkgrel=3
 pkgdesc='KDE Plasma Workspace'
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/workspace/plasma-workspace'
@@ -23,14 +23,17 @@
              'krunner' 'kxmlrpcclient' 'networkmanager-qt')
 groups=('plasma')
 source=("http://download.kde.org/stable/plasma/${pkgver}/${pkgbase}-${pkgver}.tar.xz"
-        'kde.pam')
+        'kde.pam' 'dbus-update-environment.patch')
 md5sums=('0675ac84f739218cd1a17cfdc3d91e22'
-         '378ee33a9ec2870a1a899f2e05ee00d4')
+         '378ee33a9ec2870a1a899f2e05ee00d4'
+         '93414bae74d99b1ded7e8d7bd65b8882')
 
 prepare() {
   mkdir build
 
   cd ${pkgbase}-${pkgver}
+  # sends env vars to existing dbus
+  patch -p1 -i "${srcdir}"/dbus-update-environment.patch
   # be sure to use the Qt5 version of qtpaths
   sed -i 's:qtpaths:qtpaths-qt5:' startkde/startkde.cmake
 }

Added: dbus-update-environment.patch
===================================================================
--- dbus-update-environment.patch	                        (rev 0)
+++ dbus-update-environment.patch	2015-09-25 17:39:58 UTC (rev 247483)
@@ -0,0 +1,24 @@
+diff -u -r plasma-workspace-5.4.1/startkde/startkde.cmake plasma-workspace-5.4.1-dbus/startkde/startkde.cmake
+--- plasma-workspace-5.4.1/startkde/startkde.cmake	2015-09-25 19:12:09.630988076 +0200
++++ plasma-workspace-5.4.1-dbus/startkde/startkde.cmake	2015-09-25 19:15:07.320598595 +0200
+@@ -286,6 +286,8 @@
+ # D-Bus autolaunch is broken
+ if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
+     eval `dbus-launch --sh-syntax --exit-with-session`
++elif which dbus-update-activation-environment >/dev/null 2>/dev/null ; then
++    dbus-update-activation-environment --systemd --all
+ fi
+ if $qdbus >/dev/null 2>/dev/null; then
+     : # ok
+diff -u -r plasma-workspace-5.4.1/startkde/startplasmacompositor.cmake plasma-workspace-5.4.1-dbus/startkde/startplasmacompositor.cmake
+--- plasma-workspace-5.4.1/startkde/startplasmacompositor.cmake	2015-09-03 12:26:33.000000000 +0200
++++ plasma-workspace-5.4.1-dbus/startkde/startplasmacompositor.cmake	2015-09-25 19:15:17.150577050 +0200
+@@ -163,6 +163,8 @@
+ # D-Bus autolaunch is broken
+ if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
+     eval `dbus-launch --sh-syntax --exit-with-session`
++elif which dbus-update-activation-environment >/dev/null 2>/dev/null ; then
++    dbus-update-activation-environment --systemd --all
+ fi
+ if $qdbus >/dev/null 2>/dev/null; then
+     : # ok