[X2Go-Commits] [nx-libs] 25/29: Fix nxauth location on Mac OS X 10 (052_nxcomp_macos10-nxauth-location.full+lite.patch)

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit e736fff09871bbbc6101f3da444afbccd473a915
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Feb 9 15:45:33 2015 +0100

    Fix nxauth location on Mac OS X 10 (052_nxcomp_macos10-nxauth-location.full+lite.patch)
---
 ..._nxcomp_macos10-nxauth-location.full+lite.patch |   41 --------------------
 debian/patches/series                              |    1 -
 nxcomp/Auth.cpp                                    |   17 ++++++--
 3 files changed, 13 insertions(+), 46 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
deleted file mode 100644
index 813363e..0000000
--- a/debian/patches/052_nxcomp_macos10-nxauth-location.full+lite.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Description: Fix nxauth location on Mac OS X 10
-Author: Mihai Moldovan <ionic at ionic.de>
-
---- 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");
diff --git a/debian/patches/series b/debian/patches/series
index 214bf6a..138d87a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-052_nxcomp_macos10-nxauth-location.full+lite.patch
 053_nx-X11_no-xcomp1-install-target.full.patch
 054_nx-X11_ppc64-ftbfs.full.patch
 055_nx-X11_imake-Werror-format-security.full.patch
diff --git a/nxcomp/Auth.cpp b/nxcomp/Auth.cpp
index d8e9991..c52392a 100644
--- a/nxcomp/Auth.cpp
+++ b/nxcomp/Auth.cpp
@@ -217,22 +217,31 @@ int Auth::getCookie()
 
   //
   // 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");

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git