diff options
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/patches/052_nxcomp_macos10-nxauth-location.full+lite.patch | 38 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 45 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index de39c40c7..6cc85068e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,16 @@ nx-libs (2:3.5.0.14-0) UNRELEASED; urgency=low + [ Mike Gabriel ] * New upstream release of nxagent (3.5.0-9). * Adapt patch series (all hunks succeeded automatically). * Drop patch: 120_nxagent_libcairo-null-source-drawables.full.patch, the issue has been fixed by NoMachine (TR05J02703). + [ Mihai Moldovan ] + * 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. + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 11 May 2012 23:57:18 +0200 nx-libs (2:3.5.0.13-0) unstable; urgency=low 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"); diff --git a/debian/patches/series b/debian/patches/series index dc42d85ed..d772a0e6e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -26,6 +26,7 @@ 031_nx-X11_parallel-make.full.patch 032_no-x11r6.full.patch 051_nxcomp_macos105-fdisset.full+lite.patch +052_nxcomp_macos10-nxauth-location.full+lite.patch 101_nxagent_set-rgb-path.full.patch 102_xserver-xext_set-securitypolicy-path.full.patch 103_nxagent_set-X0-config-path.full.patch |