diff options
| author |   Tomáš Chvátal <scarabeus@gentoo.org> | 2010-11-02 13:27:04 +0100 |
|---|---|---|
| committer | Tomáš Chvátal <scarabeus@gentoo.org> | 2010-11-02 13:27:04 +0100 |
| commit | 82a5d23b24f64190d4573de9c7a1d0fea136747d (patch) | |
| tree | 7528597641f2908d26fad8164f9e1912ed576234 | |
| parent | [x11-apps/xman] sync with main tree. (diff) | |
| download | x11-82a5d23b24f64190d4573de9c7a1d0fea136747d.tar.gz x11-82a5d23b24f64190d4573de9c7a1d0fea136747d.tar.bz2 x11-82a5d23b24f64190d4573de9c7a1d0fea136747d.zip | |
[x11-apps/xinit] Update patch.
| -rw-r--r-- | x11-apps/xinit/Manifest | 2 | ||||
| -rw-r--r-- | x11-apps/xinit/files/0001-Gentoo-customizations.patch (renamed from x11-apps/xinit/files/0001-Gentoo-specific-customizations.patch) | 27 |
2 files changed, 14 insertions, 15 deletions
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest index cff1da8f..030a0c60 100644 --- a/x11-apps/xinit/Manifest +++ b/x11-apps/xinit/Manifest @@ -1,5 +1,5 @@ AUX 00-xhost 255 RMD160 4009438bd6ffbd718ea0221d6a1b8641c51a101c SHA1 91adb21d02629cd14f5f5fa8a56ec9421e0dc46b SHA256 780a53d697e5cdc8ae7cf24f97e554a9ff7b41d46f205774d7414cecfca3ab97 -AUX 0001-Gentoo-specific-customizations.patch 1508 RMD160 ea3ca11470a4f504c84a9b68a059ecc458eef9e8 SHA1 437c7767000e3bc174ab122d954700187ca2b23a SHA256 b95cb7cb6be7f2a9ee42e45f77c851c3bdc50e0c3d34e2ebd706d50ba1cc60e7 +AUX 0001-Gentoo-customizations.patch 1508 RMD160 8af271ddcaf20e588baaf6e8477e4354fa2ea0f8 SHA1 a538ef116aad391163853aa04586622515dc7c0d SHA256 3b43514ca65c882def485497917c67e64c570fa0c1ef8d758bd949d41e0f9a9c AUX Xsession 2187 RMD160 ffb290e9a8656b17d7744797456a45df53cafd79 SHA1 8ba8de5114871f8500f428a03f87a42714d0ce14 SHA256 bdf2cceaafb71762bc1c6491f9bd8cc24089dea7ef65b0a030acadf7f4aa4ab3 AUX chooser.sh 1301 RMD160 47ae0768ed54f235443399bdf08632c9f5cd3d10 SHA1 c378244ce59d74c966d564b3b34ac8168e3d0352 SHA256 5808080351f80c56b5ab78946103551a628925a0a3a95417b28002bf6e088212 AUX startDM.sh 858 RMD160 d7ef866ddd09e3d4117b3363aaa6382a9b8cd153 SHA1 1b826dfb4d5a184d6d7cc1995d685b55c9c188ac SHA256 a7aca1e37e5b8fecb49aa96c4e2850547a47e154edabcdbd1cfcb8ab49337549 diff --git a/x11-apps/xinit/files/0001-Gentoo-specific-customizations.patch b/x11-apps/xinit/files/0001-Gentoo-customizations.patch index dc972a70..a25ef4ba 100644 --- a/x11-apps/xinit/files/0001-Gentoo-specific-customizations.patch +++ b/x11-apps/xinit/files/0001-Gentoo-customizations.patch @@ -1,14 +1,16 @@ -From 4f039767273b60f9a1a24867db0988d46abe5972 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org> -Date: Tue, 8 Dec 2009 15:22:13 +0100 -Subject: [PATCH] Gentoo-specific customizations +From d24cea5021fab8a11b1492a031319939d133d221 Mon Sep 17 00:00:00 2001 +From: Tomas Chvatal <scarabeus@gentoo.org> +Date: Mon, 1 Nov 2010 16:46:36 +0100 +Subject: [PATCH] Gentoo customizations. + +Signed-off-by: Tomas Chvatal <scarabeus@gentoo.org> --- - xinitrc.cpp | 29 +++++++++++++++++------------ - 1 files changed, 17 insertions(+), 12 deletions(-) + xinitrc.cpp | 26 ++++++++++++++++++-------- + 1 files changed, 18 insertions(+), 8 deletions(-) diff --git a/xinitrc.cpp b/xinitrc.cpp -index 379b1f3..159f294 100644 +index 049a8e4..80c3ad9 100644 --- a/xinitrc.cpp +++ b/xinitrc.cpp @@ -2,8 +2,8 @@ XCOMM!SHELL_CMD @@ -22,17 +24,16 @@ index 379b1f3..159f294 100644 XCOMM merge in defaults and keymaps -@@ -84,19 +84,24 @@ fi +@@ -84,15 +84,25 @@ fi XCOMM This is the fallback case if nothing else is executed above #endif /* !defined(__SCO__) && !defined(__UNIXWARE__) */ --#ifdef __APPLE__ +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 @@ -40,9 +41,7 @@ index 379b1f3..159f294 100644 done unset f fi -- --#endif -- + -TWM & -XCLOCK -geometry 50x50-1+1 & -XTERM -geometry 80x50+494+51 & @@ -58,5 +57,5 @@ index 379b1f3..159f294 100644 + exec $command +fi -- -1.6.5.5 +1.7.3.1 |