diff options
| author |   Rémi Cardona <remi@gentoo.org> | 2009-11-28 21:37:05 +0000 |
|---|---|---|
| committer | Rémi Cardona <remi@gentoo.org> | 2009-11-28 21:37:05 +0000 |
| commit | 92297adcd370b533f237e93813d82b98bd12531d (patch) | |
| tree | 2e7837281092930658f5dae5090195ca1a82aea1 /x11-apps/xinit | |
| parent | Version bump. (diff) | |
| download | gentoo-2-92297adcd370b533f237e93813d82b98bd12531d.tar.gz gentoo-2-92297adcd370b533f237e93813d82b98bd12531d.tar.bz2 gentoo-2-92297adcd370b533f237e93813d82b98bd12531d.zip | |
x11-apps/xinit: fix customizations patch (see bug #293342)
(Portage version: 2.2_rc52/cvs/Linux i686)
Diffstat (limited to 'x11-apps/xinit')
| -rw-r--r-- | x11-apps/xinit/ChangeLog | 9 | ||||
| -rw-r--r-- | x11-apps/xinit/files/0001-Gentoo-specific-customizations.patch | 19 | ||||
| -rw-r--r-- | x11-apps/xinit/xinit-1.2.0-r2.ebuild (renamed from x11-apps/xinit/xinit-1.2.0-r1.ebuild) | 2 |
3 files changed, 19 insertions, 11 deletions
diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog index 2efd383e4a74..a757bfed645d 100644 --- a/x11-apps/xinit/ChangeLog +++ b/x11-apps/xinit/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-apps/xinit # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.166 2009/11/22 23:47:13 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.167 2009/11/28 21:37:04 remi Exp $ + +*xinit-1.2.0-r2 (28 Nov 2009) + + 28 Nov 2009; Rémi Cardona <remi@gentoo.org> + files/0001-Gentoo-specific-customizations.patch, -xinit-1.2.0-r1.ebuild, + +xinit-1.2.0-r2.ebuild: + fix customizations patch (see bug #293342) 22 Nov 2009; Tomáš Chvátal <scarabeus@gentoo.org> -files/xdm.initd-2: Drop stale patches. diff --git a/x11-apps/xinit/files/0001-Gentoo-specific-customizations.patch b/x11-apps/xinit/files/0001-Gentoo-specific-customizations.patch index 94b909481778..6148de03353b 100644 --- a/x11-apps/xinit/files/0001-Gentoo-specific-customizations.patch +++ b/x11-apps/xinit/files/0001-Gentoo-specific-customizations.patch @@ -1,14 +1,14 @@ -From bba43805362a62c835ce2af34bc1087d9c442b19 Mon Sep 17 00:00:00 2001 +From 57ce122fe4092fa3bffbd61b04ab69ef32426920 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org> -Date: Tue, 17 Nov 2009 09:12:02 +0100 +Date: Sat, 28 Nov 2009 22:14:17 +0100 Subject: [PATCH] Gentoo-specific customizations --- - xinitrc.cpp | 28 ++++++++++++++++------------ - 1 files changed, 16 insertions(+), 12 deletions(-) + xinitrc.cpp | 29 +++++++++++++++++------------ + 1 files changed, 17 insertions(+), 12 deletions(-) diff --git a/xinitrc.cpp b/xinitrc.cpp -index 379b1f3..5b517ea 100644 +index 379b1f3..b6186df 100644 --- a/xinitrc.cpp +++ b/xinitrc.cpp @@ -2,8 +2,8 @@ XCOMM!SHELL_CMD @@ -22,7 +22,7 @@ index 379b1f3..5b517ea 100644 XCOMM merge in defaults and keymaps -@@ -84,19 +84,23 @@ fi +@@ -84,19 +84,24 @@ fi XCOMM This is the fallback case if nothing else is executed above #endif /* !defined(__SCO__) && !defined(__UNIXWARE__) */ @@ -30,7 +30,6 @@ index 379b1f3..5b517ea 100644 +if [ -n "`/etc/X11/chooser.sh`" ]; then + command="`/etc/X11/chooser.sh`" +else -+ command=XTERM -geometry 80x66+0+0 -name login + failsafe="yes" +fi @@ -54,8 +53,10 @@ index 379b1f3..5b517ea 100644 + 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 -+exec $command -- -1.6.5.2 +1.6.5.3 diff --git a/x11-apps/xinit/xinit-1.2.0-r1.ebuild b/x11-apps/xinit/xinit-1.2.0-r2.ebuild index 8782e062dac7..9b819c68633d 100644 --- a/x11-apps/xinit/xinit-1.2.0-r1.ebuild +++ b/x11-apps/xinit/xinit-1.2.0-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.2.0-r1.ebuild,v 1.1 2009/11/17 08:45:48 remi Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.2.0-r2.ebuild,v 1.1 2009/11/28 21:37:04 remi Exp $ EAPI="2" |