diff options
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | PKGBUILD | 20 | ||||
| -rw-r--r-- | fs46369.patch | 11 |
3 files changed, 28 insertions, 15 deletions
@@ -1,21 +1,21 @@ -# Generated by mksrcinfo v8 -# Fri Dec 4 12:18:45 UTC 2015 pkgbase = xorg-xinit-git pkgdesc = X.Org initialisation program - pkgver = 1.3.4.r9.g281b314 + pkgver = 1.4.1.r0.g9a8b937 pkgrel = 1 - epoch = 1 url = http://xorg.freedesktop.org/ arch = i686 arch = x86_64 license = custom + makedepends = git makedepends = xorg-util-macros depends = libx11 depends = xorg-xauth + depends = xorg-xrdb + depends = xorg-xmodmap depends = inetutils optdepends = xorg-twm optdepends = xterm - provides = xorg-xinit + provides = xorg-xinit=1.4.1-1 conflicts = xorg-xinit options = !emptydirs backup = etc/X11/xinit/xserverrc @@ -23,10 +23,12 @@ pkgbase = xorg-xinit-git source = xorg-xinit-git::git://anongit.freedesktop.org/git/xorg/app/xinit source = 06_move_serverauthfile_into_tmp.diff source = fs25361.patch + source = fs46369.patch source = xserverrc sha256sums = SKIP sha256sums = a5c6ced5822bbb3145e0f30a4b12995782ca6d80ff2d927851ec91b5e41212cb sha256sums = 7cd5941b962542117fada9bbb80f76db99eee14fa951d1a4a09e0f386fcef562 + sha256sums = 6e2c44b997e604db167f00168e8b6c68257be50447d7a80856b4aa910f52351e sha256sums = 5e87bff928c143d9db9966048f6530e83e9e9a1cac09ce4c25f8aabc08611b6f pkgname = xorg-xinit-git @@ -1,34 +1,34 @@ -# $Id: PKGBUILD 201357 2013-12-09 12:20:22Z jgc $ +# $Id: PKGBUILD 263727 2016-04-01 16:25:05Z andyrtr $ # Maintainer: Brian Bidulock <bidulock@openss7.org> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> _pkgname=xorg-xinit pkgname=xorg-xinit-git -pkgver=1.3.4.r9.g281b314 +pkgver=1.4.1.r0.g9a8b937 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') -makedepends=('xorg-util-macros') +depends=('libx11' 'xorg-xauth' 'xorg-xrdb' 'xorg-xmodmap' 'inetutils') +makedepends=('git' 'xorg-util-macros') optdepends=('xorg-twm' 'xterm') -backup=( - 'etc/X11/xinit/xserverrc' +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 + fs46369.patch xserverrc) options=(!emptydirs) sha256sums=('SKIP' 'a5c6ced5822bbb3145e0f30a4b12995782ca6d80ff2d927851ec91b5e41212cb' '7cd5941b962542117fada9bbb80f76db99eee14fa951d1a4a09e0f386fcef562' + '6e2c44b997e604db167f00168e8b6c68257be50447d7a80856b4aa910f52351e' '5e87bff928c143d9db9966048f6530e83e9e9a1cac09ce4c25f8aabc08611b6f') +provides=("${_pkgname}=${pkgver%%.r*}-${pkgrel}") +conflicts=("${_pkgname}") pkgver() { cd $pkgname @@ -39,6 +39,7 @@ prepare() { cd $pkgname patch -Np1 -i ../06_move_serverauthfile_into_tmp.diff # patch -Np1 -i ../fs25361.patch + patch -Np1 -i ../fs46369.patch sed -i -e 's/XSLASHGLOB.sh/XSLASHGLOB/' xinitrc.cpp } @@ -52,7 +53,6 @@ build() { 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}/" diff --git a/fs46369.patch b/fs46369.patch new file mode 100644 index 000000000000..91f2d70c9999 --- /dev/null +++ b/fs46369.patch @@ -0,0 +1,11 @@ +diff -u -r xinit-1.3.4/startx.cpp xinit-1.3.4-dbus/startx.cpp +--- xinit-1.3.4/startx.cpp 2015-09-21 17:07:29.732240308 +0200 ++++ xinit-1.3.4-dbus/startx.cpp 2015-09-21 17:07:59.255424644 +0200 +@@ -11,7 +11,6 @@ + XCOMM Site administrators are STRONGLY urged to write nicer versions. + XCOMM + +-unset DBUS_SESSION_BUS_ADDRESS + unset SESSION_MANAGER + + #ifdef __APPLE__ |