commit: cc79c7e2d44b7ded89e01024cb48a960095550ae Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Fri Feb 17 16:30:37 2017 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Fri Feb 17 17:16:02 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc79c7e2
x11-apps/xinit: remove unused patch .../xinit/files/0001-Gentoo-customizations.patch | 61 ---------------------- 1 file changed, 61 deletions(-) diff --git a/x11-apps/xinit/files/0001-Gentoo-customizations.patch b/x11-apps/xinit/files/0001-Gentoo-customizations.patch deleted file mode 100644 index a25ef4ba2a..0000000000 --- a/x11-apps/xinit/files/0001-Gentoo-customizations.patch +++ /dev/null @@ -1,61 +0,0 @@ -From d24cea5021fab8a11b1492a031319939d133d221 Mon Sep 17 00:00:00 2001 -From: Tomas Chvatal <[email protected]> -Date: Mon, 1 Nov 2010 16:46:36 +0100 -Subject: [PATCH] Gentoo customizations. - - -Signed-off-by: Tomas Chvatal <[email protected]> ---- - xinitrc.cpp | 26 ++++++++++++++++++-------- - 1 files changed, 18 insertions(+), 8 deletions(-) - -diff --git a/xinitrc.cpp b/xinitrc.cpp -index 049a8e4..80c3ad9 100644 ---- a/xinitrc.cpp -+++ b/xinitrc.cpp -@@ -2,8 +2,8 @@ XCOMM!SHELL_CMD - - userresources=$HOME/.Xresources - usermodmap=$HOME/.Xmodmap --sysresources=XINITDIR/.Xresources --sysmodmap=XINITDIR/.Xmodmap -+sysresources=XINITDIR/Xresources -+sysmodmap=XINITDIR/Xmodmap - - XCOMM merge in defaults and keymaps - -@@ -84,15 +84,25 @@ fi - XCOMM This is the fallback case if nothing else is executed above - #endif /* !defined(__SCO__) && !defined(__UNIXWARE__) */ - -+if [ -n "`/etc/X11/chooser.sh`" ]; then -+ command="`/etc/X11/chooser.sh`" -+else -+ failsafe="yes" -+fi -+ - if [ -d XINITDIR/xinitrc.d ] ; then -- for f in XINITDIR/xinitrc.dXSLASHGLOB.sh ; do -+ for f in XINITDIR/xinitrc.dXSLASHGLOB ; do - [ -x "$f" ] && . "$f" - done - unset f - fi - --TWM & --XCLOCK -geometry 50x50-1+1 & --XTERM -geometry 80x50+494+51 & --XTERM -geometry 80x20+494-0 & --exec XTERM -geometry 80x66+0+0 -name login -+if [ -n "$failsafe" ]; then -+ TWM & -+ XCLOCK -geometry 50x50-1+1 & -+ XTERM -geometry 80x50+494+51 & -+ XTERM -geometry 80x20+494-0 & -+ exec XTERM -geometry 80x66+0+0 -name login -+else -+ exec $command -+fi --- -1.7.3.1 -
