Date: Friday, September 25, 2015 @ 18:21:20 Author: heftig Revision: 247461
fix dbus activation Added: xfce4-session/trunk/dbus-update-environment.patch Modified: xfce4-session/trunk/PKGBUILD -------------------------------+ PKGBUILD | 7 ++++++- dbus-update-environment.patch | 18 ++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-09-25 16:14:33 UTC (rev 247460) +++ PKGBUILD 2015-09-25 16:21:20 UTC (rev 247461) @@ -4,7 +4,7 @@ pkgname=xfce4-session pkgver=4.12.1 -pkgrel=2 +pkgrel=3 pkgdesc="A session manager for Xfce" arch=('i686' 'x86_64') url="http://www.xfce.org/" @@ -22,9 +22,11 @@ install=$pkgname.install source=(http://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2 0001-Pass-VT-number-to-xinit-if-XDG_VTNR-is-set.patch + dbus-update-environment.patch xfce-polkit-gnome-authentication-agent-1.desktop) sha256sums=('97d7f2a2d0af7f3623b68d1f04091e02913b28f9555dab8b0d26c8a1299d08fd' '7ea702a1d3391d36958cff57496ba2474592dd915cf7569a65501522c2410cf1' + 'fcdc6f9c29da129bd2d33aa247f3a89865623374ac7bb809e16088f74cc36098' '74c94c5f7893d714e04ec7d8b8520c978a5748757a0cdcf5128492f09f31b643') prepare() { @@ -32,6 +34,9 @@ # https://bugzilla.xfce.org/show_bug.cgi?id=11759 patch -Np1 -i ../0001-Pass-VT-number-to-xinit-if-XDG_VTNR-is-set.patch + + # Support using existing dbus-daemon + patch -Np1 -i ../dbus-update-environment.patch } build() { Added: dbus-update-environment.patch =================================================================== --- dbus-update-environment.patch (rev 0) +++ dbus-update-environment.patch 2015-09-25 16:21:20 UTC (rev 247461) @@ -0,0 +1,18 @@ +diff -u -r xfce4-session-4.12.1/scripts/xinitrc.in xfce4-session-4.12.1-dbus/scripts/xinitrc.in +--- xfce4-session-4.12.1/scripts/xinitrc.in 2015-03-16 08:29:52.000000000 +0100 ++++ xfce4-session-4.12.1-dbus/scripts/xinitrc.in 2015-09-25 18:17:11.524016526 +0200 +@@ -132,7 +132,13 @@ + export DBUS_SESSION_BUS_ADDRESS + else + echo "Could not find dbus-launch; Xfce will not work properly" >&2 +- fi ++ fi ++else ++ if which dbus-update-activation-environment >/dev/null 2>&1; then ++ dbus-update-activation-environment --systemd --all ++ else ++ echo "Could not find dbus-update-activation-environment; Xfce will not work properly" >&2 ++ fi + fi + + # this is only necessary when running w/o xfce4-session