1 |
commit: 9d68e491c96541f7cbf3d5766597906561bbf512 |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Mar 11 15:32:43 2018 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Nov 27 22:43:15 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d68e491 |
7 |
|
8 |
x11-apps/xinit: xserverrc: pass -keeptty for systemd-logind support |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/7423 |
11 |
Closes: https://bugs.gentoo.org/603294 |
12 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
13 |
|
14 |
x11-apps/xinit/files/xserverrc.2 | 6 ++++ |
15 |
x11-apps/xinit/xinit-1.4.0-r1.ebuild | 67 ++++++++++++++++++++++++++++++++++++ |
16 |
2 files changed, 73 insertions(+) |
17 |
|
18 |
diff --git a/x11-apps/xinit/files/xserverrc.2 b/x11-apps/xinit/files/xserverrc.2 |
19 |
new file mode 100644 |
20 |
index 00000000000..8d5b2c3f790 |
21 |
--- /dev/null |
22 |
+++ b/x11-apps/xinit/files/xserverrc.2 |
23 |
@@ -0,0 +1,6 @@ |
24 |
+#!/bin/sh |
25 |
+if [ -z "$XDG_VTNR" ]; then |
26 |
+ exec /usr/bin/X -nolisten tcp "$@" |
27 |
+else |
28 |
+ exec /usr/bin/X -nolisten tcp -keeptty "$@" "vt$XDG_VTNR" |
29 |
+fi |
30 |
|
31 |
diff --git a/x11-apps/xinit/xinit-1.4.0-r1.ebuild b/x11-apps/xinit/xinit-1.4.0-r1.ebuild |
32 |
new file mode 100644 |
33 |
index 00000000000..13cf2917ed8 |
34 |
--- /dev/null |
35 |
+++ b/x11-apps/xinit/xinit-1.4.0-r1.ebuild |
36 |
@@ -0,0 +1,67 @@ |
37 |
+# Copyright 1999-2018 Gentoo Foundation |
38 |
+# Distributed under the terms of the GNU General Public License v2 |
39 |
+ |
40 |
+EAPI=5 |
41 |
+ |
42 |
+inherit xorg-2 |
43 |
+ |
44 |
+DESCRIPTION="X Window System initializer" |
45 |
+ |
46 |
+LICENSE="${LICENSE} GPL-2" |
47 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux" |
48 |
+IUSE="+minimal" |
49 |
+ |
50 |
+RDEPEND=" |
51 |
+ !<x11-base/xorg-server-1.8.0 |
52 |
+ x11-apps/xauth |
53 |
+ x11-libs/libX11 |
54 |
+" |
55 |
+DEPEND="${RDEPEND}" |
56 |
+PDEPEND="x11-apps/xrdb |
57 |
+ !minimal? ( |
58 |
+ x11-apps/xclock |
59 |
+ x11-apps/xsm |
60 |
+ x11-terms/xterm |
61 |
+ x11-wm/twm |
62 |
+ ) |
63 |
+" |
64 |
+ |
65 |
+PATCHES=( |
66 |
+ "${FILESDIR}/${PN}-1.3.3-gentoo-customizations.patch" |
67 |
+ "${FILESDIR}/${PN}-1.4.0-startx-current-vt.patch" |
68 |
+) |
69 |
+ |
70 |
+src_configure() { |
71 |
+ XORG_CONFIGURE_OPTIONS=( |
72 |
+ --with-xinitdir="${EPREFIX}"/etc/X11/xinit |
73 |
+ ) |
74 |
+ xorg-2_src_configure |
75 |
+} |
76 |
+ |
77 |
+src_install() { |
78 |
+ xorg-2_src_install |
79 |
+ |
80 |
+ exeinto /etc/X11 |
81 |
+ doexe "${FILESDIR}"/chooser.sh "${FILESDIR}"/startDM.sh |
82 |
+ exeinto /etc/X11/Sessions |
83 |
+ doexe "${FILESDIR}"/Xsession |
84 |
+ exeinto /etc/X11/xinit |
85 |
+ newexe "${FILESDIR}"/xserverrc.2 xserverrc |
86 |
+ exeinto /etc/X11/xinit/xinitrc.d/ |
87 |
+ doexe "${FILESDIR}"/00-xhost |
88 |
+ |
89 |
+ insinto /usr/share/xsessions |
90 |
+ doins "${FILESDIR}"/Xsession.desktop |
91 |
+} |
92 |
+ |
93 |
+pkg_postinst() { |
94 |
+ xorg-2_pkg_postinst |
95 |
+ ewarn "If you use startx to start X instead of a login manager like gdm/kdm," |
96 |
+ ewarn "you can set the XSESSION variable to anything in /etc/X11/Sessions/ or" |
97 |
+ ewarn "any executable. When you run startx, it will run this as the login session." |
98 |
+ ewarn "You can set this in a file in /etc/env.d/ for the entire system," |
99 |
+ ewarn "or set it per-user in ~/.bash_profile (or similar for other shells)." |
100 |
+ ewarn "Here's an example of setting it for the whole system:" |
101 |
+ ewarn " echo XSESSION=\"Gnome\" > /etc/env.d/90xsession" |
102 |
+ ewarn " env-update && source /etc/profile" |
103 |
+} |