commit: b5d149489d0d734466fe09c232b5ed42ec9ec9f1 Author: Marty E. Plummer <hanetzer <AT> startmail <DOT> com> AuthorDate: Sat Mar 10 05:32:38 2018 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Sat Mar 10 05:55:32 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5d14948
x11-apps/xinit: rebase xinit-1.3.4-startx-current-vt.patch Patch no longer cleanly applies, fixed it up to apply on new version using quilt. Builds properly on my system. Closes: https://bugs.gentoo.org/650066 Signed-off-by: Marty E. Plummer <hanetzer <AT> startmail.com> Closes: https://github.com/gentoo/gentoo/pull/7412 .../xinit/files/xinit-1.4.0-startx-current-vt.patch | 20 ++++++++++++++++++++ x11-apps/xinit/xinit-1.4.0.ebuild | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/x11-apps/xinit/files/xinit-1.4.0-startx-current-vt.patch b/x11-apps/xinit/files/xinit-1.4.0-startx-current-vt.patch new file mode 100644 index 00000000000..ecddd3b369e --- /dev/null +++ b/x11-apps/xinit/files/xinit-1.4.0-startx-current-vt.patch @@ -0,0 +1,20 @@ +--- a/startx.cpp ++++ b/startx.cpp +@@ -200,17 +200,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 "$tty" : '/dev/tty[0-9][0-9]*$' > /dev/null; then +- tty_num=$(echo "$tty" | grep -oE '[0-9]+$') +- vtarg="vt$tty_num -keeptty" +- 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/x11-apps/xinit/xinit-1.4.0.ebuild b/x11-apps/xinit/xinit-1.4.0.ebuild index ea3e115f959..c2d2baabb33 100644 --- a/x11-apps/xinit/xinit-1.4.0.ebuild +++ b/x11-apps/xinit/xinit-1.4.0.ebuild @@ -28,7 +28,7 @@ PDEPEND="x11-apps/xrdb PATCHES=( "${FILESDIR}/${PN}-1.3.3-gentoo-customizations.patch" - "${FILESDIR}/${PN}-1.3.4-startx-current-vt.patch" + "${FILESDIR}/${PN}-1.4.0-startx-current-vt.patch" ) src_configure() {
