rpm/xinit
SHA256
1
0
Fork 0
forked from pool/xinit
Code Pull Requests Activity

Accepting request 622069 from home:fcrozat:branches:X11:XOrg

Browse Source 
- Do not check /var/lib/X11/X anymore, it is obsolete
  (FATE#325524).

(maybe DISPLAYMANAGER_XSERVER should be completely killed in /etc/sysconfig/displaymanager ? )

OBS-URL: https://build.opensuse.org/request/show/622069
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xinit?expand=0&rev=40
This commit is contained in:
Stefan Dirsch
2018-07-11 11:35:39 +00:00
committed by Git OBS Bridge
parent 0be8d38e75
commit 7433d6f4be
2 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
xinit-suse.patch
View File

@@ -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 @@ Index: xinit-1.4.0/startx.cpp
+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 @@ Index: xinit-1.4.0/startx.cpp
defaultclientargs=""
defaultserverargs=""
defaultdisplay=""
@@ -312,6 +416,9 @@ EOF
@@ -312,6 +404,9 @@
fi
done
fi
@@ -127,7 +115,7 @@ Index: xinit-1.4.0/startx.cpp
#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 @@ Index: xinit-1.4.0/startx.cpp
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