[gentoo-commits] gentoo-x86 commit in x11-apps/xinit/files: xinit-1.3.4-startx-current-vt.patch

[Chi-Thanh Christopher Nguyen (chithanh)]

chithanh    15/02/08 18:26:50

  Added:                xinit-1.3.4-startx-current-vt.patch
  Log:
  conditionally revert upstream patch that broke startx on non-systemd systems, bug #526802.
  
  (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x2324E7B566DF2611!)

Revision  Changes    Path
1.1                  x11-apps/xinit/files/xinit-1.3.4-startx-current-vt.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-apps/xinit/files/xinit-1.3.4-startx-current-vt.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-apps/xinit/files/xinit-1.3.4-startx-current-vt.patch?rev=1.1&content-type=text/plain

Index: xinit-1.3.4-startx-current-vt.patch
===================================================================
diff -ur a/startx.cpp b/startx.cpp
--- a/startx.cpp	2014-09-11 19:31:42.000000000 +0200
+++ b/startx.cpp	2015-02-08 19:09:56.416428623 +0100
@@ -188,17 +188,6 @@
 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