summaryrefslogtreecommitdiff
path: root/package/xinit/patches/patch-startx_cpp
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-12-13 19:07:23 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2010-12-13 19:07:23 +0100
commit009df92b965656fa1454dc8e90f0fd1848f7442a (patch)
tree99c287945dc332d0ac117be7b40f5a60eec4447b /package/xinit/patches/patch-startx_cpp
parentfa8f3ad16badb93d3f6343789ff23da905e610f0 (diff)
fix cross-compile on Darwin
Diffstat (limited to 'package/xinit/patches/patch-startx_cpp')
-rw-r--r--package/xinit/patches/patch-startx_cpp24
1 files changed, 22 insertions, 2 deletions
diff --git a/package/xinit/patches/patch-startx_cpp b/package/xinit/patches/patch-startx_cpp
index 911346c59..cf47ce9b4 100644
--- a/package/xinit/patches/patch-startx_cpp
+++ b/package/xinit/patches/patch-startx_cpp
@@ -1,6 +1,26 @@
--- xinit-1.2.1.orig/startx.cpp 2010-03-15 23:35:56.000000000 +0100
-+++ xinit-1.2.1/startx.cpp 2010-07-15 21:25:44.458413180 +0200
-@@ -347,5 +347,8 @@ screenrestore
++++ xinit-1.2.1/startx.cpp 2010-12-13 17:44:35.000000000 +0100
+@@ -242,18 +242,7 @@ if [ x"$enable_xauth" = x1 ] ; then
+ removelist=
+
+ XCOMM set up default Xauth info for this machine
+- case `uname` in
+- Linux*)
+- if [ -z "`hostname --version 2>&1 | grep GNU`" ]; then
+- hostname=`hostname -f`
+- else
+- hostname=`hostname`
+- fi
+- ;;
+- *)
+- hostname=`hostname`
+- ;;
+- esac
++ hostname=`hostname`
+
+ authdisplay=${display:-:0}
+ #if defined(HAS_COOKIE_MAKER) && defined(MK_COOKIE)
+@@ -347,5 +336,8 @@ screenrestore
kbd_mode -a
#endif