From 69bbebc9b2a20b62a7b4852e0536e889298773a38f2b9a576fea1c10b1271934 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Wed, 28 Jan 2015 09:39:14 +0000
Subject: [PATCH] - 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/package/show/X11:XOrg/xinit?expand=0&rev=23
---
 xinit-suse.patch                      | 19 +++++++++----------
 xinit-tolerant-hostname-changes.patch |  2 +-
 xinit.changes                         |  8 ++++++++
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/xinit-suse.patch b/xinit-suse.patch
index e74b2f5..49b32fd 100644
--- a/xinit-suse.patch
+++ b/xinit-suse.patch
@@ -2,7 +2,7 @@ Index: xinit-1.3.4/startx.cpp
 ===================================================================
 --- xinit-1.3.4.orig/startx.cpp
 +++ xinit-1.3.4/startx.cpp
-@@ -50,10 +50,115 @@ export PATH
+@@ -50,10 +50,114 @@ export PATH
  userclientrc=$HOME/.xinitrc
  sysclientrc=XINITDIR/xinitrc
  
@@ -69,10 +69,10 @@ Index: xinit-1.3.4/startx.cpp
 +XCOMM check for the first link
 +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 "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 "I'm aborting now."
 +       exit 1
@@ -82,12 +82,11 @@ Index: xinit-1.3.4/startx.cpp
 +XCOMM check for the second link
 +XCOMM
 +
-+if [ ! -L /var/X11R6/bin/X ]; then
++if [ ! -L /var/lib/X11/X ]; then
 +
 +       echo ""
-+       echo "There is no link /var/X11R6/bin/X to the correct X Server binary."
-+       echo "Please configure the correct X Server with SaX/SaX2, which will create"
-+       echo "the missing link. I'm aborting now."
++       echo "There is no link /var/lib/X11/X to the correct X Server binary."
++       echo "I'm aborting now."
 +       exit 1
 +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
 +
-+if [ ! -x /var/X11R6/bin/X ]; then
++if [ ! -x /var/lib/X11/X ]; then
 +
 +       echo ""
 +       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=""
  defaultserverargs=""
  defaultdisplay=":0"
-@@ -300,6 +405,9 @@ EOF
+@@ -300,6 +404,9 @@ EOF
          fi
      done
  fi
@@ -128,7 +127,7 @@ Index: xinit-1.3.4/startx.cpp
  
  #if defined(__APPLE__) || defined(__CYGWIN__)
  eval XINIT \"$client\" $clientargs -- \"$server\" $display $serverargs
-@@ -308,6 +416,12 @@ XINIT "$client" $clientargs -- "$server"
+@@ -308,6 +415,12 @@ XINIT "$client" $clientargs -- "$server"
  #endif
  retval=$?
  
diff --git a/xinit-tolerant-hostname-changes.patch b/xinit-tolerant-hostname-changes.patch
index ce674e4..1e2e636 100644
--- a/xinit-tolerant-hostname-changes.patch
+++ b/xinit-tolerant-hostname-changes.patch
@@ -2,7 +2,7 @@ Index: xinit-1.3.4/startx.cpp
 ===================================================================
 --- xinit-1.3.4.orig/startx.cpp
 +++ xinit-1.3.4/startx.cpp
-@@ -408,6 +408,7 @@ fi
+@@ -407,6 +407,7 @@ fi
  XCOMM handle TCP port 6000
  test "$DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN" != "yes" && \
    serverargs="$serverargs -nolisten tcp"
diff --git a/xinit.changes b/xinit.changes
index e433fe4..387b341 100644
--- a/xinit.changes
+++ b/xinit.changes
@@ -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