diff options
| author |   Rémi Cardona <remi@gentoo.org> | 2009-11-17 08:45:49 +0000 |
|---|---|---|
| committer | Rémi Cardona <remi@gentoo.org> | 2009-11-17 08:45:49 +0000 |
| commit | 7c9ca302603ad4aafc2701929dd60f93fa11e0b3 (patch) | |
| tree | fa1570648fb42fa5aa2a1e32beda07bbc90934e6 /x11-apps | |
| parent | version bump (diff) | |
| download | gentoo-2-7c9ca302603ad4aafc2701929dd60f93fa11e0b3.tar.gz gentoo-2-7c9ca302603ad4aafc2701929dd60f93fa11e0b3.tar.bz2 gentoo-2-7c9ca302603ad4aafc2701929dd60f93fa11e0b3.zip | |
x11-apps/xinit: update Gentoo patch to fix bug #293342
(Portage version: 2.2_rc50/cvs/Linux i686)
Diffstat (limited to 'x11-apps')
| -rw-r--r-- | x11-apps/xinit/ChangeLog | 9 | ||||
| -rw-r--r-- | x11-apps/xinit/files/0001-Gentoo-specific-customizations.patch | 8 | ||||
| -rw-r--r-- | x11-apps/xinit/xinit-1.2.0-r1.ebuild (renamed from x11-apps/xinit/xinit-1.2.0.ebuild) | 5 |
3 files changed, 13 insertions, 9 deletions
diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog index d454a29adf06..76b5bc05cb5f 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.164 2009/11/16 16:02:37 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.165 2009/11/17 08:45:48 remi Exp $ + +*xinit-1.2.0-r1 (17 Nov 2009) + + 17 Nov 2009; Rémi Cardona <remi@gentoo.org> + files/0001-Gentoo-specific-customizations.patch, -xinit-1.2.0.ebuild, + +xinit-1.2.0-r1.ebuild: + update Gentoo patch to fix bug #293342 16 Nov 2009; Tomáš Chvátal <scarabeus@gentoo.org> xinit-1.2.0.ebuild: After carefull testing i found out that xrdb is indeed always required. diff --git a/x11-apps/xinit/files/0001-Gentoo-specific-customizations.patch b/x11-apps/xinit/files/0001-Gentoo-specific-customizations.patch index a54272a08348..94b909481778 100644 --- a/x11-apps/xinit/files/0001-Gentoo-specific-customizations.patch +++ b/x11-apps/xinit/files/0001-Gentoo-specific-customizations.patch @@ -1,6 +1,6 @@ -From fdeff43b7550a63643a1cec743e0f8b838e65af5 Mon Sep 17 00:00:00 2001 +From bba43805362a62c835ce2af34bc1087d9c442b19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org> -Date: Thu, 5 Nov 2009 20:46:56 +0100 +Date: Tue, 17 Nov 2009 09:12:02 +0100 Subject: [PATCH] Gentoo-specific customizations --- @@ -8,7 +8,7 @@ Subject: [PATCH] Gentoo-specific customizations 1 files changed, 16 insertions(+), 12 deletions(-) diff --git a/xinitrc.cpp b/xinitrc.cpp -index 379b1f3..f7f8784 100644 +index 379b1f3..5b517ea 100644 --- a/xinitrc.cpp +++ b/xinitrc.cpp @@ -2,8 +2,8 @@ XCOMM!SHELL_CMD @@ -30,7 +30,7 @@ index 379b1f3..f7f8784 100644 +if [ -n "`/etc/X11/chooser.sh`" ]; then + command="`/etc/X11/chooser.sh`" +else -+ command="XTERM -geometry 80x66+0+0 -name login" ++ command=XTERM -geometry 80x66+0+0 -name login + failsafe="yes" +fi diff --git a/x11-apps/xinit/xinit-1.2.0.ebuild b/x11-apps/xinit/xinit-1.2.0-r1.ebuild index 3c04378bcc91..8782e062dac7 100644 --- a/x11-apps/xinit/xinit-1.2.0.ebuild +++ b/x11-apps/xinit/xinit-1.2.0-r1.ebuild @@ -1,12 +1,9 @@ # 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.ebuild,v 1.2 2009/11/16 16:02:37 scarabeus Exp $ +# $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 $ EAPI="2" -# Must be before x-modular eclass is inherited -SNAPSHOT="yes" - inherit x-modular pam DESCRIPTION="X Window System initializer" |