diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-02-14 16:23:43 +0100 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-02-14 16:23:43 +0100 |
commit | 09d2732b4e299eaa06c64b7a683529e337691c59 (patch) | |
tree | 3a07c4a95980c0f34b1d3ce2f55388dd7677c685 /debian/patches/0052_nxcomp_macos10-nxauth-location.full+lite.patch | |
parent | 8c98a401b49506f969dc9263d9bd566e5b31a572 (diff) | |
download | nx-libs-09d2732b4e299eaa06c64b7a683529e337691c59.tar.gz nx-libs-09d2732b4e299eaa06c64b7a683529e337691c59.tar.bz2 nx-libs-09d2732b4e299eaa06c64b7a683529e337691c59.zip |
Patch system: Prepend a "0" to every patch file name in debian/patches/. Adapt only this changelog stanza to this modification.
Diffstat (limited to 'debian/patches/0052_nxcomp_macos10-nxauth-location.full+lite.patch')
-rw-r--r-- | debian/patches/0052_nxcomp_macos10-nxauth-location.full+lite.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/debian/patches/0052_nxcomp_macos10-nxauth-location.full+lite.patch b/debian/patches/0052_nxcomp_macos10-nxauth-location.full+lite.patch new file mode 100644 index 000000000..813363e69 --- /dev/null +++ b/debian/patches/0052_nxcomp_macos10-nxauth-location.full+lite.patch @@ -0,0 +1,41 @@ +Description: Fix nxauth location on Mac OS X 10 +Author: Mihai Moldovan <ionic@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"); |