summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Bidulock2014-07-03 07:00:42 -0600
committerBrian Bidulock2015-06-10 23:41:41 -0600
commit750958b7646b8707394df38501398f5c48326e8a (patch)
tree1c07e4feaef71ca59f540ec0a3f748a1740b8847
parent69d16600d311a752bc77033c0c83753b7f36e9e3 (diff)
downloadaur-750958b7646b8707394df38501398f5c48326e8a.tar.gz
version 1:1.3.3.r9.g5502aaf-1
-rw-r--r--.AURINFO23
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD19
3 files changed, 30 insertions, 20 deletions
diff --git a/.AURINFO b/.AURINFO
new file mode 100644
index 00000000000..d4588f3cbad
--- /dev/null
+++ b/.AURINFO
@@ -0,0 +1,23 @@
+pkgbase = xorg-xinit-git
+ pkgdesc = X.Org initialisation program
+ pkgver = 1.3.3.r9.g5502aaf
+ pkgrel = 1
+ epoch = 1
+ url = http://xorg.freedesktop.org/
+ arch = i686
+ arch = x86_64
+ license = custom
+ makedepends = xorg-util-macros
+ depends = xorg-xauth
+ depends = inetutils
+ optdepends = xorg-twm
+ optdepends = xterm
+ provides = xorg-xinit
+ conflicts = xorg-xinit
+ source = xorg-xinit-git::git://anongit.freedesktop.org/git/xorg/app/xinit
+ source = fs25361.patch
+ options = !emptydirs
+ backup = etc/X11/xinit/xinitrc
+
+pkgname = xorg-xinit-git
+
diff --git a/.SRCINFO b/.SRCINFO
index 74d7e673154..3f8840a811a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = xorg-xinit-git
pkgdesc = X.Org initialisation program
- pkgver = 1.3.4.r8.gc5e40f5
+ pkgver = 1.3.3.r9.g5502aaf
pkgrel = 1
epoch = 1
url = http://xorg.freedesktop.org/
@@ -8,7 +8,6 @@ pkgbase = xorg-xinit-git
arch = x86_64
license = custom
makedepends = xorg-util-macros
- depends = libx11
depends = xorg-xauth
depends = inetutils
optdepends = xorg-twm
@@ -16,16 +15,11 @@ 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
pkgname = xorg-xinit-git
diff --git a/PKGBUILD b/PKGBUILD
index c8a4b28c520..e23f5ce9515 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,30 +5,25 @@
_pkgname=xorg-xinit
pkgname=xorg-xinit-git
-pkgver=1.3.4.r8.gc5e40f5
+pkgver=1.3.3.r9.g5502aaf
pkgrel=1
epoch=1
pkgdesc="X.Org initialisation program "
arch=('i686' 'x86_64')
license=('custom')
url="http://xorg.freedesktop.org/"
-depends=('libx11' 'xorg-xauth' 'inetutils')
+depends=('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)
+ fs25361.patch)
options=(!emptydirs)
sha256sums=('SKIP'
- 'a5c6ced5822bbb3145e0f30a4b12995782ca6d80ff2d927851ec91b5e41212cb'
- '7cd5941b962542117fada9bbb80f76db99eee14fa951d1a4a09e0f386fcef562'
- '5e87bff928c143d9db9966048f6530e83e9e9a1cac09ce4c25f8aabc08611b6f')
+ '7cd5941b962542117fada9bbb80f76db99eee14fa951d1a4a09e0f386fcef562')
pkgver() {
cd $pkgname
@@ -37,9 +32,8 @@ pkgver() {
prepare() {
cd $pkgname
- patch -Np1 -i ../06_move_serverauthfile_into_tmp.diff
-# patch -Np1 -i ../fs25361.patch
- sed -i -e 's/XSLASHGLOB.sh/XSLASHGLOB/' xinitrc.cpp
+ patch -Np1 -i ../fs25361.patch
+ sed -i -e 's,\?\*\.sh,?*,' xinitrc.cpp
}
build() {
@@ -53,7 +47,6 @@ package() {
cd $pkgname
make DESTDIR="${pkgdir}" install
- 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}/"
}