mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-20 20:09:11 +00:00
Code Issues Releases Activity

x11/lightdm: Make Xsession check for more system-wide config files

Browse Source 
Xresources, Xkbmap and Xmodmap will now be read if they are found in
%%LOCALBASE%%/etc/X11/ or %%LOCALBASE%%/etc/X11/xinit/
with or without a "." prefix.

User-specific versions are still also found in $HOME/ with a "." prefix.
This commit is contained in:
Ben Woods 2017-02-11 07:09:56 +00:00
parent ffb63ce535
commit eae391e7b3
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=433837
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
x11/lightdm/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= lightdm
PORTVERSION= 1.20.0
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= https://launchpad.net/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION}/+download/

6
x11/lightdm/files/Xsession.in
View File

@ -15,7 +15,7 @@ for file in "%%LOCALBASE%%/etc/profile" "$HOME/.profile" "%%LOCALBASE%%/etc/xpro
done
# Load resources
for file in "%%LOCALBASE%%/etc/X11/Xresources" "$HOME/.Xresources"; do
for file in "%%LOCALBASE%%/etc/X11/Xresources" "%%LOCALBASE%%/etc/X11/.Xresources" "%%LOCALBASE%%/etc/X11/xinit/Xresources" "%%LOCALBASE%%/etc/X11/xinit/.Xresources" "$HOME/.Xresources"; do
if [ -f "$file" ]; then
echo "Loading resource: $file"
xrdb -merge "$file"
@ -23,7 +23,7 @@ for file in "%%LOCALBASE%%/etc/X11/Xresources" "$HOME/.Xresources"; do
done
# Load keymaps
for file in "%%LOCALBASE%%/etc/X11/Xkbmap" "$HOME/.Xkbmap"; do
for file in "%%LOCALBASE%%/etc/X11/Xkbmap" "%%LOCALBASE%%/etc/X11/.Xkbmap" "%%LOCALBASE%%/etc/X11/xinit/Xkbmap" "%%LOCALBASE%%/etc/X11/xinit/.Xkbmap" "$HOME/.Xkbmap"; do
if [ -f "$file" ]; then
echo "Loading keymap: $file"
setxkbmap `cat "$file"`
@ -33,7 +33,7 @@ done
# Load xmodmap if not using XKB
if [ -z "$XKB_IN_USE" ]; then
for file in "%%LOCALBASE%%/etc/X11/Xmodmap" "$HOME/.Xmodmap"; do
for file in "%%LOCALBASE%%/etc/X11/Xmodmap" "%%LOCALBASE%%/etc/X11/.Xkbmap" "%%LOCALBASE%%/etc/X11/xinit/Xkbmap" "%%LOCALBASE%%/etc/X11/xinit/.Xkbmap" "$HOME/.Xmodmap"; do
if [ -f "$file" ]; then
echo "Loading modmap: $file"
xmodmap "$file"