Hello community, here is the log from the commit of package xinit for openSUSE:Factory checked in at 2018-07-18 22:35:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xinit (Old) and /work/SRC/openSUSE:Factory/.xinit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xinit" Wed Jul 18 22:35:10 2018 rev:22 rq:622070 version:1.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/xinit/xinit.changes 2018-04-20 17:24:27.509442936 +0200 +++ /work/SRC/openSUSE:Factory/.xinit.new/xinit.changes 2018-07-18 22:35:11.662688863 +0200 @@ -1,0 +2,6 @@ +Wed Jul 11 11:16:48 UTC 2018 - [email protected] + +- Do not check /var/lib/X11/X anymore, it is obsolete + (FATE#325524). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xinit-suse.patch ++++++ --- /var/tmp/diff_new_pack.qbTbQM/_old 2018-07-18 22:35:13.138683974 +0200 +++ /var/tmp/diff_new_pack.qbTbQM/_new 2018-07-18 22:35:13.138683974 +0200 @@ -1,8 +1,8 @@ Index: xinit-1.4.0/startx.cpp =================================================================== ---- xinit-1.4.0.orig/startx.cpp -+++ xinit-1.4.0/startx.cpp -@@ -50,10 +50,114 @@ export PATH +--- xinit-1.4.0.orig/startx.cpp 2018-03-10 02:46:03.000000000 +0100 ++++ xinit-1.4.0/startx.cpp 2018-07-11 13:16:21.864694488 +0200 +@@ -50,10 +50,102 @@ userclientrc=$HOME/.xinitrc sysclientrc=XINITDIR/xinitrc @@ -66,35 +66,23 @@ +unset WINDOWMANAGERLIST WMLIST WANTEDWM WM + +XCOMM -+XCOMM check for the first link ++XCOMM check symlink +XCOMM + -+if [ ! -L /var/lib/X11/X -a ! -L /usr/bin/X ]; then ++if [ ! -L /usr/bin/X ]; then + + echo "" -+ echo "There is no link /usr/bin/X (/usr/bin/Xorg) to /var/lib/X11/X!" ++ echo "There is no link /usr/bin/X to X server (/usr/bin/Xorg)!" + echo "Please link the files as mentioned above or install the X-Server again." + echo "I'm aborting now." + exit 1 +fi + +XCOMM -+XCOMM check for the second link -+XCOMM -+ -+if [ ! -L /var/lib/X11/X ]; then -+ -+ echo "" -+ echo "There is no link /var/lib/X11/X to the correct X Server binary." -+ echo "I'm aborting now." -+ exit 1 -+fi -+ -+XCOMM +XCOMM check if the Xorg file is an executable or an accidentally copied script or similar things +XCOMM + -+if [ ! -x /var/lib/X11/X ]; then ++if [ ! -x /usr/bin/X ]; then + + echo "" + echo "The file Xorg (binary of X-Server) doesn't seem to be a binary file." @@ -117,7 +105,7 @@ defaultclientargs="" defaultserverargs="" defaultdisplay="" -@@ -312,6 +416,9 @@ EOF +@@ -312,6 +404,9 @@ fi done fi @@ -127,7 +115,7 @@ #if defined(__APPLE__) || defined(__CYGWIN__) eval XINIT \"$client\" $clientargs -- \"$server\" $display $serverargs -@@ -320,6 +427,12 @@ XINIT "$client" $clientargs -- "$server" +@@ -320,6 +415,12 @@ #endif retval=$? @@ -142,9 +130,9 @@ XAUTH remove $removelist Index: xinit-1.4.0/xinitrc.cpp =================================================================== ---- xinit-1.4.0.orig/xinitrc.cpp -+++ xinit-1.4.0/xinitrc.cpp -@@ -48,8 +48,10 @@ if [ -d XINITDIR/xinitrc.d ] ; then +--- xinit-1.4.0.orig/xinitrc.cpp 2018-03-10 02:46:03.000000000 +0100 ++++ xinit-1.4.0/xinitrc.cpp 2018-07-11 13:13:23.808686361 +0200 +@@ -48,8 +48,10 @@ unset f fi
