[arch-commits] Commit in xorg-xinit/trunk (PKGBUILD xinitrc)

[Jan de Groot]

    Date: Thursday, March 10, 2011 @ 14:11:37
  Author: jgc
Revision: 113891

upgpkg: xorg-xinit 1.3.0-3
Remove from xorg group
Fix xinitrc.d to take all files, not just .sh files
Add xinitrc.d block to .xinitrc also, as xinit will not execute system xinitrc if it is present

Modified:
  xorg-xinit/trunk/PKGBUILD
  xorg-xinit/trunk/xinitrc

----------+
 PKGBUILD |    6 +++---
 xinitrc  |    7 +++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-03-10 17:50:31 UTC (rev 113890)
+++ PKGBUILD	2011-03-10 19:11:37 UTC (rev 113891)
@@ -4,7 +4,7 @@
 
 pkgname=xorg-xinit
 pkgver=1.3.0
-pkgrel=2
+pkgrel=3
 pkgdesc="X.Org initialisation program "
 arch=(i686 x86_64)
 license=('custom')
@@ -16,7 +16,6 @@
         'etc/skel/.xsession'
         'etc/X11/xinit/xserverrc'
         'etc/X11/xinit/xinitrc')
-groups=('xorg')
 source=(${url}/releases/individual/app/xinit-${pkgver}.tar.bz2
         06_move_serverauthfile_into_tmp.diff
         xinitrc
@@ -25,13 +24,14 @@
 options=(!emptydirs)
 md5sums=('bc4e8b7d1919597cc37a0d24aa149dda'
          'abd072ec435ce084cf4e89c58f83d45c'
-         'cee2d70748a089fbc7db64a4a6e8fdb1'
+         'c7b406c3c5c1e8011b3ac7d6b29c1a2c'
          '7873d97db30d6c279ed37e3559e7c59d'
          'c5baef10fdb7239594daee72a94ddab3')
 
 build() {
   cd "${srcdir}/xinit-${pkgver}"
   patch -Np1 -i "${srcdir}/06_move_serverauthfile_into_tmp.diff"
+  sed -i -e 's/XSLASHGLOB.sh/XSLASHGLOB/' xinitrc.cpp
   ./configure --prefix=/usr --with-xinitdir=/etc/X11/xinit
   make
 }

Modified: xinitrc
===================================================================
--- xinitrc	2011-03-10 17:50:31 UTC (rev 113890)
+++ xinitrc	2011-03-10 19:11:37 UTC (rev 113891)
@@ -4,6 +4,13 @@
 #
 # Executed by startx (run your window manager from here)
 
+if [ -d /etc/X11/xinit/xinitrc.d ]; then
+  for f in /etc/X11/xinit/xinitrc.d/*; do
+    [ -x "$f" ] && . "$f"
+  done
+  unset f
+fi
+
 # exec gnome-session
 # exec startkde
 # exec startxfce4