[arch-commits] Commit in lxde-common/trunk (PKGBUILD dbus-update-environment.patch)

[Jan Steffens]

    Date: Friday, September 25, 2015 @ 19:03:40
  Author: heftig
Revision: 141604

fix dbus activation

Added:
  lxde-common/trunk/dbus-update-environment.patch
Modified:
  lxde-common/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-09-25 13:04:46 UTC (rev 141603)
+++ PKGBUILD	2015-09-25 17:03:40 UTC (rev 141604)
@@ -5,7 +5,7 @@
 
 pkgname=lxde-common
 pkgver=0.99.0
-pkgrel=2
+pkgrel=3
 pkgdesc='Common files of the LXDE Desktop'
 arch=('any')
 url='http://lxde.org/'
@@ -17,9 +17,16 @@
 makedepends=('intltool')
 optdepends=('gtk-engines: default GTK+ theme'
             'lxde-icon-theme: default icon theme')
-source=(http://downloads.sourceforge.net/lxde/${pkgname}-${pkgver}.tar.xz)
-md5sums=('5a417f5a0e5b510a0c018b66b0dc4081')
+source=(http://downloads.sourceforge.net/lxde/${pkgname}-${pkgver}.tar.xz
+        dbus-update-environment.patch)
+md5sums=('5a417f5a0e5b510a0c018b66b0dc4081'
+         '9f5cdfb8aef6286b6de79a50d1fddd7f')
 
+prepare() {
+    cd $srcdir/$pkgname-$pkgver
+    patch -Np1 -i ../dbus-update-environment.patch
+}
+
 build() {
     cd $srcdir/$pkgname-$pkgver
     ./configure --sysconfdir=/etc --prefix=/usr

Added: dbus-update-environment.patch
===================================================================
--- dbus-update-environment.patch	                        (rev 0)
+++ dbus-update-environment.patch	2015-09-25 17:03:40 UTC (rev 141604)
@@ -0,0 +1,20 @@
+diff -u -r lxde-common-0.99.0/startlxde.in lxde-common-0.99.0-dbus/startlxde.in
+--- lxde-common-0.99.0/startlxde.in	2014-10-23 16:08:00.000000000 +0200
++++ lxde-common-0.99.0-dbus/startlxde.in	2015-09-25 19:00:01.152474183 +0200
+@@ -26,8 +26,14 @@
+ export SAL_USE_VCLPLUGIN=gtk
+ 
+ # Launch DBus if needed
+-if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then
+-	eval "$(dbus-launch --sh-syntax --exit-with-session)"
++if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
++	if which dbus-launch >/dev/null; then
++		eval "$(dbus-launch --sh-syntax --exit-with-session)"
++	fi
++else
++	if which dbus-update-activation-environment >/dev/null; then
++		dbus-update-activation-environment --systemd --all
++	fi
+ fi
+ 
+ export XDG_MENU_PREFIX="lxde-"