summaryrefslogtreecommitdiff
path: root/source/x/x11/patch/xinit/xinit.remove.systemd.kludge.diff
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2018-05-28 19:12:29 +0000
committerEric Hameleers <alien@slackware.com>2018-05-31 23:39:35 +0200
commit646a5c1cbfd95873950a87b5f75d52073a967023 (patch)
treeb8b8d2ab3b0d432ea69ad1a64d1c789649d65020 /source/x/x11/patch/xinit/xinit.remove.systemd.kludge.diff
parentd31c50870d0bee042ce660e445c9294a59a3a65b (diff)
downloadcurrent-646a5c1cbfd95873950a87b5f75d52073a967023.tar.gz
Mon May 28 19:12:29 UTC 201820180528191229
a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/x/x11/patch/xinit/xinit.remove.systemd.kludge.diff')
-rw-r--r--source/x/x11/patch/xinit/xinit.remove.systemd.kludge.diff25
1 files changed, 12 insertions, 13 deletions
diff --git a/source/x/x11/patch/xinit/xinit.remove.systemd.kludge.diff b/source/x/x11/patch/xinit/xinit.remove.systemd.kludge.diff
index f51e4628..79223807 100644
--- a/source/x/x11/patch/xinit/xinit.remove.systemd.kludge.diff
+++ b/source/x/x11/patch/xinit/xinit.remove.systemd.kludge.diff
@@ -1,19 +1,18 @@
---- ./startx.cpp.orig 2014-09-11 12:31:42.000000000 -0500
-+++ ./startx.cpp 2015-03-29 23:35:06.133875707 -0500
-@@ -192,10 +192,12 @@
+--- ./startx.cpp.orig 2018-03-11 16:07:52.205154560 -0500
++++ ./startx.cpp 2018-03-11 16:09:46.094163992 -0500
+@@ -201,6 +201,7 @@
+ server=$defaultserver
+
+ #ifdef __linux__
++ if [ -x /usr/lib/systemd/systemd -o -x /lib/systemd/systemd ]; then
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"
-+ if [ -x /usr/lib/systemd/systemd -o -x /lib/systemd/systemd ]; then
-+ 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
+@@ -209,6 +210,7 @@
+ tty_num=$(echo "$tty" | grep -oE '[0-9]+$')
+ vtarg="vt$tty_num -keeptty"
fi
++ fi
#endif
+ XCOMM For compatibility reasons, only use xserverrc if there were no server command line arguments