| 1 |
remi 09/11/28 21:37:05 |
| 2 |
|
| 3 |
Modified: 0001-Gentoo-specific-customizations.patch |
| 4 |
Log: |
| 5 |
x11-apps/xinit: fix customizations patch (see bug #293342) |
| 6 |
(Portage version: 2.2_rc52/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.3 x11-apps/xinit/files/0001-Gentoo-specific-customizations.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-apps/xinit/files/0001-Gentoo-specific-customizations.patch?rev=1.3&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-apps/xinit/files/0001-Gentoo-specific-customizations.patch?rev=1.3&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-apps/xinit/files/0001-Gentoo-specific-customizations.patch?r1=1.2&r2=1.3 |
| 14 |
|
| 15 |
Index: 0001-Gentoo-specific-customizations.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/0001-Gentoo-specific-customizations.patch,v |
| 18 |
retrieving revision 1.2 |
| 19 |
retrieving revision 1.3 |
| 20 |
diff -u -r1.2 -r1.3 |
| 21 |
--- 0001-Gentoo-specific-customizations.patch 17 Nov 2009 08:45:49 -0000 1.2 |
| 22 |
+++ 0001-Gentoo-specific-customizations.patch 28 Nov 2009 21:37:05 -0000 1.3 |
| 23 |
@@ -1,14 +1,14 @@ |
| 24 |
-From bba43805362a62c835ce2af34bc1087d9c442b19 Mon Sep 17 00:00:00 2001 |
| 25 |
+From 57ce122fe4092fa3bffbd61b04ab69ef32426920 Mon Sep 17 00:00:00 2001 |
| 26 |
From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@g.o> |
| 27 |
-Date: Tue, 17 Nov 2009 09:12:02 +0100 |
| 28 |
+Date: Sat, 28 Nov 2009 22:14:17 +0100 |
| 29 |
Subject: [PATCH] Gentoo-specific customizations |
| 30 |
|
| 31 |
--- |
| 32 |
- xinitrc.cpp | 28 ++++++++++++++++------------ |
| 33 |
- 1 files changed, 16 insertions(+), 12 deletions(-) |
| 34 |
+ xinitrc.cpp | 29 +++++++++++++++++------------ |
| 35 |
+ 1 files changed, 17 insertions(+), 12 deletions(-) |
| 36 |
|
| 37 |
diff --git a/xinitrc.cpp b/xinitrc.cpp |
| 38 |
-index 379b1f3..5b517ea 100644 |
| 39 |
+index 379b1f3..b6186df 100644 |
| 40 |
--- a/xinitrc.cpp |
| 41 |
+++ b/xinitrc.cpp |
| 42 |
@@ -2,8 +2,8 @@ XCOMM!SHELL_CMD |
| 43 |
@@ -22,7 +22,7 @@ |
| 44 |
|
| 45 |
XCOMM merge in defaults and keymaps |
| 46 |
|
| 47 |
-@@ -84,19 +84,23 @@ fi |
| 48 |
+@@ -84,19 +84,24 @@ fi |
| 49 |
XCOMM This is the fallback case if nothing else is executed above |
| 50 |
#endif /* !defined(__SCO__) && !defined(__UNIXWARE__) */ |
| 51 |
|
| 52 |
@@ -30,7 +30,6 @@ |
| 53 |
+if [ -n "`/etc/X11/chooser.sh`" ]; then |
| 54 |
+ command="`/etc/X11/chooser.sh`" |
| 55 |
+else |
| 56 |
-+ command=XTERM -geometry 80x66+0+0 -name login |
| 57 |
+ failsafe="yes" |
| 58 |
+fi |
| 59 |
|
| 60 |
@@ -54,8 +53,10 @@ |
| 61 |
+ XCLOCK -geometry 50x50-1+1 & |
| 62 |
+ XTERM -geometry 80x50+494+51 & |
| 63 |
+ XTERM -geometry 80x20+494-0 & |
| 64 |
++ exec XTERM -geometry 80x66+0+0 -name login |
| 65 |
++else |
| 66 |
++ exec $command |
| 67 |
+fi |
| 68 |
-+exec $command |
| 69 |
-- |
| 70 |
-1.6.5.2 |
| 71 |
+1.6.5.3 |
Archives