diff options
| author |   Michał Górny <gentoo@mgorny.alt.pl> | 2010-04-25 12:08:44 +0200 |
|---|---|---|
| committer |   Tomáš Chvátal <scarabeus@gentoo.org> | 2010-04-25 12:12:14 +0200 |
| commit | 6cfd448636eeca62b737348963036b3bd98009e7 (patch) | |
| tree | b5e2cbc194add8333f6e6565c9a70081d7aead4e /x11-apps/xinit | |
| parent | Fix for prefix (diff) | |
| download | x11-6cfd448636eeca62b737348963036b3bd98009e7.tar.gz x11-6cfd448636eeca62b737348963036b3bd98009e7.tar.bz2 x11-6cfd448636eeca62b737348963036b3bd98009e7.zip | |
Update the Gentoo patch to match fresh HEAD.
Diffstat (limited to 'x11-apps/xinit')
| -rw-r--r-- | x11-apps/xinit/Manifest | 4 | ||||
| -rw-r--r-- | x11-apps/xinit/files/0001-Gentoo-specific-customizations-r1.patch (renamed from x11-apps/xinit/files/0001-Gentoo-specific-customizations.patch) | 19 | ||||
| -rw-r--r-- | x11-apps/xinit/xinit-9999.ebuild | 2 |
3 files changed, 11 insertions, 14 deletions
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest index 574d0ca9..c553bb46 100644 --- a/x11-apps/xinit/Manifest +++ b/x11-apps/xinit/Manifest @@ -1,8 +1,8 @@ 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-specific-customizations-r1.patch 1476 RMD160 9168172406dd84e94229dafa3ac320b10e1349e0 SHA1 839224a56ce908c7a8a7f1a10924fc03e634aace SHA256 2fc0b500e71548cdeff42b84505e9493ed0fe8c94f403eacae95bb6310dbce34 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 AUX xserver.pamd 125 RMD160 4b75f8bf5e68ac7181a22beaccc153ac250eb8e9 SHA1 e35845021328044659036b9f82a95c17f21beb25 SHA256 f179c3417b94295fe12776f9da4a08898a3ee4199e26abff6457717caeb29bb2 AUX xserverrc 30 RMD160 7575b72f2f5ec4afba3e3700c213a7fbe40a0f8d SHA1 febf89ebfcc056c16bf70a4e651f4074af71b224 SHA256 18c040add4d137aaa58f76b134088acb1269dd291a14bcc283765c6c897d49fe -EBUILD xinit-9999.ebuild 1657 RMD160 2636bfe2fb13245a942cac00591655bf26a5782f SHA1 72b742e05488ae048d5444cafc59cc312f111346 SHA256 4ddaaca5553e7f3f4b55c6b32402b65ae3edd95de286a89667d4add0b740d289 +EBUILD xinit-9999.ebuild 1660 RMD160 497ed12c4b23d95ae0ad56d7d1ec80e31fde1ced SHA1 854c084985b1b3d50ed4625d32db90db5ed3357f SHA256 115c1601bb5ed40f9621b8ccabeffced15c5dad6441e0b52c0a7b8f5c75786e8 diff --git a/x11-apps/xinit/files/0001-Gentoo-specific-customizations.patch b/x11-apps/xinit/files/0001-Gentoo-specific-customizations-r1.patch index dc972a70..318f0f4a 100644 --- a/x11-apps/xinit/files/0001-Gentoo-specific-customizations.patch +++ b/x11-apps/xinit/files/0001-Gentoo-specific-customizations-r1.patch @@ -1,14 +1,14 @@ -From 4f039767273b60f9a1a24867db0988d46abe5972 Mon Sep 17 00:00:00 2001 +From a2d86ec291aabd2bafd3a2f52e22bac085de555d 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 --- - 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 +22,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 +39,7 @@ index 379b1f3..159f294 100644 done unset f fi -- --#endif -- + -TWM & -XCLOCK -geometry 50x50-1+1 & -XTERM -geometry 80x50+494+51 & @@ -58,5 +55,5 @@ index 379b1f3..159f294 100644 + exec $command +fi -- -1.6.5.5 +1.7.0.4 diff --git a/x11-apps/xinit/xinit-9999.ebuild b/x11-apps/xinit/xinit-9999.ebuild index 0d365aee..0c8d68a6 100644 --- a/x11-apps/xinit/xinit-9999.ebuild +++ b/x11-apps/xinit/xinit-9999.ebuild @@ -27,7 +27,7 @@ PDEPEND="!minimal? ( " PATCHES=( - "${FILESDIR}/0001-Gentoo-specific-customizations.patch" + "${FILESDIR}/0001-Gentoo-specific-customizations-r1.patch" ) pkg_setup() { |