gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-01-06 02:17:34 -08:00
Code Issues Projects Releases Wiki Activity

x11-apps/xinit: Drop old versions

Browse Source 
Signed-off-by: Matt Turner <mattst88@gentoo.org>
This commit is contained in:
Matt Turner 2025-04-13 23:34:08 -04:00
parent 74c19bcfc3
commit 358add0c81
No known key found for this signature in database
GPG Key ID: ACEB29740C9A4E97
8 changed files with 0 additions and 351 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
x11-apps/xinit/Manifest
View File

@ -1,3 +1 @@
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

61
x11-apps/xinit/files/xinit-1.3.3-gentoo-customizations.patch
View File

@ -1,61 +0,0 @@
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

23
x11-apps/xinit/files/xinit-1.4.2-move-serverauthfile-into-tmp.patch
View File

@ -1,23 +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(-)
diff --git a/startx.cpp b/startx.cpp
index 082f780..9f9ff00 100644
--- a/startx.cpp
+++ b/startx.cpp
@@ -261,7 +261,7 @@ if [ x"$enable_xauth" = x1 ] ; then
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 BUS TERM
xauth -q -f "$xserverauthfile" << EOF
add :$dummy . $mcookie
--
2.37.4

25
x11-apps/xinit/files/xinit-1.4.2-startx-current-vt.patch
View File

@ -1,25 +0,0 @@
diff --git a/startx.cpp b/startx.cpp
index dfbebe1..082f780 100644
--- a/startx.cpp
+++ b/startx.cpp
@@ -202,17 +202,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=${tty#/dev/tty}
- 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
--
2.37.4

60
x11-apps/xinit/files/xinit-1.4.3-gentoo-customizations.patch
View File

@ -1,60 +0,0 @@
From 51b59e76c26da000de8a3d3f32d440d4213c2964 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 file changed, 18 insertions(+), 8 deletions(-)
diff --git ./xinitrc.cpp ./xinitrc.cpp
index fa1675c..7cff166 100644
--- ./xinitrc.cpp
+++ ./xinitrc.cpp
@@ -9,8 +9,8 @@ xmodmap=XMODMAP
userresources=$HOME/.Xresources
usermodmap=$HOME/.Xmodmap
-sysresources=$xinitdir/.Xresources
-sysmodmap=$xinitdir/.Xmodmap
+sysresources=$xinitdir/Xresources
+sysmodmap=$xinitdir/Xmodmap
XCOMM merge in defaults and keymaps
@@ -40,15 +40,25 @@ fi
XCOMM 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.45.2

34
x11-apps/xinit/files/xinit-1.4.3-startx-current-vt.patch
View File

@ -1,34 +0,0 @@
From 14903751c4d53bb69c3ee241524888cf746784c6 Mon Sep 17 00:00:00 2001
From: Matt Turner <mattst88@gmail.com>
Date: Sat, 3 Dec 2022 18:21:50 -0500
Subject: [PATCH] files/xinit-1.4.0-startx-current-vt.patch
---
startx.cpp | 11 -----------
1 file changed, 11 deletions(-)
diff --git ./startx.cpp ./startx.cpp
index 645566f..aa1dd7a 100644
--- ./startx.cpp
+++ ./startx.cpp
@@ -211,17 +211,6 @@ XCOMM process server arguments
if [ "$server" = "" ]; then
server=$defaultserver
-if [ "$(uname -s)" = "Linux" ] ; then
- 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=${tty#/dev/tty}
- vtarg="vt$tty_num -keeptty"
- fi
-fi
-
XCOMM For compatibility reasons, only use xserverrc if there were no server command line arguments
if [ "$serverargs" = "" ] && [ "$display" = "" ]; then
if [ -f "$userserverrc" ]; then
--
2.45.2

75
x11-apps/xinit/xinit-1.4.2.ebuild
View File

@ -1,75 +0,0 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit 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.3.3-gentoo-customizations.patch"
"${FILESDIR}/${PN}-1.4.2-startx-current-vt.patch"
"${FILESDIR}/${PN}-1.4.2-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
}

71
x11-apps/xinit/xinit-1.4.3.ebuild
View File

@ -1,71 +0,0 @@
# 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.3-gentoo-customizations.patch"
"${FILESDIR}/${PN}-1.4.3-startx-current-vt.patch"
"${FILESDIR}/${PN}-1.4.2-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
}