Hello community, here is the log from the commit of package gdm for openSUSE:Factory checked in at 2020-09-18 14:28:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gdm (Old) and /work/SRC/openSUSE:Factory/.gdm.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gdm" Fri Sep 18 14:28:44 2020 rev:232 rq:834848 version:3.36.3 Changes: -------- --- /work/SRC/openSUSE:Factory/gdm/gdm.changes 2020-07-24 09:49:44.357011889 +0200 +++ /work/SRC/openSUSE:Factory/.gdm.new.4249/gdm.changes 2020-09-18 14:32:11.747509447 +0200 @@ -1,0 +2,7 @@ +Wed Sep 16 09:17:43 UTC 2020 - Stefan Dirsch <sndir...@suse.com> + +- gdm-UsrEtc.patch + * needed changes for xdm/xinit/xmodmap move to /usr/etc/X11 + (boo#1173049, boo#1173052, boo#1173053) + +------------------------------------------------------------------- New: ---- gdm-UsrEtc.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gdm.spec ++++++ --- /var/tmp/diff_new_pack.fT2H2A/_old 2020-09-18 14:32:19.183516084 +0200 +++ /var/tmp/diff_new_pack.fT2H2A/_new 2020-09-18 14:32:19.187516087 +0200 @@ -65,6 +65,8 @@ Patch14: gdm-switch-user-tty7.patch # PATCH-FIX-UPSTREAM gdm-disable-wayland-on-mgag200-chipsets.patch bsc#1162888 glgo#GNOME/mutter#57 qk...@suse.com -- Disable Wayland on mgag200 chipsets Patch15: gdm-disable-wayland-on-mgag200-chipsets.patch +# PATCH-FIX-OPENSUSE gdm-UsrEtc.patch boo#1173049 boo#1173052 boo#1173053 -- needed changes for xdm/xinit/xmodmap move to /usr/etc/X11 +Patch16: gdm-UsrEtc.patch ### NOTE: Keep please SLE-only patches at bottom (starting on 1000). # PATCH-FIX-SLE gdm-disable-gnome-initial-setup.patch bnc#1067976 qz...@suse.com -- Disable gnome-initial-setup runs before gdm, g-i-s will only serve for CJK people to choose the input-method after login. @@ -223,6 +225,7 @@ %endif %patch14 -p1 %patch15 -p1 +%patch16 -p1 # SLE and Leap only patches start at 1000 %if 0%{?sle_version} ++++++ gdm-UsrEtc.patch ++++++ diff -u -r gdm-3.36.3.orig/data/Init.in gdm-3.36.3/data/Init.in --- gdm-3.36.3.orig/data/Init.in 2020-09-16 10:46:25.114437000 +0200 +++ gdm-3.36.3/data/Init.in 2020-09-16 10:49:16.450653000 +0200 @@ -22,14 +22,22 @@ echo "$OUTPUT" } -sysresources=/etc/X11/Xresources +if [ -f /etc/X11/Xresources ]; then + sysresources=/etc/X11/Xresources +else + sysresources=/usr/etc/X11/Xresources +fi # merge in defaults if [ -f "$sysresources" ]; then xrdb -merge "$sysresources" fi -sysmodmap=/etc/X11/Xmodmap +if [ -f /etc/X11/Xmodmap ]; then + sysmodmap=/etc/X11/Xmodmap +else + sysmodmap=/usr/etc/X11/Xmodmap +fi XMODMAP=`gdmwhich xmodmap` if [ "x$XMODMAP" != "x" ] ; then diff -u -r gdm-3.36.3.orig/data/Xsession.in gdm-3.36.3/data/Xsession.in --- gdm-3.36.3.orig/data/Xsession.in 2020-09-16 10:46:25.136436000 +0200 +++ gdm-3.36.3/data/Xsession.in 2020-09-16 11:06:52.038405000 +0200 @@ -29,11 +29,20 @@ # good for debugging where things went wrong echo "$0: Beginning session setup..." -# First read /etc/profile and .profile -test -f /etc/profile && . /etc/profile +# First read /etc/profile (resp. /usr/etc/profile) and .profile +if [ -f /etc/profile ]; then + . /etc/profile +elif [ -f /usr/etc/profile ]; then + . /usr/etc/profile +fi test -f "$HOME/.profile" && . "$HOME/.profile" -# Second read /etc/xprofile and .xprofile for X specific setup -test -f /etc/xprofile && . /etc/xprofile +# Second read /etc/xprofile (resp. /usr/etc/xprofile) and .xprofile for X specific setup +if [ -f /etc/xprofile ]; then + . /etc/xprofile +elif [ -f /usr/etc/xprofile ]; then + . /usr/etc/xprofile + +fi test -f "$HOME/.xprofile" && . "$HOME/.xprofile" # Translation stuff @@ -85,9 +94,23 @@ usermodmap="$HOME/.Xmodmap" userxkbmap="$HOME/.Xkbmap" -sysresources=/etc/X11/Xresources -sysmodmap=/etc/X11/Xmodmap -sysxkbmap=/etc/X11/Xkbmap +if [ -f /etc/X11/Xresources ]; then + sysresources=/etc/X11/Xresources +else + sysresources=/usr/etc/X11/Xresources +fi + +if [ -f /etc/X11/Xmodmap ]; then + sysmodmap=/etc/X11/Xmodmap +else + sysmodmap=/usr/etc/X11/Xmodmap +fi + +if [ -f /etc/X11/Xkbmap ]; then + sysxkbmap=/etc/X11/Xkbmap +else + sysxkbmap=/usr/etc/X11/Xkbmap +fi rh6sysresources=/etc/X11/xinit/Xresources rh6sysmodmap=/etc/X11/xinit/Xmodmap @@ -149,6 +172,15 @@ xhost +si:localuser:`id -un` || : # run all system xinitrc shell scripts. +if [ -d /usr/etc/X11/xinit/xinitrc.d ]; then + for i in /usr/etc/X11/xinit/xinitrc.d/* ; do + sname=$(basename $script) + test -x /etc/X11/xinit/xinitrc.d/$sname && continue + if [ -x "$i" -a ! -d "$i" ]; then + . "$i" + fi + done +fi if [ -d /etc/X11/xinit/xinitrc.d ]; then for i in /etc/X11/xinit/xinitrc.d/* ; do if [ -x "$i" -a ! -d "$i" ]; then