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

[Evangelos Foutras]

    Date: Friday, March 3, 2017 @ 02:56:37
  Author: foutrelis
Revision: 289908

upgpkg: xfce4-session 4.12.1-6

Source scripts in /etc/X11/xinit/xinitrc.d; needed for xfce4-notifyd to work.

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

---------------------------------------------------+
 PKGBUILD                                          |    7 ++++++-
 xfce4-session-source-system-xinitrc-scripts.patch |   18 ++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-03-03 02:52:24 UTC (rev 289907)
+++ PKGBUILD	2017-03-03 02:56:37 UTC (rev 289908)
@@ -4,7 +4,7 @@
 
 pkgname=xfce4-session
 pkgver=4.12.1
-pkgrel=5
+pkgrel=6
 pkgdesc="A session manager for Xfce"
 arch=('i686' 'x86_64')
 url="http://www.xfce.org/"
@@ -21,9 +21,11 @@
 replaces=('xfce-utils')
 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
+        xfce4-session-source-system-xinitrc-scripts.patch
         xfce-polkit-gnome-authentication-agent-1.desktop)
 sha256sums=('97d7f2a2d0af7f3623b68d1f04091e02913b28f9555dab8b0d26c8a1299d08fd'
             '7ea702a1d3391d36958cff57496ba2474592dd915cf7569a65501522c2410cf1'
+            'a717a0ee6289c9ce06a8e18c6a7cb5a6d6f1769c05c456a6a84843df6a0111da'
             '74c94c5f7893d714e04ec7d8b8520c978a5748757a0cdcf5128492f09f31b643')
 
 prepare() {
@@ -31,6 +33,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
+
+  # https://bugzilla.xfce.org/show_bug.cgi?id=12754
+  patch -Np1 -i ../xfce4-session-source-system-xinitrc-scripts.patch
 }
 
 build() {

Added: xfce4-session-source-system-xinitrc-scripts.patch
===================================================================
--- xfce4-session-source-system-xinitrc-scripts.patch	                        (rev 0)
+++ xfce4-session-source-system-xinitrc-scripts.patch	2017-03-03 02:56:37 UTC (rev 289908)
@@ -0,0 +1,18 @@
+diff -upr xfce4-session-4.12.1.orig/scripts/xinitrc.in.in xfce4-session-4.12.1/scripts/xinitrc.in.in
+--- xfce4-session-4.12.1.orig/scripts/xinitrc.in.in	2015-03-16 09:29:52.000000000 +0200
++++ xfce4-session-4.12.1/scripts/xinitrc.in.in	2017-03-03 04:11:03.591724694 +0200
+@@ -87,6 +87,14 @@ cat /dev/null $XRESOURCES | xrdb -nocpp
+ # load local modmap
+ test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap
+ 
++# 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
++
+ # run xfce4-session if installed
+ if which xfce4-session >/dev/null 2>&1; then
+