diff options
Diffstat (limited to 'abs/core')
-rw-r--r-- | abs/core/xorg-xinit/PKGBUILD | 52 | ||||
-rw-r--r-- | abs/core/xorg-xinit/fs46369.patch | 11 | ||||
-rw-r--r-- | abs/core/xorg-xinit/xinitrc | 17 | ||||
-rw-r--r-- | abs/core/xorg-xinit/xserverrc | 6 | ||||
-rw-r--r-- | abs/core/xorg-xinit/xsession | 10 |
5 files changed, 38 insertions, 58 deletions
diff --git a/abs/core/xorg-xinit/PKGBUILD b/abs/core/xorg-xinit/PKGBUILD index f9bb1c6..c243af7 100644 --- a/abs/core/xorg-xinit/PKGBUILD +++ b/abs/core/xorg-xinit/PKGBUILD @@ -1,51 +1,51 @@ -# $Id: PKGBUILD 170012 2012-10-31 00:12:04Z thomas $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xorg-xinit -pkgver=1.3.2 -pkgrel=3 +pkgver=1.3.4 +pkgrel=4 pkgdesc="X.Org initialisation program " arch=('i686' 'x86_64') license=('custom') -url="http://xorg.freedesktop.org/" -depends=('libx11' 'xorg-xauth' 'inetutils') +url="https://xorg.freedesktop.org/" +depends=('libx11' 'xorg-xauth' 'xorg-xrdb' 'xorg-xmodmap' 'inetutils') makedepends=('xorg-util-macros') optdepends=('xorg-twm' 'xterm') -backup=('etc/skel/.xinitrc' - 'etc/skel/.xsession' - 'etc/X11/xinit/xserverrc' +backup=('etc/X11/xinit/xserverrc' 'etc/X11/xinit/xinitrc') -source=(${url}/releases/individual/app/xinit-${pkgver}.tar.bz2 +source=(${url}/releases/individual/app/xinit-${pkgver}.tar.bz2{,.sig} 06_move_serverauthfile_into_tmp.diff fs25361.patch - xinitrc - xsession + fs46369.patch xserverrc) options=(!emptydirs) -md5sums=('9c0943cbd83e489ad1b05221b97efd44' - 'abd072ec435ce084cf4e89c58f83d45c' - '73a597d3fb7f5b9487318ac8cfd4bedf' - 'c7b406c3c5c1e8011b3ac7d6b29c1a2c' - '7873d97db30d6c279ed37e3559e7c59d' - '4deba1b7f2cc7f93b304b956023e65d6') +sha256sums=('75d88d7397a07e01db253163b7c7a00b249b3d30e99489f2734cac9a0c7902b3' + 'SKIP' + 'a5c6ced5822bbb3145e0f30a4b12995782ca6d80ff2d927851ec91b5e41212cb' + '431335ceb84f75aaa96fba285a596f61a63629f94756f8063e4f621ae143629b' + '6e2c44b997e604db167f00168e8b6c68257be50447d7a80856b4aa910f52351e' + '86835010b5350c41035495b7b845db0eecf1e4b7eeaf152b12a881fa502e5387') +validpgpkeys=('7C2608F8E5F9E78D7A3F26FF177544B49AF313FB') # "Hans de Goede <jwrdegoede@fedoraproject.org>" -build() { - cd "${srcdir}/xinit-${pkgver}" - patch -Np1 -i "${srcdir}/06_move_serverauthfile_into_tmp.diff" - patch -Np1 -i "${srcdir}/fs25361.patch" +prepare() { + cd xinit-${pkgver} + 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 +} + +build() { + cd xinit-${pkgver} + autoreconf -fi ./configure --prefix=/usr --with-xinitdir=/etc/X11/xinit make } package() { - cd "${srcdir}/xinit-${pkgver}" + 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}/" diff --git a/abs/core/xorg-xinit/fs46369.patch b/abs/core/xorg-xinit/fs46369.patch new file mode 100644 index 0000000..91f2d70 --- /dev/null +++ b/abs/core/xorg-xinit/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__ diff --git a/abs/core/xorg-xinit/xinitrc b/abs/core/xorg-xinit/xinitrc deleted file mode 100644 index dbd080d..0000000 --- a/abs/core/xorg-xinit/xinitrc +++ /dev/null @@ -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 diff --git a/abs/core/xorg-xinit/xserverrc b/abs/core/xorg-xinit/xserverrc index 6b57eeb..b4de252 100644 --- a/abs/core/xorg-xinit/xserverrc +++ b/abs/core/xorg-xinit/xserverrc @@ -1,6 +1,2 @@ #!/bin/sh -if [ -z "$XDG_VTNR" ]; then - exec /usr/bin/X -nolisten tcp "$@" -else - exec /usr/bin/X -nolisten tcp "$@" vt$XDG_VTNR -fi +exec /usr/bin/X -nolisten tcp "$@" diff --git a/abs/core/xorg-xinit/xsession b/abs/core/xorg-xinit/xsession deleted file mode 100644 index a16dc0b..0000000 --- a/abs/core/xorg-xinit/xsession +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -# -# ~/.xsession -# -# Executed by xdm/gdm/kdm at login -# - -/bin/bash --login -i ~/.xinitrc - |