gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-11-04 04:57:07 -08:00
Code Issues Projects Releases Wiki Activity

x11-apps/xinit: Drop old versions

Browse Source
This commit is contained in:
Matt Turner
2018-05-20 11:28:46 -07:00
parent d400b83395
commit e773ede4cc
6 changed files with 0 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files
x11-apps/xinit/Manifest
-1
View File
@@ -1,2 +1 @@
DIST xinit-1.3.4.tar.bz2 165881 BLAKE2B 78e0b9e8fdb146e969014d726ac05e7f4cf14947aa6026642fbbe6a55eb9c5cb891f079281bb40b460f9b1373259e338dcc0615fbdda64da49b719980017b782 SHA512 ac31e4cac86fc5dd4c0e15cf37cb9ac470ef3ace4f86d0063c7e1091342fe64d41fcd12c1840bd8e1cef4cdd7f66bd2fa76bd4061641e9c70941d76d73d0df2e
DIST xinit-1.4.0.tar.bz2 174491 BLAKE2B 5a613a244a22f3bb4de43ae23b8f590b41a6af2c3adb282d2a089f4b94117220d86654c16cbb20ad0a50b6aab1be65512a7a42850e9047cfca96f25af964d081 SHA512 53a29081130c1e195eb441ee77ccaa044b18b4cca3d2d5da3a6d67aa421dfd9718fa18b6be6232a41e40cf260c8190064c4d8d9ab771177bd5cd12e77a8fa79e
x11-apps/xinit/files/xinit-1.3.3-gentoo-customizations.patch
-61
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
x11-apps/xinit/files/xinit-1.3.4-startx-current-vt.patch
-21
View File
@@ -1,21 +0,0 @@
diff -ur a/startx.cpp b/startx.cpp
--- a/startx.cpp 2014-09-11 19:31:42.000000000 +0200
+++ b/startx.cpp 2015-02-08 19:09:56.416428623 +0100
@@ -188,17 +188,6 @@
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 match "$tty" '^/dev/tty[0-9]\+$' > /dev/null; then
- tty_num=$(echo "$tty" | grep -oE '[0-9]+$')
- vtarg="vt$tty_num"
- 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
x11-apps/xinit/files/xserverrc
-2
View File
@@ -1,2 +0,0 @@
#!/bin/sh
exec /usr/bin/X -nolisten tcp "$@"
x11-apps/xinit/xinit-1.3.4-r3.ebuild
-74
View File
@@ -1,74 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
inherit xorg-2
DESCRIPTION="X Window System initializer"
LICENSE="${LICENSE} GPL-2"
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
IUSE="+minimal systemd"
RDEPEND="
!<x11-base/xorg-server-1.8.0
x11-apps/xauth
x11-libs/libX11
"
DEPEND="${RDEPEND}"
PDEPEND="x11-apps/xrdb
!minimal? (
x11-apps/xclock
x11-apps/xsm
x11-terms/xterm
x11-wm/twm
)
"
PATCHES=(
"${FILESDIR}/${PN}-1.3.3-gentoo-customizations.patch"
)
src_prepare() {
# this patch breaks startx on non-systemd systems, bug #526802
if use !systemd; then
PATCHES+=( "${FILESDIR}"/${PN}-1.3.4-startx-current-vt.patch )
fi
xorg-2_src_prepare
}
src_configure() {
XORG_CONFIGURE_OPTIONS=(
--with-xinitdir="${EPREFIX}"/etc/X11/xinit
)
xorg-2_src_configure
}
src_install() {
xorg-2_src_install
exeinto /etc/X11
doexe "${FILESDIR}"/chooser.sh "${FILESDIR}"/startDM.sh
exeinto /etc/X11/Sessions
doexe "${FILESDIR}"/Xsession
exeinto /etc/X11/xinit
newexe "${FILESDIR}"/xserverrc.1 xserverrc
exeinto /etc/X11/xinit/xinitrc.d/
doexe "${FILESDIR}"/00-xhost
insinto /usr/share/xsessions
doins "${FILESDIR}"/Xsession.desktop
}
pkg_postinst() {
xorg-2_pkg_postinst
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"
}
x11-apps/xinit/xinit-1.3.4-r4.ebuild
-67
View File
@@ -1,67 +0,0 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
inherit xorg-2
DESCRIPTION="X Window System initializer"
LICENSE="${LICENSE} GPL-2"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
IUSE="+minimal"
RDEPEND="
!<x11-base/xorg-server-1.8.0
x11-apps/xauth
x11-libs/libX11
"
DEPEND="${RDEPEND}"
PDEPEND="x11-apps/xrdb
!minimal? (
x11-apps/xclock
x11-apps/xsm
x11-terms/xterm
x11-wm/twm
)
"
PATCHES=(
"${FILESDIR}/${PN}-1.3.3-gentoo-customizations.patch"
"${FILESDIR}/${PN}-1.3.4-startx-current-vt.patch"
)
src_configure() {
XORG_CONFIGURE_OPTIONS=(
--with-xinitdir="${EPREFIX}"/etc/X11/xinit
)
xorg-2_src_configure
}
src_install() {
xorg-2_src_install
exeinto /etc/X11
doexe "${FILESDIR}"/chooser.sh "${FILESDIR}"/startDM.sh
exeinto /etc/X11/Sessions
doexe "${FILESDIR}"/Xsession
exeinto /etc/X11/xinit
newexe "${FILESDIR}"/xserverrc.1 xserverrc
exeinto /etc/X11/xinit/xinitrc.d/
doexe "${FILESDIR}"/00-xhost
insinto /usr/share/xsessions
doins "${FILESDIR}"/Xsession.desktop
}
pkg_postinst() {
xorg-2_pkg_postinst
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"
}