diff --git a/srcpkgs/xinit/patches/dont-use-active-vt.patch b/srcpkgs/xinit/patches/dont-use-active-vt.patch deleted file mode 100644 index 82df70fa4f1..00000000000 --- a/srcpkgs/xinit/patches/dont-use-active-vt.patch +++ /dev/null @@ -1,24 +0,0 @@ -Revert this change that was committed to fix an issue with systemd. - -We want to keep the original behaviour, i.e use the first unused vt. - ---- startx.cpp.orig 2014-09-26 14:22:23.954772539 +0200 -+++ startx.cpp 2014-09-26 14:22:32.993723320 +0200 -@@ -188,17 +188,6 @@ XCOMM process server arguments - if [ x"$server" = x ]; then - server=$defaultserver - --#ifdef __linux__ -- XCOMM When starting the defaultserver start X on the current tty to avoid -- XCOMM the startx session being seen as inactive: -- XCOMM "https://bugzilla.redhat.com/show_bug.cgi?id=806491" -- tty=$(tty) -- if expr match "$tty" '^/dev/tty[0-9]\+$' > /dev/null; then -- tty_num=$(echo "$tty" | grep -oE '[0-9]+$') -- vtarg="vt$tty_num" -- fi --#endif -- - XCOMM For compatibility reasons, only use xserverrc if there were no server command line arguments - if [ x"$serverargs" = x -a x"$display" = x ]; then - if [ -f "$userserverrc" ]; then diff --git a/srcpkgs/xinit/patches/fs25361.patch b/srcpkgs/xinit/patches/fs25361.patch deleted file mode 100644 index ab105d1e98b..00000000000 --- a/srcpkgs/xinit/patches/fs25361.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- startx.cpp 2011-08-02 18:26:57.161711018 +0400 -+++ 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 diff --git a/srcpkgs/xinit/template b/srcpkgs/xinit/template index 50d4bbe8155..a9f2b5c39dd 100644 --- a/srcpkgs/xinit/template +++ b/srcpkgs/xinit/template @@ -1,7 +1,7 @@ # Template build file for 'xinit'. pkgname=xinit -version=1.3.4 -revision=4 +version=1.4.0 +revision=1 build_style=gnu-configure configure_args="--with-xinitdir=/etc/X11/xinit" hostmakedepends="pkg-config" @@ -16,7 +16,7 @@ maintainer="Juan RP " homepage="http://xorg.freedesktop.org/" license="MIT" distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" -checksum=75d88d7397a07e01db253163b7c7a00b249b3d30e99489f2734cac9a0c7902b3 +checksum=230835eef2f5978a1e1344928168119373f6df1d0a32c09515e545721ee582ef post_install() { vinstall ${FILESDIR}/xinitrc 644 etc/skel .xinitrc