diff options
| author |   Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2013-09-11 21:42:15 +0000 |
|---|---|---|
| committer | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2013-09-11 21:42:15 +0000 |
| commit | 271570ec403d15cd7ab324681d62cf1e3d25fe6c (patch) | |
| tree | ab576841462d9205a92a10509471820ef2974894 /x11-apps | |
| parent | bump to 1.6 (diff) | |
| download | historical-271570ec403d15cd7ab324681d62cf1e3d25fe6c.tar.gz historical-271570ec403d15cd7ab324681d62cf1e3d25fe6c.tar.bz2 historical-271570ec403d15cd7ab324681d62cf1e3d25fe6c.zip | |
Add missing patch
Package-Manager: portage-2.2.1/cvs/Linux x86_64
Diffstat (limited to 'x11-apps')
| -rw-r--r-- | x11-apps/xinit/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-apps/xinit/Manifest | 3 | ||||
| -rw-r--r-- | x11-apps/xinit/files/xinit-1.3.3-gentoo-customizations.patch | 61 |
3 files changed, 68 insertions, 2 deletions
diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog index 263d3e98f3df..35669a88538d 100644 --- a/x11-apps/xinit/ChangeLog +++ b/x11-apps/xinit/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-apps/xinit # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.240 2013/09/11 20:18:36 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.241 2013/09/11 21:42:12 chithanh Exp $ + + 11 Sep 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + +files/xinit-1.3.3-gentoo-customizations.patch: + Add missing patch *xinit-1.3.3 (11 Sep 2013) *xinit-1.3.3 (11 Sep 2013) diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest index 21ece7164035..df5818107fa2 100644 --- a/x11-apps/xinit/Manifest +++ b/x11-apps/xinit/Manifest @@ -4,11 +4,12 @@ AUX Xsession 2187 SHA256 bdf2cceaafb71762bc1c6491f9bd8cc24089dea7ef65b0a030acadf AUX Xsession.desktop 244 SHA256 23eb4a681673217afae0ab7787a93ab7746ab0e8794eaf2564ea59894c36554c SHA512 bfd02f601afb251daba370e41ad5d8aa712d39ae15eabc5b371980e109eeee7b0cb9aac36b78870bfd681b7a71ef9f0f0685690cd9d7796dcc7ec32f04e84434 WHIRLPOOL b501f680d8518e9d4530014ba533d09b8e6555800278a9397fa86e0a1e4a8c373872106d59bef7ea7d73c580aa00c317e8156d7148e5622fb73133e097649c47 AUX chooser.sh 1301 SHA256 6ca40e2f592a10357d3396240213f0ebd81dd34882bab18bad2e9e94ad4036f0 SHA512 e977e614769b126eac08e989057deb5375f4357de1383d17bd11ceb87eec1ab89c91cb992a89c5a09b8056c725f804838fdeffadcc06f7f6ca69c737b48f3206 WHIRLPOOL f87da2ccddf341261ff0d9565f04db0410d487a90ae447cbfbc5a3981865bdcd28487954657dbf70567ba65d8e0eec067d9efa6a717d89747eb06ea67de2dc3d AUX startDM.sh 923 SHA256 e7f2d95b3b4b6b5d711f926f8a3b7b0163b4d9e40b40489bcbd1316806e47499 SHA512 462090c2cbef56586018c8d6100e14002d4c74ee423cc66f6ce676ce7bb5a9ac8e17fd9b86bd66653aa266cef09106ab280b61e3d64ed0831eecd89b6715b890 WHIRLPOOL 709716dd54bda18538fd1b7d6b0e1d75fc5e51c9019dad9ff4bdc9a087cecba2d917b4fe820e2cfde029f34feca9ea556144a87381348c0483a1ea8dae9f17f8 +AUX xinit-1.3.3-gentoo-customizations.patch 1494 SHA256 8405f913acc9a6654a979d55555cb67187b3bee881ef6a452acf943b56cdc429 SHA512 810066a3af51fd31c177f1aa33d3020e63d1656bacc297fa2bb44e0f3745bfd27d466745ebb07343f7b95339a9f6c8821c6f117e0b2f99724e21a0869427228b WHIRLPOOL ed7d7d141c4c6a908f3f42cd6ae836b522b4e9a6598e2ec8a11b631d1d4f6494b9a54c60570b43ab55f10e67e52caff074f8f4848547666c33c3092476aa6b95 AUX xinit-1.3.3.ebuild 1803 SHA256 9be3b9f01e5f02e43ba3210eca28c6f1407f760500691b9a4eb8fc263c6d74ad SHA512 a10c0e07336206990c3ec00abb80e225ce5b0f91fb7e442b5160571c5023702a7ca3da06e6668c0aa91134d41b4f560a5c257cdff1b8e4a545a24046e90ce114 WHIRLPOOL edc35c7016ca98aa6f683078c32722052352b7cf2798b6e3e27b13a294c1fef23df5cbe9b167e22d5a4562f6ec3309b7fb0fe54e6751b1e217f3e545c1e95b70 AUX xserverrc 45 SHA256 86835010b5350c41035495b7b845db0eecf1e4b7eeaf152b12a881fa502e5387 SHA512 f86d96d76bcb340021e7904925f0029f8662e4dfc32489198b3a8695dca069da496539e2287249c763fe9c4d8d5d591fd18fe49a0bee822cbbd0eb712efbb89b WHIRLPOOL d6b68b3b63995688dff5a52d246164860091b3d30517b1cee5ac7c7d791e3a6f3356bf4d494f209b783ba8266f213aff6684190c2592e0f729017a8870e492f4 DIST xinit-1.3.2.tar.bz2 148443 SHA256 a1867fdaa83f68750b12ba4305c3c62f5992d0f52cfeb98e96c27a8e690e0235 SHA512 bafe4706ee09b7980518af54dbc7d4cb971fcf4aaf4ea575d58c7102258e63a838c7e4acd6a4267d10fb8253dd779c1a008a8ab64164442b902bc0b19716197a WHIRLPOOL 0ba7b3a3aacbd8aa47e03e9346aca651dc00efc0420bc6d3fbb6dd388428af0ecfb3cdc7d91a495a0be6b8236fda4a229b0311dc6c037f435e95f2350dfcf1f8 DIST xinit-1.3.3.tar.bz2 163905 SHA256 74b2878de6e3d5b5948f1562a77e7f53b4e10621e505ddb278050c7f3cae00af SHA512 345d9a00991e25df0a565f5b7edfbf504df9e019fc8ca2d31e4d2899e4765d7a18f0fffec0b4dda5eef99982cf8482925656a4e18576105f267393de51257d65 WHIRLPOOL 106656351391ff8de397394d56ea225f910f82be3cbacaf81c0735d2a259437632bd5428fc96900a0b88146fd11f8d8670f07f3dd2869b44ff6525c399b936f4 EBUILD xinit-1.3.2.ebuild 1784 SHA256 90fc46f11bc86987d48074e76164f6408c781a30d2129076685cbf6b94e5c8c4 SHA512 20c4c9f8439da47cba8c112436bbdf6db3778abd87c0e325aee91b7f48ee965cbe7e607efbd74519f795df642ab8df306bba785d10f39195196487a9506986df WHIRLPOOL 1d52ae482fee4d5bad31a77f77c52486b3576041cfb94759510a783157c20db7b8f794504597bff03d259231d691cedb7ee208fdb3bd74de0624290fd8b6a814 EBUILD xinit-1.3.3.ebuild 1797 SHA256 3663e85cfddb95832f80ec4ced03dedab0b8e18f17c9ca36d7953195c0597af4 SHA512 51af00deed4936ff250227341eaa6e54eb9aaf5ac32449cc3fe15e8243ff3f2e49f19d1a9000dac2de5549d0849224579bb0139cbc281264f6e492585c4a613c WHIRLPOOL 114c8223addeff7b4464a0976e3568b26c4bb6d367c0118fe5b7cb75b694fd6511e1e4eda8c1f3026b723065f85118354d414310f31eb3741fcceff4fb0b9aa7 -MISC ChangeLog 36210 SHA256 52fac518eafe1518fcfe2bef1fc11251fa919d3ab96783e0ffddfef98b486fd7 SHA512 507a2b7713c8ea8f3f6eb1041b58480ee89a3f721565a8d3d8a0ce58e7259b91523cd18a9d51563d36eb196410bef3b8130efaba8cea874db9feaffabea10303 WHIRLPOOL d7bc86be273395bae0455ded04d60996379537654338f3d7c39179662473edeb2bb88fd3383eb830e7b278925f872fc5bc4d01599179f86dfacd05a96d19eaa8 +MISC ChangeLog 36350 SHA256 0f22153469a4424a5e88c28bf5f6b4555a0dcffa07ac2ea26b4d1bd7e8c91cab SHA512 859865442165c5ecc7da28763013fcd73881b97244836b352f26eb306a01bd12f9e97db97d9464e79a6cda1847cf7cf07a9999cb5eb5a1fbf3fd7d7d0f4c7d42 WHIRLPOOL 6f61ec58802c9850ca04afece3d6ed18cd53d694b08ee91a30a68585069faf95a8f0ff339f7a7a811b2c90ceb987ab1ba57a3267fd643985c777d1f2360f35b8 MISC metadata.xml 403 SHA256 8b907c5c30247ef4cb17fcf9dbaead16f3e6fd3b112d331b686cd6accd410f08 SHA512 6d64681045ad9dfe42c54d9e625a7b2f120eadd223d753ac79483aef5f03b819104168b9b5124244ce825bbe2a69ca32b1bc8176b85d42694a7b0f94f840c915 WHIRLPOOL e6ece8bf3d45c1697a8ca62a34360f5966bb07d2f938a606fefbcf474c4ba9a94356f824f1b6bf8dd7be0c7be169eee163de8dc1b9f000822ea808b6d8d567e6 diff --git a/x11-apps/xinit/files/xinit-1.3.3-gentoo-customizations.patch b/x11-apps/xinit/files/xinit-1.3.3-gentoo-customizations.patch new file mode 100644 index 000000000000..48dceabc500e --- /dev/null +++ b/x11-apps/xinit/files/xinit-1.3.3-gentoo-customizations.patch @@ -0,0 +1,61 @@ +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 | 26 ++++++++++++++++++-------- + 1 files changed, 18 insertions(+), 8 deletions(-) + +diff --git a/xinitrc.cpp b/xinitrc.cpp +index 049a8e4..80c3ad9 100644 +--- a/xinitrc.cpp ++++ b/xinitrc.cpp +@@ -2,8 +2,8 @@ XCOMM!SHELL_CMD + + userresources=$HOME/.Xresources + usermodmap=$HOME/.Xmodmap +-sysresources=XINITDIR/.Xresources +-sysmodmap=XINITDIR/.Xmodmap ++sysresources=XINITDIR/Xresources ++sysmodmap=XINITDIR/Xmodmap + + XCOMM merge in defaults and keymaps + +@@ -84,15 +84,25 @@ fi + XCOMM This is the fallback case if nothing else is executed above + #endif /* !defined(__SCO__) && !defined(__UNIXWARE__) */ + ++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.d/?*.sh ; do ++ for f in XINITDIR/xinitrc.d/?* ; do + [ -x "$f" ] && . "$f" + done + unset f + fi + +-TWM & +-XCLOCK -geometry 50x50-1+1 & +-XTERM -geometry 80x50+494+51 & +-XTERM -geometry 80x20+494-0 & +-exec XTERM -geometry 80x66+0+0 -name login ++if [ -n "$failsafe" ]; then ++ TWM & ++ 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 +-- +1.7.3.1 + |