From 236302aac694377916670b7769f941e3f1dd0bbc Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 26 Jan 2023 19:56:43 +0000 Subject: gentoo auto-resync : 26:01:2023 - 19:56:42 --- x11-apps/xinit/Manifest | 4 -- .../files/xinit-1.4.0-startx-current-vt.patch | 20 ------ .../xinit-1.4.1-move-serverauthfile-into-tmp.patch | 22 ------- x11-apps/xinit/xinit-1.4.1-r1.ebuild | 75 ---------------------- 4 files changed, 121 deletions(-) delete mode 100644 x11-apps/xinit/files/xinit-1.4.0-startx-current-vt.patch delete mode 100644 x11-apps/xinit/files/xinit-1.4.1-move-serverauthfile-into-tmp.patch delete mode 100644 x11-apps/xinit/xinit-1.4.1-r1.ebuild (limited to 'x11-apps/xinit') diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest index e4f654a5a871..a1fab1bc3b51 100644 --- a/x11-apps/xinit/Manifest +++ b/x11-apps/xinit/Manifest @@ -3,13 +3,9 @@ AUX Xsession 2187 BLAKE2B d6df80e9d0faecd9286be70b2639b7bb993d363a7834cd63b108be AUX Xsession.desktop 229 BLAKE2B f1daf7f0ef98a3be220195fb64bc057180db20016ef991e5d2000c60b74cb729a962270ff342e29088e9e928a163732c7b1f7aafc1c056e85d73b6ca8ba9e96c SHA512 2d2fea82972d77ac925e6edcd488c730b678dd74635cc3a06536413ec8bdff63be915161139f12636214023926dded9fa549f053f9a2b916ef905be79591093d AUX chooser.sh 1192 BLAKE2B d0afaaed792dae06c4716ea33924568aca5da3251b15067fc5ba92b2dd5651185ce64329a69ae588f5a4532b8e4b123f7f29bd2db7352df1b496a6e4e03191a8 SHA512 6149a5dc19104773d3500d2e89e8be5c9da49fad8b38148d511af237c6fef84c3223a94d4c0451296e7b27c86c513c5f4fd425a738d94c30d26f1ac888bbc255 AUX xinit-1.3.3-gentoo-customizations.patch 1494 BLAKE2B 1a67f486324e07aee07078648101a3f82b10d5953084c6afe6564530132fb92d299c44559e4d6d3ab74554139be02c285b2076b959413ec248b57cc2aafbc733 SHA512 810066a3af51fd31c177f1aa33d3020e63d1656bacc297fa2bb44e0f3745bfd27d466745ebb07343f7b95339a9f6c8821c6f117e0b2f99724e21a0869427228b -AUX xinit-1.4.0-startx-current-vt.patch 740 BLAKE2B f5ac87b96f76bd4c845cde4844f935afbb757908d0c94f6f5b9c7e6b8055841fcdf4de44af964fe3703d2599b9097fca300551bb4a3dce003e20c266d619eb49 SHA512 97e0ac72c49a9a5ac29a09f169076f0bcec48978f645be01f3b40b6c32b4af4d188f96662c0cf62bab0a6b356ae80c25e0614c0b87a368d7a01a11e603ecdd15 -AUX xinit-1.4.1-move-serverauthfile-into-tmp.patch 745 BLAKE2B 6a964926b4f5eda566be4ff5c0f015ca2d3a9f39f16ba5af0cf3816c56cf458e616645ace1b8be9873c604322ab56b118a7a9e531533f8617cb647a57cf0cf3e SHA512 0fb93f0cebfd4091d7e58139ef375fec931392159b3b060d699d118c89d4403fd5cee82cd35582aedf7dd752aee495724119f864b17988d0dd9a5dfe76c88ce0 AUX xinit-1.4.2-move-serverauthfile-into-tmp.patch 738 BLAKE2B 5639a4e5ff3b1d695871acb69d98a001bb3289efff7b0b95e3f1844bf54c48211ccbd14150a3d598832a322661304403ffda3b4b408975898a7b91e9601eba5c SHA512 16be1614af549252c4e82e956b3216b5d63005874bde31e8aabd4f0fd23a0294c903289bbc70e3cb07bacffdc5a07a6e9ea0396f3f9d01841a3db680cef4aac0 AUX xinit-1.4.2-startx-current-vt.patch 799 BLAKE2B d87a479c3a30daec7606cacabdc4724dad4a5bd4051faee22a620333d2e1adc0f4590ace50914cc3edbd958c037beb4356acfd2863ca976627370843d566b339 SHA512 de219bad36a6200531599750601572df4812c6007baa48ab28f7a9210edbb148f270c13c891afaf6ae53f6798b99e055f3b5fd5ca797241b037c83be6b83e4fb AUX xserverrc.2 143 BLAKE2B b33fac4b5ba731c79167d21a07840c46abfbb33e8fbb80aa1c3f23a8717f836819da3a947b72bd99c7a14516534e9771033bcd1e26d167f2f7083be20eae3b2f SHA512 61afea54f66b9f397860e467cf87a41e1d9f97d7194930bccc254e44dd4178bca7b402bff7aa2a1d6f44a91680f3f1ee10a5b57e527aaff80438623edc1b07c5 -DIST xinit-1.4.1.tar.bz2 176206 BLAKE2B 1c20f34db344eb967ac230a0cd61ad07d0089668aea32973e9b8b9749e5260ad5d93a7f6642a4f2c8d6b01870696e4e1e422790c2954320039aa85e6dba8870a SHA512 6cbc5d025a891c419f3f4493381b2fca57a67d78df866d2f16a83426f86bad6eca7f240fac12b25cbcc63df0fec41f625407184e044898602d66483715315340 DIST xinit-1.4.2.tar.xz 156728 BLAKE2B 8f5c16d5ec9cc16c734b1661def4f7e68321259f24e7aac2b039b8e142fb4a324d2471a0f04d3b4448ae713082ad9ec7018083b00ed1a93aac90fa7db172247d SHA512 4b62c2edd97b40133577cbba88b3f31b36c5634b4eb667ef0c302e8358dc1c55a255abe42aaadc910d8aa9ea0e3add157a12a301382f1cdbe091df4e1215fae0 -EBUILD xinit-1.4.1-r1.ebuild 2235 BLAKE2B edb03d0cd6d1388d5c68a7954c2badae58059e04871f19d24af1bd64c92524af3f61e356fba72d8b35e870fe04089afcf3748ca7bde8622aaf1cbf410efd4fad SHA512 c84b96f584fe2a960237e5874faabdd9b04262b37cf5a3dca900a4762b84e18c0e563fe65cf71b8a5b2a6e58370c74356a79f7a2c48d6c6f03ac744c5b95862f EBUILD xinit-1.4.2.ebuild 2260 BLAKE2B f9a33a583afa6ef94aaf5881931dffa6f9626bd34cc3d525399b8674abb9095dfcd72cb9561750b6c7deba602664ed704da1c03a0240060dbed3ec14235fea9e SHA512 99fb0a93e8d97f8e0d9b343f94ee4cde6aff2e43e5bda7d84cb26e3d9d44729253f33ad0fe7bc04f8fcc7d0ce96575aa3028e9975902f10434de7de48e49029a MISC metadata.xml 550 BLAKE2B 3c7e6936cc7db503b1f4e654e6cc42edfa82524403d8de329e058cb4a8e084075f1c7047e494952847ef137c0d411b4ab20e1f54e4264448040e4d62af0f1ee2 SHA512 d903eb4c148009926f925d6f20ee29316d98adf4ee3431fd47f098d907fc9e777bfa33d34d90163fdc69e6ac7c895f67852269cc938deb2c22102ccb1ca5393b diff --git a/x11-apps/xinit/files/xinit-1.4.0-startx-current-vt.patch b/x11-apps/xinit/files/xinit-1.4.0-startx-current-vt.patch deleted file mode 100644 index ecddd3b369ed..000000000000 --- a/x11-apps/xinit/files/xinit-1.4.0-startx-current-vt.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/startx.cpp -+++ b/startx.cpp -@@ -200,17 +200,6 @@ XCOMM process server arguments - if [ x"$server" = x ]; then - server=$defaultserver - --#ifdef __linux__ -- XCOMM When starting the defaultserver start X on the current tty to avoid -- XCOMM the startx session being seen as inactive: -- XCOMM "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=$(echo "$tty" | grep -oE '[0-9]+$') -- vtarg="vt$tty_num -keeptty" -- fi --#endif -- - XCOMM For compatibility reasons, only use xserverrc if there were no server command line arguments - if [ x"$serverargs" = x -a x"$display" = x ]; then - if [ -f "$userserverrc" ]; then diff --git a/x11-apps/xinit/files/xinit-1.4.1-move-serverauthfile-into-tmp.patch b/x11-apps/xinit/files/xinit-1.4.1-move-serverauthfile-into-tmp.patch deleted file mode 100644 index 339b65311712..000000000000 --- a/x11-apps/xinit/files/xinit-1.4.1-move-serverauthfile-into-tmp.patch +++ /dev/null @@ -1,22 +0,0 @@ -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.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/startx.cpp -+++ b/startx.cpp -@@ -278,11 +278,11 @@ if [ x"$enable_xauth" = x1 ] ; then - exit 1 - fi - dummy=0 - - XCOMM 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 KILL BUS TERM - xauth -q -f "$xserverauthfile" << EOF - add :$dummy . $mcookie - EOF - #if defined(__APPLE__) || defined(__CYGWIN__) diff --git a/x11-apps/xinit/xinit-1.4.1-r1.ebuild b/x11-apps/xinit/xinit-1.4.1-r1.ebuild deleted file mode 100644 index d3ec2f7d9fa6..000000000000 --- a/x11-apps/xinit/xinit-1.4.1-r1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit xorg-3 - -DESCRIPTION="X Window System initializer" - -LICENSE="${LICENSE} GPL-2" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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.3.3-gentoo-customizations.patch" - "${FILESDIR}/${PN}-1.4.0-startx-current-vt.patch" - "${FILESDIR}/${PN}-1.4.1-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" - fi - - for v in ${REPLACING_VERSIONS}; do - if ver_test "$v" "-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 - done -} -- cgit v1.2.3