Date: Sunday, October 27, 2013 @ 16:15:12 Author: andyrtr Revision: 197640
archrelease: copy trunk to extra-i686, extra-x86_64 Added: xorg-xinit/repos/extra-i686/06_move_serverauthfile_into_tmp.diff (from rev 197639, xorg-xinit/trunk/06_move_serverauthfile_into_tmp.diff) xorg-xinit/repos/extra-i686/PKGBUILD (from rev 197639, xorg-xinit/trunk/PKGBUILD) xorg-xinit/repos/extra-i686/fs25361.patch (from rev 197639, xorg-xinit/trunk/fs25361.patch) xorg-xinit/repos/extra-i686/xinitrc (from rev 197639, xorg-xinit/trunk/xinitrc) xorg-xinit/repos/extra-i686/xserverrc (from rev 197639, xorg-xinit/trunk/xserverrc) xorg-xinit/repos/extra-i686/xsession (from rev 197639, xorg-xinit/trunk/xsession) xorg-xinit/repos/extra-x86_64/06_move_serverauthfile_into_tmp.diff (from rev 197639, xorg-xinit/trunk/06_move_serverauthfile_into_tmp.diff) xorg-xinit/repos/extra-x86_64/PKGBUILD (from rev 197639, xorg-xinit/trunk/PKGBUILD) xorg-xinit/repos/extra-x86_64/fs25361.patch (from rev 197639, xorg-xinit/trunk/fs25361.patch) xorg-xinit/repos/extra-x86_64/xinitrc (from rev 197639, xorg-xinit/trunk/xinitrc) xorg-xinit/repos/extra-x86_64/xserverrc (from rev 197639, xorg-xinit/trunk/xserverrc) xorg-xinit/repos/extra-x86_64/xsession (from rev 197639, xorg-xinit/trunk/xsession) Deleted: xorg-xinit/repos/extra-i686/06_move_serverauthfile_into_tmp.diff xorg-xinit/repos/extra-i686/PKGBUILD xorg-xinit/repos/extra-i686/fs25361.patch xorg-xinit/repos/extra-i686/xinitrc xorg-xinit/repos/extra-i686/xserverrc xorg-xinit/repos/extra-i686/xsession xorg-xinit/repos/extra-x86_64/06_move_serverauthfile_into_tmp.diff xorg-xinit/repos/extra-x86_64/PKGBUILD xorg-xinit/repos/extra-x86_64/fs25361.patch xorg-xinit/repos/extra-x86_64/xinitrc xorg-xinit/repos/extra-x86_64/xserverrc xorg-xinit/repos/extra-x86_64/xsession ---------------------------------------------------+ /06_move_serverauthfile_into_tmp.diff | 40 ++++++ /PKGBUILD | 122 ++++++++++++++++++++ /fs25361.patch | 32 +++++ /xinitrc | 34 +++++ /xserverrc | 12 + /xsession | 20 +++ extra-i686/06_move_serverauthfile_into_tmp.diff | 20 --- extra-i686/PKGBUILD | 52 -------- extra-i686/fs25361.patch | 16 -- extra-i686/xinitrc | 17 -- extra-i686/xserverrc | 6 extra-i686/xsession | 10 - extra-x86_64/06_move_serverauthfile_into_tmp.diff | 20 --- extra-x86_64/PKGBUILD | 52 -------- extra-x86_64/fs25361.patch | 16 -- extra-x86_64/xinitrc | 17 -- extra-x86_64/xserverrc | 6 extra-x86_64/xsession | 10 - 18 files changed, 260 insertions(+), 242 deletions(-) Deleted: extra-i686/06_move_serverauthfile_into_tmp.diff =================================================================== --- extra-i686/06_move_serverauthfile_into_tmp.diff 2013-10-27 15:14:36 UTC (rev 197639) +++ extra-i686/06_move_serverauthfile_into_tmp.diff 2013-10-27 15:15:12 UTC (rev 197640) @@ -1,20 +0,0 @@ -Move startx auth files in /tmp so they are removed on reboot. -http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=357736 -The trap patch didn't seem to work on reboot. ---- - startx.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: xinit/startx.cpp -=================================================================== ---- xinit.orig/startx.cpp -+++ xinit/startx.cpp -@@ -273,7 +273,7 @@ - dummy=0 - - XCOMM create a file with auth information for the server. ':0' is a dummy. -- xserverauthfile=$HOME/.serverauth.$$ -+ xserverauthfile=`mktemp -p /tmp serverauth.XXXXXXXXXX` - trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP KILL BUS TERM - xauth -q -f "$xserverauthfile" << EOF - add :$dummy . $mcookie Copied: xorg-xinit/repos/extra-i686/06_move_serverauthfile_into_tmp.diff (from rev 197639, xorg-xinit/trunk/06_move_serverauthfile_into_tmp.diff) =================================================================== --- extra-i686/06_move_serverauthfile_into_tmp.diff (rev 0) +++ extra-i686/06_move_serverauthfile_into_tmp.diff 2013-10-27 15:15:12 UTC (rev 197640) @@ -0,0 +1,20 @@ +Move startx auth files in /tmp so they are removed on reboot. +http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=357736 +The trap patch didn't seem to work on reboot. +--- + startx.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: xinit/startx.cpp +=================================================================== +--- xinit.orig/startx.cpp ++++ xinit/startx.cpp +@@ -273,7 +273,7 @@ + dummy=0 + + XCOMM create a file with auth information for the server. ':0' is a dummy. +- xserverauthfile=$HOME/.serverauth.$$ ++ xserverauthfile=`mktemp -p /tmp serverauth.XXXXXXXXXX` + trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP KILL BUS TERM + xauth -q -f "$xserverauthfile" << EOF + add :$dummy . $mcookie Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2013-10-27 15:14:36 UTC (rev 197639) +++ extra-i686/PKGBUILD 2013-10-27 15:15:12 UTC (rev 197640) @@ -1,52 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <j...@archlinux.org> -# Contributor: Alexander Baldeck <alexan...@archlinux.org> - -pkgname=xorg-xinit -pkgver=1.3.3 -pkgrel=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') -optdepends=('xorg-twm' 'xterm') -backup=('etc/skel/.xinitrc' - 'etc/skel/.xsession' - 'etc/X11/xinit/xserverrc' - 'etc/X11/xinit/xinitrc') -source=(${url}/releases/individual/app/xinit-${pkgver}.tar.bz2 - 06_move_serverauthfile_into_tmp.diff - fs25361.patch - xinitrc - xsession - xserverrc) -options=(!emptydirs) -sha256sums=('74b2878de6e3d5b5948f1562a77e7f53b4e10621e505ddb278050c7f3cae00af' - 'a5c6ced5822bbb3145e0f30a4b12995782ca6d80ff2d927851ec91b5e41212cb' - '431335ceb84f75aaa96fba285a596f61a63629f94756f8063e4f621ae143629b' - '38a23848b49de8a5c635a128a8b32a6cd0a08a9ee153ad97cb25abd82cfda1bc' - '2b94a42f2521cb5662fb9a5765a7507456dc0352ac9d0f44c56b359dcdb38898' - '5e87bff928c143d9db9966048f6530e83e9e9a1cac09ce4c25f8aabc08611b6f') - -build() { - 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 - ./configure --prefix=/usr --with-xinitdir=/etc/X11/xinit - make -} - -package() { - cd xinit-${pkgver} - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/etc/skel" - install -m644 "${srcdir}/xinitrc" "${pkgdir}/etc/skel/.xinitrc" - install -m644 "${srcdir}/xsession" "${pkgdir}/etc/skel/.xsession" - 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}/" -} Copied: xorg-xinit/repos/extra-i686/PKGBUILD (from rev 197639, xorg-xinit/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2013-10-27 15:15:12 UTC (rev 197640) @@ -0,0 +1,61 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> +# Contributor: Alexander Baldeck <alexan...@archlinux.org> + +pkgname=xorg-xinit +pkgver=1.3.3 +pkgrel=2 +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') +optdepends=('xorg-twm' 'xterm') +backup=('etc/skel/.xinitrc' + 'etc/skel/.xsession' + 'etc/X11/xinit/xserverrc' + 'etc/X11/xinit/xinitrc') +source=(${url}/releases/individual/app/xinit-${pkgver}.tar.bz2 + 06_move_serverauthfile_into_tmp.diff + fs25361.patch + xinitrc + xsession + xserverrc) +options=(!emptydirs) +sha256sums=('74b2878de6e3d5b5948f1562a77e7f53b4e10621e505ddb278050c7f3cae00af' + 'a5c6ced5822bbb3145e0f30a4b12995782ca6d80ff2d927851ec91b5e41212cb' + '431335ceb84f75aaa96fba285a596f61a63629f94756f8063e4f621ae143629b' + '38a23848b49de8a5c635a128a8b32a6cd0a08a9ee153ad97cb25abd82cfda1bc' + '2b94a42f2521cb5662fb9a5765a7507456dc0352ac9d0f44c56b359dcdb38898' + '5e87bff928c143d9db9966048f6530e83e9e9a1cac09ce4c25f8aabc08611b6f') + +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 +} + +package() { + cd xinit-${pkgver} + make DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/etc/skel" + install -m644 "${srcdir}/xinitrc" "${pkgdir}/etc/skel/.xinitrc" + install -m644 "${srcdir}/xsession" "${pkgdir}/etc/skel/.xsession" + 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 + +} Deleted: extra-i686/fs25361.patch =================================================================== --- extra-i686/fs25361.patch 2013-10-27 15:14:36 UTC (rev 197639) +++ extra-i686/fs25361.patch 2013-10-27 15:15:12 UTC (rev 197640) @@ -1,16 +0,0 @@ -Common subdirectories: xinit.orig/privileged_startx and xinit/privileged_startx -diff -u xinit.orig/startx.cpp xinit/startx.cpp ---- xinit.orig/startx.cpp 2011-08-02 18:26:57.161711018 +0400 -+++ xinit/startx.cpp 2011-08-02 19:06:39.348816866 +0400 -@@ -290,9 +290,9 @@ - XCOMM now add the same credentials to the client authority file - XCOMM if '$displayname' already exists do not overwrite it as another - XCOMM server man need it. Add them to the '$xserverauthfile' instead. -- for displayname in $authdisplay $hostname$authdisplay; do -+ for displayname in $authdisplay $hostname/unix$authdisplay; do - authcookie=`XAUTH list "$displayname" @@ -- | sed -n "s/.*$displayname[[:space:]*].*[[:space:]*]//p"` 2>/dev/null; -+ | sed -n "s/.*$hostname\/unix$authdisplay[[:space:]*].*[[:space:]*]//p"` 2>/dev/null; - if [ "z${authcookie}" = "z" ] ; then - XAUTH -q << EOF - add $displayname . $mcookie Copied: xorg-xinit/repos/extra-i686/fs25361.patch (from rev 197639, xorg-xinit/trunk/fs25361.patch) =================================================================== --- extra-i686/fs25361.patch (rev 0) +++ extra-i686/fs25361.patch 2013-10-27 15:15:12 UTC (rev 197640) @@ -0,0 +1,16 @@ +Common subdirectories: xinit.orig/privileged_startx and xinit/privileged_startx +diff -u xinit.orig/startx.cpp xinit/startx.cpp +--- xinit.orig/startx.cpp 2011-08-02 18:26:57.161711018 +0400 ++++ xinit/startx.cpp 2011-08-02 19:06:39.348816866 +0400 +@@ -290,9 +290,9 @@ + XCOMM now add the same credentials to the client authority file + XCOMM if '$displayname' already exists do not overwrite it as another + XCOMM server man need it. Add them to the '$xserverauthfile' instead. +- for displayname in $authdisplay $hostname$authdisplay; do ++ for displayname in $authdisplay $hostname/unix$authdisplay; do + authcookie=`XAUTH list "$displayname" @@ +- | sed -n "s/.*$displayname[[:space:]*].*[[:space:]*]//p"` 2>/dev/null; ++ | sed -n "s/.*$hostname\/unix$authdisplay[[:space:]*].*[[:space:]*]//p"` 2>/dev/null; + if [ "z${authcookie}" = "z" ] ; then + XAUTH -q << EOF + add $displayname . $mcookie Deleted: extra-i686/xinitrc =================================================================== --- extra-i686/xinitrc 2013-10-27 15:14:36 UTC (rev 197639) +++ extra-i686/xinitrc 2013-10-27 15:15:12 UTC (rev 197640) @@ -1,17 +0,0 @@ -#!/bin/sh -# -# ~/.xinitrc -# -# Executed by startx (run your window manager from here) - -if [ -d /etc/X11/xinit/xinitrc.d ]; then - for f in /etc/X11/xinit/xinitrc.d/*; do - [ -x "$f" ] && . "$f" - done - unset f -fi - -# exec gnome-session -# exec startkde -# exec startxfce4 -# ...or the Window Manager of your choice Copied: xorg-xinit/repos/extra-i686/xinitrc (from rev 197639, xorg-xinit/trunk/xinitrc) =================================================================== --- extra-i686/xinitrc (rev 0) +++ extra-i686/xinitrc 2013-10-27 15:15:12 UTC (rev 197640) @@ -0,0 +1,17 @@ +#!/bin/sh +# +# ~/.xinitrc +# +# Executed by startx (run your window manager from here) + +if [ -d /etc/X11/xinit/xinitrc.d ]; then + for f in /etc/X11/xinit/xinitrc.d/*; do + [ -x "$f" ] && . "$f" + done + unset f +fi + +# exec gnome-session +# exec startkde +# exec startxfce4 +# ...or the Window Manager of your choice Deleted: extra-i686/xserverrc =================================================================== --- extra-i686/xserverrc 2013-10-27 15:14:36 UTC (rev 197639) +++ extra-i686/xserverrc 2013-10-27 15:15:12 UTC (rev 197640) @@ -1,6 +0,0 @@ -#!/bin/sh -if [ -z "$XDG_VTNR" ]; then - exec /usr/bin/X -nolisten tcp "$@" -else - exec /usr/bin/X -nolisten tcp "$@" vt$XDG_VTNR -fi Copied: xorg-xinit/repos/extra-i686/xserverrc (from rev 197639, xorg-xinit/trunk/xserverrc) =================================================================== --- extra-i686/xserverrc (rev 0) +++ extra-i686/xserverrc 2013-10-27 15:15:12 UTC (rev 197640) @@ -0,0 +1,6 @@ +#!/bin/sh +if [ -z "$XDG_VTNR" ]; then + exec /usr/bin/X -nolisten tcp "$@" +else + exec /usr/bin/X -nolisten tcp "$@" vt$XDG_VTNR +fi Deleted: extra-i686/xsession =================================================================== --- extra-i686/xsession 2013-10-27 15:14:36 UTC (rev 197639) +++ extra-i686/xsession 2013-10-27 15:15:12 UTC (rev 197640) @@ -1,10 +0,0 @@ -#!/bin/sh - -# -# ~/.xsession -# -# Executed by xdm/gdm/kdm at login -# - -/bin/bash --login -i ~/.xinitrc - Copied: xorg-xinit/repos/extra-i686/xsession (from rev 197639, xorg-xinit/trunk/xsession) =================================================================== --- extra-i686/xsession (rev 0) +++ extra-i686/xsession 2013-10-27 15:15:12 UTC (rev 197640) @@ -0,0 +1,10 @@ +#!/bin/sh + +# +# ~/.xsession +# +# Executed by xdm/gdm/kdm at login +# + +/bin/bash --login -i ~/.xinitrc + Deleted: extra-x86_64/06_move_serverauthfile_into_tmp.diff =================================================================== --- extra-x86_64/06_move_serverauthfile_into_tmp.diff 2013-10-27 15:14:36 UTC (rev 197639) +++ extra-x86_64/06_move_serverauthfile_into_tmp.diff 2013-10-27 15:15:12 UTC (rev 197640) @@ -1,20 +0,0 @@ -Move startx auth files in /tmp so they are removed on reboot. -http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=357736 -The trap patch didn't seem to work on reboot. ---- - startx.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: xinit/startx.cpp -=================================================================== ---- xinit.orig/startx.cpp -+++ xinit/startx.cpp -@@ -273,7 +273,7 @@ - dummy=0 - - XCOMM create a file with auth information for the server. ':0' is a dummy. -- xserverauthfile=$HOME/.serverauth.$$ -+ xserverauthfile=`mktemp -p /tmp serverauth.XXXXXXXXXX` - trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP KILL BUS TERM - xauth -q -f "$xserverauthfile" << EOF - add :$dummy . $mcookie Copied: xorg-xinit/repos/extra-x86_64/06_move_serverauthfile_into_tmp.diff (from rev 197639, xorg-xinit/trunk/06_move_serverauthfile_into_tmp.diff) =================================================================== --- extra-x86_64/06_move_serverauthfile_into_tmp.diff (rev 0) +++ extra-x86_64/06_move_serverauthfile_into_tmp.diff 2013-10-27 15:15:12 UTC (rev 197640) @@ -0,0 +1,20 @@ +Move startx auth files in /tmp so they are removed on reboot. +http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=357736 +The trap patch didn't seem to work on reboot. +--- + startx.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: xinit/startx.cpp +=================================================================== +--- xinit.orig/startx.cpp ++++ xinit/startx.cpp +@@ -273,7 +273,7 @@ + dummy=0 + + XCOMM create a file with auth information for the server. ':0' is a dummy. +- xserverauthfile=$HOME/.serverauth.$$ ++ xserverauthfile=`mktemp -p /tmp serverauth.XXXXXXXXXX` + trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP KILL BUS TERM + xauth -q -f "$xserverauthfile" << EOF + add :$dummy . $mcookie Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2013-10-27 15:14:36 UTC (rev 197639) +++ extra-x86_64/PKGBUILD 2013-10-27 15:15:12 UTC (rev 197640) @@ -1,52 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <j...@archlinux.org> -# Contributor: Alexander Baldeck <alexan...@archlinux.org> - -pkgname=xorg-xinit -pkgver=1.3.3 -pkgrel=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') -optdepends=('xorg-twm' 'xterm') -backup=('etc/skel/.xinitrc' - 'etc/skel/.xsession' - 'etc/X11/xinit/xserverrc' - 'etc/X11/xinit/xinitrc') -source=(${url}/releases/individual/app/xinit-${pkgver}.tar.bz2 - 06_move_serverauthfile_into_tmp.diff - fs25361.patch - xinitrc - xsession - xserverrc) -options=(!emptydirs) -sha256sums=('74b2878de6e3d5b5948f1562a77e7f53b4e10621e505ddb278050c7f3cae00af' - 'a5c6ced5822bbb3145e0f30a4b12995782ca6d80ff2d927851ec91b5e41212cb' - '431335ceb84f75aaa96fba285a596f61a63629f94756f8063e4f621ae143629b' - '38a23848b49de8a5c635a128a8b32a6cd0a08a9ee153ad97cb25abd82cfda1bc' - '2b94a42f2521cb5662fb9a5765a7507456dc0352ac9d0f44c56b359dcdb38898' - '5e87bff928c143d9db9966048f6530e83e9e9a1cac09ce4c25f8aabc08611b6f') - -build() { - 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 - ./configure --prefix=/usr --with-xinitdir=/etc/X11/xinit - make -} - -package() { - cd xinit-${pkgver} - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/etc/skel" - install -m644 "${srcdir}/xinitrc" "${pkgdir}/etc/skel/.xinitrc" - install -m644 "${srcdir}/xsession" "${pkgdir}/etc/skel/.xsession" - 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}/" -} Copied: xorg-xinit/repos/extra-x86_64/PKGBUILD (from rev 197639, xorg-xinit/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2013-10-27 15:15:12 UTC (rev 197640) @@ -0,0 +1,61 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> +# Contributor: Alexander Baldeck <alexan...@archlinux.org> + +pkgname=xorg-xinit +pkgver=1.3.3 +pkgrel=2 +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') +optdepends=('xorg-twm' 'xterm') +backup=('etc/skel/.xinitrc' + 'etc/skel/.xsession' + 'etc/X11/xinit/xserverrc' + 'etc/X11/xinit/xinitrc') +source=(${url}/releases/individual/app/xinit-${pkgver}.tar.bz2 + 06_move_serverauthfile_into_tmp.diff + fs25361.patch + xinitrc + xsession + xserverrc) +options=(!emptydirs) +sha256sums=('74b2878de6e3d5b5948f1562a77e7f53b4e10621e505ddb278050c7f3cae00af' + 'a5c6ced5822bbb3145e0f30a4b12995782ca6d80ff2d927851ec91b5e41212cb' + '431335ceb84f75aaa96fba285a596f61a63629f94756f8063e4f621ae143629b' + '38a23848b49de8a5c635a128a8b32a6cd0a08a9ee153ad97cb25abd82cfda1bc' + '2b94a42f2521cb5662fb9a5765a7507456dc0352ac9d0f44c56b359dcdb38898' + '5e87bff928c143d9db9966048f6530e83e9e9a1cac09ce4c25f8aabc08611b6f') + +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 +} + +package() { + cd xinit-${pkgver} + make DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/etc/skel" + install -m644 "${srcdir}/xinitrc" "${pkgdir}/etc/skel/.xinitrc" + install -m644 "${srcdir}/xsession" "${pkgdir}/etc/skel/.xsession" + 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 + +} Deleted: extra-x86_64/fs25361.patch =================================================================== --- extra-x86_64/fs25361.patch 2013-10-27 15:14:36 UTC (rev 197639) +++ extra-x86_64/fs25361.patch 2013-10-27 15:15:12 UTC (rev 197640) @@ -1,16 +0,0 @@ -Common subdirectories: xinit.orig/privileged_startx and xinit/privileged_startx -diff -u xinit.orig/startx.cpp xinit/startx.cpp ---- xinit.orig/startx.cpp 2011-08-02 18:26:57.161711018 +0400 -+++ xinit/startx.cpp 2011-08-02 19:06:39.348816866 +0400 -@@ -290,9 +290,9 @@ - XCOMM now add the same credentials to the client authority file - XCOMM if '$displayname' already exists do not overwrite it as another - XCOMM server man need it. Add them to the '$xserverauthfile' instead. -- for displayname in $authdisplay $hostname$authdisplay; do -+ for displayname in $authdisplay $hostname/unix$authdisplay; do - authcookie=`XAUTH list "$displayname" @@ -- | sed -n "s/.*$displayname[[:space:]*].*[[:space:]*]//p"` 2>/dev/null; -+ | sed -n "s/.*$hostname\/unix$authdisplay[[:space:]*].*[[:space:]*]//p"` 2>/dev/null; - if [ "z${authcookie}" = "z" ] ; then - XAUTH -q << EOF - add $displayname . $mcookie Copied: xorg-xinit/repos/extra-x86_64/fs25361.patch (from rev 197639, xorg-xinit/trunk/fs25361.patch) =================================================================== --- extra-x86_64/fs25361.patch (rev 0) +++ extra-x86_64/fs25361.patch 2013-10-27 15:15:12 UTC (rev 197640) @@ -0,0 +1,16 @@ +Common subdirectories: xinit.orig/privileged_startx and xinit/privileged_startx +diff -u xinit.orig/startx.cpp xinit/startx.cpp +--- xinit.orig/startx.cpp 2011-08-02 18:26:57.161711018 +0400 ++++ xinit/startx.cpp 2011-08-02 19:06:39.348816866 +0400 +@@ -290,9 +290,9 @@ + XCOMM now add the same credentials to the client authority file + XCOMM if '$displayname' already exists do not overwrite it as another + XCOMM server man need it. Add them to the '$xserverauthfile' instead. +- for displayname in $authdisplay $hostname$authdisplay; do ++ for displayname in $authdisplay $hostname/unix$authdisplay; do + authcookie=`XAUTH list "$displayname" @@ +- | sed -n "s/.*$displayname[[:space:]*].*[[:space:]*]//p"` 2>/dev/null; ++ | sed -n "s/.*$hostname\/unix$authdisplay[[:space:]*].*[[:space:]*]//p"` 2>/dev/null; + if [ "z${authcookie}" = "z" ] ; then + XAUTH -q << EOF + add $displayname . $mcookie Deleted: extra-x86_64/xinitrc =================================================================== --- extra-x86_64/xinitrc 2013-10-27 15:14:36 UTC (rev 197639) +++ extra-x86_64/xinitrc 2013-10-27 15:15:12 UTC (rev 197640) @@ -1,17 +0,0 @@ -#!/bin/sh -# -# ~/.xinitrc -# -# Executed by startx (run your window manager from here) - -if [ -d /etc/X11/xinit/xinitrc.d ]; then - for f in /etc/X11/xinit/xinitrc.d/*; do - [ -x "$f" ] && . "$f" - done - unset f -fi - -# exec gnome-session -# exec startkde -# exec startxfce4 -# ...or the Window Manager of your choice Copied: xorg-xinit/repos/extra-x86_64/xinitrc (from rev 197639, xorg-xinit/trunk/xinitrc) =================================================================== --- extra-x86_64/xinitrc (rev 0) +++ extra-x86_64/xinitrc 2013-10-27 15:15:12 UTC (rev 197640) @@ -0,0 +1,17 @@ +#!/bin/sh +# +# ~/.xinitrc +# +# Executed by startx (run your window manager from here) + +if [ -d /etc/X11/xinit/xinitrc.d ]; then + for f in /etc/X11/xinit/xinitrc.d/*; do + [ -x "$f" ] && . "$f" + done + unset f +fi + +# exec gnome-session +# exec startkde +# exec startxfce4 +# ...or the Window Manager of your choice Deleted: extra-x86_64/xserverrc =================================================================== --- extra-x86_64/xserverrc 2013-10-27 15:14:36 UTC (rev 197639) +++ extra-x86_64/xserverrc 2013-10-27 15:15:12 UTC (rev 197640) @@ -1,6 +0,0 @@ -#!/bin/sh -if [ -z "$XDG_VTNR" ]; then - exec /usr/bin/X -nolisten tcp "$@" -else - exec /usr/bin/X -nolisten tcp "$@" vt$XDG_VTNR -fi Copied: xorg-xinit/repos/extra-x86_64/xserverrc (from rev 197639, xorg-xinit/trunk/xserverrc) =================================================================== --- extra-x86_64/xserverrc (rev 0) +++ extra-x86_64/xserverrc 2013-10-27 15:15:12 UTC (rev 197640) @@ -0,0 +1,6 @@ +#!/bin/sh +if [ -z "$XDG_VTNR" ]; then + exec /usr/bin/X -nolisten tcp "$@" +else + exec /usr/bin/X -nolisten tcp "$@" vt$XDG_VTNR +fi Deleted: extra-x86_64/xsession =================================================================== --- extra-x86_64/xsession 2013-10-27 15:14:36 UTC (rev 197639) +++ extra-x86_64/xsession 2013-10-27 15:15:12 UTC (rev 197640) @@ -1,10 +0,0 @@ -#!/bin/sh - -# -# ~/.xsession -# -# Executed by xdm/gdm/kdm at login -# - -/bin/bash --login -i ~/.xinitrc - Copied: xorg-xinit/repos/extra-x86_64/xsession (from rev 197639, xorg-xinit/trunk/xsession) =================================================================== --- extra-x86_64/xsession (rev 0) +++ extra-x86_64/xsession 2013-10-27 15:15:12 UTC (rev 197640) @@ -0,0 +1,10 @@ +#!/bin/sh + +# +# ~/.xsession +# +# Executed by xdm/gdm/kdm at login +# + +/bin/bash --login -i ~/.xinitrc +