diff options
author | Andrey Grozin <grozin@gentoo.org> | 2019-07-01 22:56:49 +0700 |
---|---|---|
committer | Andrey Grozin <grozin@gentoo.org> | 2019-07-01 22:56:49 +0700 |
commit | 41db5a91e80068c61fccea9669aeeb0623c2b8ee (patch) | |
tree | 1a6c1a949f1e2f9e9670c490e652684641ffc940 /x11-wm/lumina/files | |
parent | sci-electronics/gwave: Use xdg_icon_cache_update (diff) | |
download | gentoo-41db5a91e80068c61fccea9669aeeb0623c2b8ee.tar.gz gentoo-41db5a91e80068c61fccea9669aeeb0623c2b8ee.tar.bz2 gentoo-41db5a91e80068c61fccea9669aeeb0623c2b8ee.zip |
x11-wm/lumina: fix dependencies, install icons and session file
Closes: https://bugs.gentoo.org/show_bug.cgi?id=597324
Closes: https://bugs.gentoo.org/show_bug.cgi?id=645380
Closes: https://bugs.gentoo.org/show_bug.cgi?id=688880
Package-Manager: Portage-2.3.67, Repoman-2.3.16
Signed-off-by: Andrey Grozin <grozin@gentoo.org>
Diffstat (limited to 'x11-wm/lumina/files')
-rw-r--r-- | x11-wm/lumina/files/lumina-session | 90 |
1 files changed, 90 insertions, 0 deletions
diff --git a/x11-wm/lumina/files/lumina-session b/x11-wm/lumina/files/lumina-session new file mode 100644 index 000000000000..9fb7a418b2af --- /dev/null +++ b/x11-wm/lumina/files/lumina-session @@ -0,0 +1,90 @@ +#!/bin/sh +# lumina Xsession starter, based on Xsession shipped by x11-apps/xinit-1.0.5-r1 + +# redirect errors to a file in user's home directory if we can +for errfile in "$HOME/.fluxbox-errors" "${TMPDIR-/tmp}/fluxbox-$USER" "/tmp/fluxbox-$USER" +do + if ( cp /dev/null "$errfile" 2> /dev/null ) + then + chmod 600 "$errfile" + exec > "$errfile" 2>&1 + break + fi +done + +userresources=$HOME/.Xresources +usermodmap=$HOME/.Xmodmap +userxkbmap=$HOME/.Xkbmap + +sysresources=/etc/X11/Xresources +sysmodmap=/etc/X11/Xmodmap +sysxkbmap=/etc/X11/Xkbmap + +rh6sysresources=/etc/X11/xinit/Xresources +rh6sysmodmap=/etc/X11/xinit/Xmodmap + + +# merge in defaults +if [ -f "$rh6sysresources" ]; then + xrdb -merge "$rh6sysresources" +fi + +if [ -f "$sysresources" ]; then + xrdb -merge "$sysresources" +fi + +if [ -f "$userresources" ]; then + xrdb -merge "$userresources" +fi + +# merge in keymaps +if [ -f "$sysxkbmap" ]; then + setxkbmap `cat "$sysxkbmap"` + XKB_IN_USE=yes +fi + +if [ -f "$userxkbmap" ]; then + setxkbmap `cat "$userxkbmap"` + XKB_IN_USE=yes +fi + +# +# Eeek, this seems like too much magic here +# +if [ -z "$XKB_IN_USE" -a ! -L /etc/X11/X ]; then + if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then + xkbsymbols=`sed -n -e 's/^[ ]*XkbSymbols[ ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config /etc/X11/xorg.conf` + if [ -n "$xkbsymbols" ]; then + setxkbmap -symbols "$xkbsymbols" + XKB_IN_USE=yes + fi + fi +fi + +# xkb and xmodmap don't play nice together +if [ -z "$XKB_IN_USE" ]; then + if [ -f "$rh6sysmodmap" ]; then + xmodmap "$rh6sysmodmap" + fi + + if [ -f "$sysmodmap" ]; then + xmodmap "$sysmodmap" + fi + + if [ -f "$usermodmap" ]; then + xmodmap "$usermodmap" + fi +fi + +unset XKB_IN_USE + +# run all system xinitrc shell scripts. +if [ -d /etc/X11/xinit/xinitrc.d ]; then + for i in /etc/X11/xinit/xinitrc.d/* ; do + if [ -x "$i" ]; then + . "$i" + fi + done +fi + +exec /usr/bin/start-lumina-desktop |