diff options
Diffstat (limited to 'extra/xorg-xinit/PKGBUILD')
| -rw-r--r-- | extra/xorg-xinit/PKGBUILD | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/extra/xorg-xinit/PKGBUILD b/extra/xorg-xinit/PKGBUILD index d3874cfe0..38ccfeb49 100644 --- a/extra/xorg-xinit/PKGBUILD +++ b/extra/xorg-xinit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 194377 2013-09-15 08:07:59Z andyrtr $ +# $Id: PKGBUILD 197640 2013-10-27 15:15:12Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xorg-xinit pkgver=1.3.3 -pkgrel=1 +pkgrel=2 pkgdesc="X.Org initialisation program " arch=('i686' 'x86_64' 'mips64el') license=('custom') @@ -30,11 +30,15 @@ sha256sums=('74b2878de6e3d5b5948f1562a77e7f53b4e10621e505ddb278050c7f3cae00af' '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 @@ package() { 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 + } |