summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Bidulock2015-02-08 01:50:21 -0700
committerBrian Bidulock2015-06-10 23:41:43 -0600
commit4123698fb00b6027019cb85d08e4c3ff0f3d4046 (patch)
tree478668fff7ed1f795e4edef6182004473d917ca3
parentad6447fd12ea71a62d354e582735ea0219d382a7 (diff)
downloadaur-4123698fb00b6027019cb85d08e4c3ff0f3d4046.tar.gz
version 1:1.3.4.r2.ge3bab0c-1
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD12
2 files changed, 13 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f259cdcec86..07832828212 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = xorg-xinit-git
pkgdesc = X.Org initialisation program
- pkgver = 1.3.4.r0.g6f6747d
+ pkgver = 1.3.4.r2.ge3bab0c
pkgrel = 1
epoch = 1
url = http://xorg.freedesktop.org/
@@ -8,6 +8,7 @@ pkgbase = xorg-xinit-git
arch = x86_64
license = custom
makedepends = xorg-util-macros
+ depends = libx11
depends = xorg-xauth
depends = inetutils
optdepends = xorg-twm
@@ -15,11 +16,14 @@ pkgbase = xorg-xinit-git
provides = xorg-xinit
conflicts = xorg-xinit
options = !emptydirs
+ backup = etc/X11/xinit/xserverrc
backup = etc/X11/xinit/xinitrc
source = xorg-xinit-git::git://anongit.freedesktop.org/git/xorg/app/xinit
+ source = 06_move_serverauthfile_into_tmp.diff
source = fs25361.patch
source = xserverrc
sha256sums = SKIP
+ sha256sums = a5c6ced5822bbb3145e0f30a4b12995782ca6d80ff2d927851ec91b5e41212cb
sha256sums = 7cd5941b962542117fada9bbb80f76db99eee14fa951d1a4a09e0f386fcef562
sha256sums = 5e87bff928c143d9db9966048f6530e83e9e9a1cac09ce4c25f8aabc08611b6f
diff --git a/PKGBUILD b/PKGBUILD
index e5e79c335d2..40982f166d4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,25 +5,28 @@
_pkgname=xorg-xinit
pkgname=xorg-xinit-git
-pkgver=1.3.4.r0.g6f6747d
+pkgver=1.3.4.r2.ge3bab0c
pkgrel=1
epoch=1
pkgdesc="X.Org initialisation program "
arch=('i686' 'x86_64')
license=('custom')
url="http://xorg.freedesktop.org/"
-depends=('xorg-xauth' 'inetutils')
+depends=('libx11' 'xorg-xauth' 'inetutils')
makedepends=('xorg-util-macros')
optdepends=('xorg-twm' 'xterm')
backup=(
+ 'etc/X11/xinit/xserverrc'
'etc/X11/xinit/xinitrc')
conflicts=('xorg-xinit')
provides=('xorg-xinit')
source=("$pkgname::git://anongit.freedesktop.org/git/xorg/app/xinit"
+ 06_move_serverauthfile_into_tmp.diff
fs25361.patch
xserverrc)
options=(!emptydirs)
sha256sums=('SKIP'
+ 'a5c6ced5822bbb3145e0f30a4b12995782ca6d80ff2d927851ec91b5e41212cb'
'7cd5941b962542117fada9bbb80f76db99eee14fa951d1a4a09e0f386fcef562'
'5e87bff928c143d9db9966048f6530e83e9e9a1cac09ce4c25f8aabc08611b6f')
@@ -34,8 +37,9 @@ pkgver() {
prepare() {
cd $pkgname
+ patch -Np1 -i ../06_move_serverauthfile_into_tmp.diff
patch -Np1 -i ../fs25361.patch
- sed -i -e 's,\?\*\.sh,?*,' xinitrc.cpp
+ sed -i -e 's/XSLASHGLOB.sh/XSLASHGLOB/' xinitrc.cpp
}
build() {
@@ -49,7 +53,7 @@ package() {
cd $pkgname
make DESTDIR="${pkgdir}" install
- install -m644 ../xserverrc "${pkgdir}/etc/X11/xinit/xserverrc"
+ 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}/"
}