1 |
commit: ecff68f05e82355c7c82b448bf1b17fce957ed6b |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri May 20 00:04:08 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 20 00:05:19 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecff68f0 |
7 |
|
8 |
x11-wm/qtile: fix X session args |
9 |
|
10 |
Closes: https://bugs.gentoo.org/846509 |
11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
12 |
|
13 |
x11-wm/qtile/files/qtile-session-r1 | 89 ++++++++++++++++++++++ |
14 |
...{qtile-0.21.0.ebuild => qtile-0.21.0-r1.ebuild} | 2 +- |
15 |
2 files changed, 90 insertions(+), 1 deletion(-) |
16 |
|
17 |
diff --git a/x11-wm/qtile/files/qtile-session-r1 b/x11-wm/qtile/files/qtile-session-r1 |
18 |
new file mode 100644 |
19 |
index 000000000000..f16591c87044 |
20 |
--- /dev/null |
21 |
+++ b/x11-wm/qtile/files/qtile-session-r1 |
22 |
@@ -0,0 +1,89 @@ |
23 |
+#!/bin/sh |
24 |
+# qtile Xsession starter, based on Xsession from x11-apps/xinit |
25 |
+ |
26 |
+# redirect errors to a file in user's home directory if we can |
27 |
+for errfile in "$HOME/.qtile-errors" "${TMPDIR-/tmp}/qtile-$USER" "/tmp/qtile-$USER" |
28 |
+do |
29 |
+ if ( cp /dev/null "$errfile" 2> /dev/null ) |
30 |
+ then |
31 |
+ chmod 600 "$errfile" |
32 |
+ exec > "$errfile" 2>&1 |
33 |
+ break |
34 |
+ fi |
35 |
+done |
36 |
+ |
37 |
+userresources=$HOME/.Xresources |
38 |
+usermodmap=$HOME/.Xmodmap |
39 |
+userxkbmap=$HOME/.Xkbmap |
40 |
+ |
41 |
+sysresources=/etc/X11/Xresources |
42 |
+sysmodmap=/etc/X11/Xmodmap |
43 |
+sysxkbmap=/etc/X11/Xkbmap |
44 |
+ |
45 |
+rh6sysresources=/etc/X11/xinit/Xresources |
46 |
+rh6sysmodmap=/etc/X11/xinit/Xmodmap |
47 |
+ |
48 |
+# merge in defaults |
49 |
+if [ -f "$rh6sysresources" ]; then |
50 |
+ xrdb -merge "$rh6sysresources" |
51 |
+fi |
52 |
+ |
53 |
+if [ -f "$sysresources" ]; then |
54 |
+ xrdb -merge "$sysresources" |
55 |
+fi |
56 |
+ |
57 |
+if [ -f "$userresources" ]; then |
58 |
+ xrdb -merge "$userresources" |
59 |
+fi |
60 |
+ |
61 |
+# merge in keymaps |
62 |
+if [ -f "$sysxkbmap" ]; then |
63 |
+ setxkbmap `cat "$sysxkbmap"` |
64 |
+ XKB_IN_USE=yes |
65 |
+fi |
66 |
+ |
67 |
+if [ -f "$userxkbmap" ]; then |
68 |
+ setxkbmap `cat "$userxkbmap"` |
69 |
+ XKB_IN_USE=yes |
70 |
+fi |
71 |
+ |
72 |
+# |
73 |
+# Eeek, this seems like too much magic here |
74 |
+# |
75 |
+if [ -z "$XKB_IN_USE" -a ! -L /etc/X11/X ]; then |
76 |
+ if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then |
77 |
+ xkbsymbols=`sed -n -e 's/^[ ]*XkbSymbols[ ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config /etc/X11/xorg.conf` |
78 |
+ if [ -n "$xkbsymbols" ]; then |
79 |
+ setxkbmap -symbols "$xkbsymbols" |
80 |
+ XKB_IN_USE=yes |
81 |
+ fi |
82 |
+ fi |
83 |
+fi |
84 |
+ |
85 |
+# xkb and xmodmap don't play nice together |
86 |
+if [ -z "$XKB_IN_USE" ]; then |
87 |
+ if [ -f "$rh6sysmodmap" ]; then |
88 |
+ xmodmap "$rh6sysmodmap" |
89 |
+ fi |
90 |
+ |
91 |
+ if [ -f "$sysmodmap" ]; then |
92 |
+ xmodmap "$sysmodmap" |
93 |
+ fi |
94 |
+ |
95 |
+ if [ -f "$usermodmap" ]; then |
96 |
+ xmodmap "$usermodmap" |
97 |
+ fi |
98 |
+fi |
99 |
+ |
100 |
+unset XKB_IN_USE |
101 |
+ |
102 |
+# run all system xinitrc shell scripts. |
103 |
+if [ -d /etc/X11/xinit/xinitrc.d ]; then |
104 |
+ for i in /etc/X11/xinit/xinitrc.d/* ; do |
105 |
+ if [ -x "$i" ]; then |
106 |
+ . "$i" |
107 |
+ fi |
108 |
+ done |
109 |
+fi |
110 |
+ |
111 |
+exec /usr/bin/qtile start |
112 |
|
113 |
diff --git a/x11-wm/qtile/qtile-0.21.0.ebuild b/x11-wm/qtile/qtile-0.21.0-r1.ebuild |
114 |
similarity index 97% |
115 |
rename from x11-wm/qtile/qtile-0.21.0.ebuild |
116 |
rename to x11-wm/qtile/qtile-0.21.0-r1.ebuild |
117 |
index d219eaf9e16c..9e07d2b6ddc8 100644 |
118 |
--- a/x11-wm/qtile/qtile-0.21.0.ebuild |
119 |
+++ b/x11-wm/qtile/qtile-0.21.0-r1.ebuild |
120 |
@@ -65,5 +65,5 @@ python_install_all() { |
121 |
doins "${FILESDIR}"/qtile.desktop |
122 |
|
123 |
exeinto /etc/X11/Sessions |
124 |
- newexe "${FILESDIR}"/${PN}-session ${PN} |
125 |
+ newexe "${FILESDIR}"/${PN}-session-r1 ${PN} |
126 |
} |