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

Accepting request 283082 from X11:XOrg

Browse Source 
- startx.cpp:
  * /usr/X11R6/bin/X --> /usr/bin/X
  * /var/X11R6/bin/X --> /var/lib/X11/X
- refreshed patches

OBS-URL: https://build.opensuse.org/request/show/283082
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xinit?expand=0&rev=15
This commit is contained in:
Dominique Leuenberger 2015-01-30 05:11:13 +00:00 committed by Git OBS Bridge
commit 83c752d410
3 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
xinit-suse.patch
View File

@ -2,7 +2,7 @@ Index: xinit-1.3.4/startx.cpp
=================================================================== ===================================================================
--- xinit-1.3.4.orig/startx.cpp --- xinit-1.3.4.orig/startx.cpp
+++ xinit-1.3.4/startx.cpp +++ xinit-1.3.4/startx.cpp
@@ -50,10 +50,115 @@ export PATH @@ -50,10 +50,114 @@ export PATH
userclientrc=$HOME/.xinitrc userclientrc=$HOME/.xinitrc
sysclientrc=XINITDIR/xinitrc sysclientrc=XINITDIR/xinitrc
@ -69,10 +69,10 @@ Index: xinit-1.3.4/startx.cpp
+XCOMM check for the first link +XCOMM check for the first link
+XCOMM +XCOMM
+ +
+if [ ! -L /usr/X11R6/bin/X -a ! -L /usr/bin/X ]; then +if [ ! -L /var/lib/X11/X -a ! -L /usr/bin/X ]; then
+ +
+ echo "" + echo ""
+ echo "There is no link /usr/X11R6/bin/X (/usr/bin/Xorg) to /var/X11R6/bin/X!" + echo "There is no link /usr/bin/X (/usr/bin/Xorg) to /var/lib/X11/X!"
+ echo "Please link the files as mentioned above or install the X-Server again." + echo "Please link the files as mentioned above or install the X-Server again."
+ echo "I'm aborting now." + echo "I'm aborting now."
+ exit 1 + exit 1
@ -82,12 +82,11 @@ Index: xinit-1.3.4/startx.cpp
+XCOMM check for the second link +XCOMM check for the second link
+XCOMM +XCOMM
+ +
+if [ ! -L /var/X11R6/bin/X ]; then +if [ ! -L /var/lib/X11/X ]; then
+ +
+ echo "" + echo ""
+ echo "There is no link /var/X11R6/bin/X to the correct X Server binary." + echo "There is no link /var/lib/X11/X to the correct X Server binary."
+ echo "Please configure the correct X Server with SaX/SaX2, which will create" + echo "I'm aborting now."
+ echo "the missing link. I'm aborting now."
+ exit 1 + exit 1
+fi +fi
+ +
@ -95,7 +94,7 @@ Index: xinit-1.3.4/startx.cpp
+XCOMM check if the Xorg file is an executable or an accidentally copied script or similar things +XCOMM check if the Xorg file is an executable or an accidentally copied script or similar things
+XCOMM +XCOMM
+ +
+if [ ! -x /var/X11R6/bin/X ]; then +if [ ! -x /var/lib/X11/X ]; then
+ +
+ echo "" + echo ""
+ echo "The file Xorg (binary of X-Server) doesn't seem to be a binary file." + echo "The file Xorg (binary of X-Server) doesn't seem to be a binary file."
@ -118,7 +117,7 @@ Index: xinit-1.3.4/startx.cpp
defaultclientargs="" defaultclientargs=""
defaultserverargs="" defaultserverargs=""
defaultdisplay=":0" defaultdisplay=":0"
@@ -300,6 +405,9 @@ EOF @@ -300,6 +404,9 @@ EOF
fi fi
done done
fi fi
@ -128,7 +127,7 @@ Index: xinit-1.3.4/startx.cpp
#if defined(__APPLE__) || defined(__CYGWIN__) #if defined(__APPLE__) || defined(__CYGWIN__)
eval XINIT \"$client\" $clientargs -- \"$server\" $display $serverargs eval XINIT \"$client\" $clientargs -- \"$server\" $display $serverargs
@@ -308,6 +416,12 @@ XINIT "$client" $clientargs -- "$server" @@ -308,6 +415,12 @@ XINIT "$client" $clientargs -- "$server"
#endif #endif
retval=$? retval=$?

2
xinit-tolerant-hostname-changes.patch
View File

@ -2,7 +2,7 @@ Index: xinit-1.3.4/startx.cpp
=================================================================== ===================================================================
--- xinit-1.3.4.orig/startx.cpp --- xinit-1.3.4.orig/startx.cpp
+++ xinit-1.3.4/startx.cpp +++ xinit-1.3.4/startx.cpp
@@ -408,6 +408,7 @@ fi @@ -407,6 +407,7 @@ fi
XCOMM handle TCP port 6000 XCOMM handle TCP port 6000
test "$DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN" != "yes" && \ test "$DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN" != "yes" && \
serverargs="$serverargs -nolisten tcp" serverargs="$serverargs -nolisten tcp"

8
xinit.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Jan 28 09:35:36 UTC 2015 - sndirsch@suse.com
- startx.cpp:
* /usr/X11R6/bin/X --> /usr/bin/X
* /var/X11R6/bin/X --> /var/lib/X11/X
- refreshed patches
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jan 23 17:07:35 UTC 2015 - sndirsch@suse.com Fri Jan 23 17:07:35 UTC 2015 - sndirsch@suse.com