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

[Andreas Radke]

    Date: Sunday, October 27, 2013 @ 16:14:36
  Author: andyrtr
Revision: 197639

upgpkg: xorg-xinit 1.3.3-2

fix annoying empty lines - FS#36959

Modified:
  xorg-xinit/trunk/PKGBUILD

----------+
 PKGBUILD |   13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-10-27 15:13:27 UTC (rev 197638)
+++ PKGBUILD	2013-10-27 15:14:36 UTC (rev 197639)
@@ -4,7 +4,7 @@
 
 pkgname=xorg-xinit
 pkgver=1.3.3
-pkgrel=1
+pkgrel=2
 pkgdesc="X.Org initialisation program "
 arch=('i686' 'x86_64')
 license=('custom')
@@ -30,11 +30,15 @@
             '2b94a42f2521cb5662fb9a5765a7507456dc0352ac9d0f44c56b359dcdb38898'
             '5e87bff928c143d9db9966048f6530e83e9e9a1cac09ce4c25f8aabc08611b6f')
 
-build() {
+prepare() {
   cd xinit-${pkgver}
   patch -Np1 -i "${srcdir}/06_move_serverauthfile_into_tmp.diff"
   patch -Np1 -i "${srcdir}/fs25361.patch"
   sed -i -e 's/XSLASHGLOB.sh/XSLASHGLOB/' xinitrc.cpp
+}
+
+build() {
+  cd xinit-${pkgver}
   ./configure --prefix=/usr --with-xinitdir=/etc/X11/xinit
   make
 }
@@ -49,4 +53,9 @@
   install -m644 "${srcdir}/xserverrc" "${pkgdir}/etc/X11/xinit/xserverrc"
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+  
+  # a workaround for https://bugs.archlinux.org/task/36959
+  sed -i '/^\s*$/d' $pkgdir/usr/bin/startx
+  sed -i '/^\s*$/d' $pkgdir/etc/X11/xinit/xinitrc
+
 }