[arch-commits] Commit in xfce4-session/trunk (2 files)

[Evangelos Foutras]

    Date: Monday, August 12, 2019 @ 00:36:52
  Author: foutrelis
Revision: 359706

upgpkg: xfce4-session 4.14.0-2

Reinstate patch to source scripts in /etc/X11/xinit/xinitrc.d.

Added:
  xfce4-session/trunk/source-system-xinitrc-scripts.patch
Modified:
  xfce4-session/trunk/PKGBUILD

-------------------------------------+
 PKGBUILD                            |    7 ++++++-
 source-system-xinitrc-scripts.patch |   17 +++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-08-12 00:15:19 UTC (rev 359705)
+++ PKGBUILD	2019-08-12 00:36:52 UTC (rev 359706)
@@ -3,7 +3,7 @@
 
 pkgname=xfce4-session
 pkgver=4.14.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A session manager for Xfce"
 arch=('x86_64')
 url="https://www.xfce.org/"
@@ -19,12 +19,17 @@
             'xlockmore: for locking screen with xflock4'
             'slock: for locking screen with xflock4')
 source=(https://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
+        source-system-xinitrc-scripts.patch
         xfce-polkit-gnome-authentication-agent-1.desktop)
 sha256sums=('14fb6db74eb69eb400673856ba307a0e57f577cf77c3561a5910151e3d52043f'
+            '6f14d529e4c4f30cd547110bd444cee8dc70c90511a397de18acb6c1fd63ea3e'
             '74c94c5f7893d714e04ec7d8b8520c978a5748757a0cdcf5128492f09f31b643')
 
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
+
+  # https://bugzilla.xfce.org/show_bug.cgi?id=15440
+  patch -Np1 -i ../source-system-xinitrc-scripts.patch
 }
 
 build() {

Added: source-system-xinitrc-scripts.patch
===================================================================
--- source-system-xinitrc-scripts.patch	                        (rev 0)
+++ source-system-xinitrc-scripts.patch	2019-08-12 00:36:52 UTC (rev 359706)
@@ -0,0 +1,17 @@
+diff -upr xfce4-session-4.14.0.orig/scripts/xinitrc.in.in xfce4-session-4.14.0/scripts/xinitrc.in.in
+--- xfce4-session-4.14.0.orig/scripts/xinitrc.in.in	2019-08-11 23:11:06.000000000 +0300
++++ xfce4-session-4.14.0/scripts/xinitrc.in.in	2019-08-12 03:28:44.464707715 +0300
+@@ -83,6 +83,13 @@ if command -v systemctl >/dev/null 2>&1
+   dbus-update-activation-environment --systemd XAUTHLOCALHOSTNAME=$XAUTHLOCALHOSTNAME
+ fi
+ 
++# source system xinitrc scripts
++if [ -d /etc/X11/xinit/xinitrc.d ]; then
++  for f in /etc/X11/xinit/xinitrc.d/?*.sh; do
++    [ -x "$f" ] && . "$f"
++  done
++  unset f
++fi
+ 
+ # check if we start xfce4-session with ck-launch-session. this is only
+ # required for starting from a console, not a login manager