diff options
Diffstat (limited to 'x11-apps/xinit')
| -rw-r--r-- | x11-apps/xinit/Manifest | 5 | ||||
| -rw-r--r-- | x11-apps/xinit/files/xinit-1.4.4-gentoo-customizations.patch | 59 | ||||
| -rw-r--r-- | x11-apps/xinit/files/xinit-1.4.4-move-serverauthfile-into-tmp.patch | 22 | ||||
| -rw-r--r-- | x11-apps/xinit/files/xinit-1.4.4-startx-current-vt.patch | 33 | ||||
| -rw-r--r-- | x11-apps/xinit/xinit-1.4.4.ebuild | 71 |
5 files changed, 190 insertions, 0 deletions
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest index 046ffb61beaa..50fdbd0145c7 100644 --- a/x11-apps/xinit/Manifest +++ b/x11-apps/xinit/Manifest @@ -7,9 +7,14 @@ AUX xinit-1.4.2-move-serverauthfile-into-tmp.patch 738 BLAKE2B 5639a4e5ff3b1d695 AUX xinit-1.4.2-startx-current-vt.patch 799 BLAKE2B d87a479c3a30daec7606cacabdc4724dad4a5bd4051faee22a620333d2e1adc0f4590ace50914cc3edbd958c037beb4356acfd2863ca976627370843d566b339 SHA512 de219bad36a6200531599750601572df4812c6007baa48ab28f7a9210edbb148f270c13c891afaf6ae53f6798b99e055f3b5fd5ca797241b037c83be6b83e4fb AUX xinit-1.4.3-gentoo-customizations.patch 1418 BLAKE2B 4f07b017e2a40be04ec49c9b48d1778a6ce9cefb335adc97e333afc2bf83e80d3982da64aff9d27de3c7c4b39c4a2108209630fd7a96f004184e026cf494abf2 SHA512 1cebb1f54270af23b82043a8a82aede5b9a29a0d735a9a4845ed7f8ca2bd227b1a97394eb8812bd1934584cb04e54b68dc88afb60950b401e76339fe16eb2b24 AUX xinit-1.4.3-startx-current-vt.patch 1094 BLAKE2B aab3771d592f66aca9504da66b251ec8b700e2cbe9ddd7970a8b363a57454690288d1888a64efdb3ee13a1029f77121a9b7eedf635518d1f01a51dc1d3c5cd6c SHA512 f88f1572fa85c03d47e1257d5d8375f9d1f5fa526424fedd557391b4c004ffe4100bd241f4a6c270055bfb038d88111b9bbdb9e5f86e2ce17eab39ecb38332cc +AUX xinit-1.4.4-gentoo-customizations.patch 1451 BLAKE2B 5781a7f25b3ac2469fd6c7f4ce80979ff648679ad0a4d1aa1813f325e08bcb77616e218b62ea089d4090be91e693f1fbac83a056b0a3f7627a7061b9ffe8629c SHA512 e18fe2bcbf4e66c8fb796a8a672c5c8b0dee1de4ec5d16117e4fafbd1c04ea79596d4e9737e8171d309c15a27b8a1c16d63ca2b8bfb2e1fa39ede5f277e48de4 +AUX xinit-1.4.4-move-serverauthfile-into-tmp.patch 730 BLAKE2B 637229724b68772ef7d431d0ebab8e42f1a881d3f32727339f9c72cf252573564a20a5cd798636badc6524e905e2b89a331a187a0ef1c87705aae72601e5fa68 SHA512 9dbd5b82ff7005e91f53dadde3ebdabbd9c5859ade859a1b3420ae44d80678279cd7f6a34282b19adcc79f5ba8ad7321fd3007bdde51d5419c51431f3030e120 +AUX xinit-1.4.4-startx-current-vt.patch 1062 BLAKE2B 6f82128cf4ee13cbb9cf0103cfbb35a6956abf0175d41db5221cb4a57d378f730911ed655d88a1837cc029d186b09ba3ae36d5718c9949749338c6c569a15def SHA512 00a9e5ac0a2e1f1e26e0dc6933be3fdd0a76d60b88bbf78c0d803a349dd2a51a8a97a781bb1c67386b0c414f52e80adf9ba8d2488bd9e2bc151d0f6d9c655296 AUX xserverrc.2 143 BLAKE2B b33fac4b5ba731c79167d21a07840c46abfbb33e8fbb80aa1c3f23a8717f836819da3a947b72bd99c7a14516534e9771033bcd1e26d167f2f7083be20eae3b2f SHA512 61afea54f66b9f397860e467cf87a41e1d9f97d7194930bccc254e44dd4178bca7b402bff7aa2a1d6f44a91680f3f1ee10a5b57e527aaff80438623edc1b07c5 DIST xinit-1.4.2.tar.xz 156728 BLAKE2B 8f5c16d5ec9cc16c734b1661def4f7e68321259f24e7aac2b039b8e142fb4a324d2471a0f04d3b4448ae713082ad9ec7018083b00ed1a93aac90fa7db172247d SHA512 4b62c2edd97b40133577cbba88b3f31b36c5634b4eb667ef0c302e8358dc1c55a255abe42aaadc910d8aa9ea0e3add157a12a301382f1cdbe091df4e1215fae0 DIST xinit-1.4.3.tar.xz 158348 BLAKE2B 321400aa6572a7309ece961c1f053382825de5c12a235eb7f4345d5da4f95a199a9e1987e21baa5c3a472d2638e8c18a1610e4f0d617f3205f58cd66415efb6a SHA512 ff754567d2224d1ff5023b302cae3a435950a6f24a773e214ea108b96d18b722d4cc86d0e25a7d92edea1307e3037248b4da004c1b392f73ba7bc1e04a94b77b +DIST xinit-1.4.4.tar.xz 162496 BLAKE2B 54da6f5d31658a228987d4e3a17636bb5f3a36bc7067dfc8bcbe35c2944831e320edd7a92b172a55b2db41d6d757b22cfa2b712beb9d17c8f39d539a4294ba23 SHA512 387285c952bbe074d2ed2dbbf745d1634763bb71f7f7edb22b3306b9e96ae4e28e59ecd6c48cc646b12dbdbcc68d42036bd127da75ef3c16fabdae87794ad6d1 EBUILD xinit-1.4.2.ebuild 2229 BLAKE2B e4a75c2c6afb45f43f4eb987c1b42dcf37ec24d61ff83ae09b92903faf9912f4fb5511e4a53006d09db98277a86223fbab2e12b01a7e5eefb6af53f64b447c1f SHA512 86f54780baf5cbb5157e5d4a394a8af2ebc613e8aab5def17def7537305075f9f22469df11eb6306a51a5346028b27b1dc795fc6dcc1717859388b16240e947d EBUILD xinit-1.4.3.ebuild 2188 BLAKE2B 486bd4def52b572b0aeea9f71315bff288e1829a9b835f9c86431c99645bdbc8c896f5827793be50df813c6356655bb7d2e47af621fc14eff902314a6bb368a1 SHA512 522121a2803d3c7bf1bcd0c7fdad9160613cd24a4ab93c401b8b8fd4da8e31882f0d8121697413d2a231e24f56fa1422a52970ca9f3ef4b9561d9da6377984e8 +EBUILD xinit-1.4.4.ebuild 2195 BLAKE2B 6f9f09cf428f40a00b8f42fb8a9bb216cbbc7059517bbcad02ee72f1060936d7f0ef4d22e78fc5ac27ee7bff818d75333ba2ad2c98fea08664ff3a8438290da2 SHA512 5cb193c44e0c1c944864beef4c769b0b8636a2771709c9a6edbf89676ef75ad1f878be54782da01c536f92cad7d3372def98e9a20a42449a1c248c78ed2b793e MISC metadata.xml 550 BLAKE2B 3c7e6936cc7db503b1f4e654e6cc42edfa82524403d8de329e058cb4a8e084075f1c7047e494952847ef137c0d411b4ab20e1f54e4264448040e4d62af0f1ee2 SHA512 d903eb4c148009926f925d6f20ee29316d98adf4ee3431fd47f098d907fc9e777bfa33d34d90163fdc69e6ac7c895f67852269cc938deb2c22102ccb1ca5393b diff --git a/x11-apps/xinit/files/xinit-1.4.4-gentoo-customizations.patch b/x11-apps/xinit/files/xinit-1.4.4-gentoo-customizations.patch new file mode 100644 index 000000000000..2cdc251dec1a --- /dev/null +++ b/x11-apps/xinit/files/xinit-1.4.4-gentoo-customizations.patch @@ -0,0 +1,59 @@ +From b9f484825ccb8902e0fe121ae8abafb51c81677d Mon Sep 17 00:00:00 2001 +From: Tomas Chvatal <scarabeus@gentoo.org> +Date: Mon, 1 Nov 2010 16:46:36 +0100 +Subject: [PATCH app/xinit 1/2] Gentoo customizations. + +Signed-off-by: Tomas Chvatal <scarabeus@gentoo.org> +--- + xinitrc.in | 26 ++++++++++++++++++-------- + 1 file changed, 18 insertions(+), 8 deletions(-) + +diff --git ./xinitrc.in ./xinitrc.in +index 9d9a78c..7391180 +--- ./xinitrc.in ++++ ./xinitrc.in +@@ -11,8 +11,8 @@ xmodmap="@XMODMAP@" + + userresources="$HOME/.Xresources" + usermodmap="$HOME/.Xmodmap" +-sysresources="$xinitdir/.Xresources" +-sysmodmap="$xinitdir/.Xmodmap" ++sysresources="$xinitdir/Xresources" ++sysmodmap="$xinitdir/Xmodmap" + + # merge in defaults and keymaps + +@@ -42,15 +42,25 @@ fi + + # start some nice programs + ++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 +-- +2.48.1 diff --git a/x11-apps/xinit/files/xinit-1.4.4-move-serverauthfile-into-tmp.patch b/x11-apps/xinit/files/xinit-1.4.4-move-serverauthfile-into-tmp.patch new file mode 100644 index 000000000000..3d2f4e244cc3 --- /dev/null +++ b/x11-apps/xinit/files/xinit-1.4.4-move-serverauthfile-into-tmp.patch @@ -0,0 +1,22 @@ +Move startx auth files in /tmp so they are removed on reboot. +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=357736 +The trap patch didn't seem to work on reboot. +--- + startx.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git ./startx.in ./startx.in +index 8247156..134b704 100644 +--- ./startx.in ++++ ./startx.in +@@ -272,7 +272,7 @@ if [ "$enable_xauth" = 1 ] ; then + dummy=0 + + # create a file with auth information for the server. ':0' is a dummy. +- xserverauthfile="$HOME/.serverauth.$$" ++ xserverauthfile="`mktemp --tmpdir serverauth.XXXXXXXXXX`" + trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP BUS TERM + xauth -q -f "$xserverauthfile" << EOF + add :$dummy . $mcookie +-- +2.48.1 diff --git a/x11-apps/xinit/files/xinit-1.4.4-startx-current-vt.patch b/x11-apps/xinit/files/xinit-1.4.4-startx-current-vt.patch new file mode 100644 index 000000000000..d1b410f21f7b --- /dev/null +++ b/x11-apps/xinit/files/xinit-1.4.4-startx-current-vt.patch @@ -0,0 +1,33 @@ +From 8c1c8a7e9d2a149461b60b8c6d16c04d6f4aadd9 Mon Sep 17 00:00:00 2001 +From: Matt Turner <mattst88@gmail.com> +Date: Sat, 3 Dec 2022 18:21:50 -0500 +Subject: [PATCH app/xinit 2/2] files/xinit-1.4.0-startx-current-vt.patch + +--- + startx.in | 11 ----------- + 1 file changed, 11 deletions(-) + +diff --git ./startx.in ./startx.in +index 9b224af..8247156 100644 +--- ./startx.in ++++ ./startx.in +@@ -213,17 +213,6 @@ fi + if [ "$server" = "" ]; then + server="$defaultserver" + +-if [ "$(uname -s)" = "Linux" ] ; then +- # When starting the defaultserver start X on the current tty to avoid +- # the startx session being seen as inactive: +- # "https://bugzilla.redhat.com/show_bug.cgi?id=806491" +- tty=$(tty) +- if expr "$tty" : '/dev/tty[0-9][0-9]*$' > /dev/null; then +- tty_num="${tty#/dev/tty}" +- vtarg="vt$tty_num -keeptty" +- fi +-fi +- + # For compatibility reasons, only use xserverrc if there were no server command line arguments + if [ "$serverargs" = "" ] && [ "$display" = "" ]; then + if [ -f "$userserverrc" ]; then +-- +2.48.1 diff --git a/x11-apps/xinit/xinit-1.4.4.ebuild b/x11-apps/xinit/xinit-1.4.4.ebuild new file mode 100644 index 000000000000..f2052237e29e --- /dev/null +++ b/x11-apps/xinit/xinit-1.4.4.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit eapi9-ver xorg-3 + +DESCRIPTION="X Window System initializer" + +LICENSE="${LICENSE} GPL-2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm-linux ~x86-linux" +IUSE="twm" + +RDEPEND=" + x11-apps/xauth + x11-libs/libX11 +" +DEPEND="${RDEPEND}" +PDEPEND="x11-apps/xrdb + twm? ( + x11-apps/xclock + x11-apps/xsm + x11-terms/xterm + x11-wm/twm + ) +" + +PATCHES=( + "${FILESDIR}/${PN}-1.4.4-gentoo-customizations.patch" + "${FILESDIR}/${PN}-1.4.4-startx-current-vt.patch" + "${FILESDIR}/${PN}-1.4.4-move-serverauthfile-into-tmp.patch" +) + +XORG_CONFIGURE_OPTIONS=( + --with-xinitdir="${EPREFIX}"/etc/X11/xinit +) + +src_install() { + xorg-3_src_install + + exeinto /etc/X11 + doexe "${FILESDIR}"/chooser.sh + exeinto /etc/X11/Sessions + doexe "${FILESDIR}"/Xsession + exeinto /etc/X11/xinit + newexe "${FILESDIR}"/xserverrc.2 xserverrc + exeinto /etc/X11/xinit/xinitrc.d/ + doexe "${FILESDIR}"/00-xhost + + insinto /usr/share/xsessions + doins "${FILESDIR}"/Xsession.desktop +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]]; then + ewarn "If you use startx to start X instead of a login manager like gdm/kdm," + ewarn "you can set the XSESSION variable to anything in /etc/X11/Sessions/ or" + ewarn "any executable. When you run startx, it will run this as the login session." + ewarn "You can set this in a file in /etc/env.d/ for the entire system," + ewarn "or set it per-user in ~/.bash_profile (or similar for other shells)." + ewarn "Here's an example of setting it for the whole system:" + ewarn " echo XSESSION=\"Gnome\" > /etc/env.d/90xsession" + ewarn " env-update && source /etc/profile" + elif ver_replacing "-lt" "1.4.1"; then + ewarn "Starting with ${CATEGORY}/${PN}-1.4.1 serverauth files are no longer kept in the" + ewarn "home directory but rather are created in \$TMPDIR (typically /tmp). The change" + ewarn "is transparent for most of users, however those that use runtime temporary" + ewarn "directories cleaning tools, like app-admin/tmpreaper, may need to adjust them" + ewarn "not to remove the 'serverauth.*' files." + fi +} |