aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/052_nxcomp_macos10-nxauth-location.full+lite.patch
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-06-04 08:19:19 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-06-04 08:19:19 +0200
commitdd7b5eb3c1c868bd38b8af71ed1236fc03fd4d8c (patch)
tree828097b8b70516642931ee4760420db5efe0fd7c /debian/patches/052_nxcomp_macos10-nxauth-location.full+lite.patch
parente2e7008b3e4f7283b135a9fc2821a64386253ee0 (diff)
downloadnx-libs-dd7b5eb3c1c868bd38b8af71ed1236fc03fd4d8c.tar.gz
nx-libs-dd7b5eb3c1c868bd38b8af71ed1236fc03fd4d8c.tar.bz2
nx-libs-dd7b5eb3c1c868bd38b8af71ed1236fc03fd4d8c.zip
Add patch: 052_nxcomp_macos10-nxauth-location.full+lite.patch, change nxauth search location on Mac OS X to $NX_SYSTEM/nxauth to facilitate application bundle building.
Diffstat (limited to 'debian/patches/052_nxcomp_macos10-nxauth-location.full+lite.patch')
-rw-r--r--debian/patches/052_nxcomp_macos10-nxauth-location.full+lite.patch38
1 files changed, 38 insertions, 0 deletions
diff --git a/debian/patches/052_nxcomp_macos10-nxauth-location.full+lite.patch b/debian/patches/052_nxcomp_macos10-nxauth-location.full+lite.patch
new file mode 100644
index 000000000..4960c9d9e
--- /dev/null
+++ b/debian/patches/052_nxcomp_macos10-nxauth-location.full+lite.patch
@@ -0,0 +1,38 @@
+--- a/nxcomp/Auth.cpp
++++ b/nxcomp/Auth.cpp
+@@ -217,22 +217,31 @@
+
+ //
+ // Use the nxauth command on Windows and the Mac, xauth
+- // on all the other platforms. On Windows and on the Mac
+- // we assume that the nxauth command is located under
+- // bin in the client installation directory. On all the
++ // on all the other platforms. On Windows we assume that
++ // the nxauth command is located under bin in the client
++ // installation directory. On Mac OS X we assume that the
++ // command is located directly in the client installation
++ // directory, to make bundle shipping easier. On all the
+ // other platforms we use the default xauth command that
+ // is in our path.
+ //
+
+ char command[DEFAULT_STRING_LIMIT];
+
+- #if defined(__CYGWIN32__) || defined(__APPLE__)
++ #if defined(__CYGWIN32__)
+
+ snprintf(command, DEFAULT_STRING_LIMIT - 1,
+ "%s/bin/nxauth", control -> SystemPath);
+
+ *(command + DEFAULT_STRING_LIMIT - 1) = '\0';
+
++ #elif defined(__APPLE__)
++
++ snprintf(command, DEFAULT_STRING_LIMIT - 1,
++ "%s/nxauth", control -> SystemPath);
++
++ *(command + DEFAULT_STRING_LIMIT - 1) = '\0';
++
+ #else
+
+ strcpy(command, "xauth");