[arch-commits] Commit in lightdm/trunk (PKGBUILD Xsession)

[Maxime Gauduin]

    Date: Friday, June 26, 2015 @ 08:47:18
  Author: alucryd
Revision: 135894

upgpkg: lightdm 1:1.14.0-4

Modified:
  lightdm/trunk/PKGBUILD
  lightdm/trunk/Xsession

----------+
 PKGBUILD |    4 ++--
 Xsession |    9 ++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-06-26 06:30:31 UTC (rev 135893)
+++ PKGBUILD	2015-06-26 06:47:18 UTC (rev 135894)
@@ -5,7 +5,7 @@
 pkgbase=lightdm
 pkgname=('lightdm' 'liblightdm-qt4' 'liblightdm-qt5')
 pkgver=1.14.0
-pkgrel=3
+pkgrel=4
 epoch=1
 pkgdesc='A lightweight display manager'
 arch=('i686' 'x86_64')
@@ -28,7 +28,7 @@
             '33e3c3d6e16c8d30756754ea3f31f5457c5be0343686aad287692be34958984a'
             'a89566307e1c81c24f037d854cbd472d2f94f8a4b759877a01563a332319f7d6'
             'f33edad87232043f7c355b3a4db055fd84ab2c0741da110cf416fbdf005d294f'
-            'cd7a789116087e4a92a6df8ec03b3f7df3955e2bca1db60df0cfd4a42258e831')
+            'd30321a1b490500483b8ed7825fcff2c24a7c760ac627789ff517693888ec3c5')
 
 prepare() {
   cd lightdm-${pkgver}

Modified: Xsession
===================================================================
--- Xsession	2015-06-26 06:30:31 UTC (rev 135893)
+++ Xsession	2015-06-26 06:47:18 UTC (rev 135894)
@@ -41,7 +41,7 @@
 
 unset XKB_IN_USE
 
-# Run all system xinitrc shell scripts.
+# Run all system xinitrc shell scripts
 xinitdir="/etc/X11/xinit/xinitrc.d"
 if [ -d "$xinitdir" ]; then
     for script in $xinitdir/*; do
@@ -52,6 +52,13 @@
     done
 fi
 
+# Run user xsession shell script
+script="$HOME/.xsession"
+if [ -x "$script" -a ! -d "$script" ]; then
+    echo "Loading xsession script $script"
+    . "$script"
+fi
+
 echo "X session wrapper complete, running session $@"
 
 exec $@