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

[Jan Steffens]

    Date: Friday, September 25, 2015 @ 19:39:36
  Author: heftig
Revision: 247482

fix dbus activation

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-09-25 17:37:56 UTC (rev 247481)
+++ PKGBUILD	2015-09-25 17:39:36 UTC (rev 247482)
@@ -7,7 +7,7 @@
 _pkgname=kde-workspace
 pkgver=4.11.22
 _pkgver=15.08.0
-pkgrel=2
+pkgrel=3
 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,7 +29,7 @@
 source=("http://download.kde.org/stable/applications/${_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'
-        'khotkeys-qt4.patch')
+        'khotkeys-qt4.patch' 'dbus-update-environment.patch')
 sha1sums=('f08fbe309ed16c51ad31b0b260b2adeb7af1bb37'
           '660eae40a707d2711d8d7f32a93214865506b795'
           '6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe'
@@ -39,7 +39,8 @@
           'c079ebd157c836ba996190f0d2bcea1a7828d02c'
           'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
           'd509dac592bd8b310df27991b208c95b6d907514'
-          'aa9d2e5a69986c4c3d47829721ea99edb473be12')
+          'aa9d2e5a69986c4c3d47829721ea99edb473be12'
+          '410311314b1ccb1ed5607dcf8bd418074d8c4019')
 
 prepare() {
         mkdir build
@@ -48,6 +49,8 @@
 
         # reads the shell scripts in /etc/kde/
         patch -p0 -i "${srcdir}"/etc-scripts.patch
+        # sends env vars to existing dbus
+        patch -p1 -i "${srcdir}"/dbus-update-environment.patch
         # FS#26120
         patch -p1 -i "${srcdir}"/kdm-xinitrd.patch
         # FS#39188

Added: dbus-update-environment.patch
===================================================================
--- dbus-update-environment.patch	                        (rev 0)
+++ dbus-update-environment.patch	2015-09-25 17:39:36 UTC (rev 247482)
@@ -0,0 +1,12 @@
+diff -u -r kde-workspace-4.11.22/startkde.cmake kde-workspace-4.11.22-dbus/startkde.cmake
+--- kde-workspace-4.11.22/startkde.cmake	2015-09-25 19:04:25.415328264 +0200
++++ kde-workspace-4.11.22-dbus/startkde.cmake	2015-09-25 19:06:06.115118584 +0200
+@@ -272,6 +272,8 @@
+ # D-Bus autolaunch is broken
+ if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
+     eval `dbus-launch --sh-syntax --exit-with-session`
++else
++    dbus-update-activation-environment --systemd --all
+ fi
+ if $qdbus >/dev/null 2>/dev/null; then
+     : # ok