summaryrefslogtreecommitdiff
path: root/x11-apps/xinit/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-01-26 19:56:43 +0000
committerV3n3RiX <venerix@koprulu.sector>2023-01-26 19:56:43 +0000
commit236302aac694377916670b7769f941e3f1dd0bbc (patch)
tree0a81f35a6120e176fc267d7ad981d4734d85c8ba /x11-apps/xinit/files
parent7267fb40fb51ddbc9cc5c1c82b0a12807ef7b281 (diff)
gentoo auto-resync : 26:01:2023 - 19:56:42
Diffstat (limited to 'x11-apps/xinit/files')
-rw-r--r--x11-apps/xinit/files/xinit-1.4.0-startx-current-vt.patch20
-rw-r--r--x11-apps/xinit/files/xinit-1.4.1-move-serverauthfile-into-tmp.patch22
2 files changed, 0 insertions, 42 deletions
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
deleted file mode 100644
index ecddd3b369ed..000000000000
--- a/x11-apps/xinit/files/xinit-1.4.0-startx-current-vt.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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/files/xinit-1.4.1-move-serverauthfile-into-tmp.patch b/x11-apps/xinit/files/xinit-1.4.1-move-serverauthfile-into-tmp.patch
deleted file mode 100644
index 339b65311712..000000000000
--- a/x11-apps/xinit/files/xinit-1.4.1-move-serverauthfile-into-tmp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Move startx auth files in /tmp so they are removed on reboot.
-https://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(-)
-
---- a/startx.cpp
-+++ b/startx.cpp
-@@ -278,11 +278,11 @@ if [ x"$enable_xauth" = x1 ] ; then
- exit 1
- fi
- dummy=0
-
- XCOMM create a file with auth information for the server. ':0' is a dummy.
-- xserverauthfile=$HOME/.serverauth.$$
-+ xserverauthfile=`mktemp --tmpdir serverauth.XXXXXXXXXX`
- trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP KILL BUS TERM
- xauth -q -f "$xserverauthfile" << EOF
- add :$dummy . $mcookie
- EOF
- #if defined(__APPLE__) || defined(__CYGWIN__)