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

[Jan Steffens]

    Date: Friday, September 25, 2015 @ 18:27:03
  Author: heftig
Revision: 247464

patch the right files

Modified:
  xfce4-session/trunk/PKGBUILD
  xfce4-session/trunk/dbus-update-environment.patch

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-09-25 16:26:05 UTC (rev 247463)
+++ PKGBUILD	2015-09-25 16:27:03 UTC (rev 247464)
@@ -26,7 +26,7 @@
         xfce-polkit-gnome-authentication-agent-1.desktop)
 sha256sums=('97d7f2a2d0af7f3623b68d1f04091e02913b28f9555dab8b0d26c8a1299d08fd'
             '7ea702a1d3391d36958cff57496ba2474592dd915cf7569a65501522c2410cf1'
-            'fcdc6f9c29da129bd2d33aa247f3a89865623374ac7bb809e16088f74cc36098'
+            '0a3f23c2ee1b73cec3ecb999b2cc1b5d97e7023482e42b418e6f14cd4f671c0b'
             '74c94c5f7893d714e04ec7d8b8520c978a5748757a0cdcf5128492f09f31b643')
 
 prepare() {

Modified: dbus-update-environment.patch
===================================================================
--- dbus-update-environment.patch	2015-09-25 16:26:05 UTC (rev 247463)
+++ dbus-update-environment.patch	2015-09-25 16:27:03 UTC (rev 247464)
@@ -1,6 +1,6 @@
 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
++++ xfce4-session-4.12.1-dbus/scripts/xinitrc.in	2015-09-25 18:23:46.069944338 +0200
 @@ -132,7 +132,13 @@
      export DBUS_SESSION_BUS_ADDRESS
    else
@@ -16,3 +16,21 @@
  fi
  
  # this is only necessary when running w/o xfce4-session
+diff -u -r xfce4-session-4.12.1/scripts/xinitrc.in.in xfce4-session-4.12.1-dbus/scripts/xinitrc.in.in
+--- xfce4-session-4.12.1/scripts/xinitrc.in.in	2014-10-20 07:23:02.000000000 +0200
++++ xfce4-session-4.12.1-dbus/scripts/xinitrc.in.in	2015-09-25 18:24:06.106572945 +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