[X2Go-Commits] [nx-libs] 01/01: Add 607_nxcomp_macosx-X11-launcher-in-private-tmp.full+lite.patch. Fix check for launchd socket path in $DISPLAY on recent Mac OS X systems.

git-admin at x2go.org git-admin at x2go.org
Sat Oct 18 23:12:09 CEST 2014


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

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

commit b0727a02ff417b3983b10e02dbc1eb9a4878b2ac
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Oct 18 23:04:25 2014 +0200

    Add 607_nxcomp_macosx-X11-launcher-in-private-tmp.full+lite.patch. Fix check for launchd socket path in $DISPLAY on recent Mac OS X systems.
---
 debian/changelog                                   |    2 ++
 ...osx-X11-launcher-in-private-tmp.full+lite.patch |   14 ++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 17 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f0cc2d6..f90efa2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ nx-libs (2:3.5.0.28-0x2go1) UNRELEASED; urgency=medium
     (Fixes: #578).
   * Update 027_nxcomp_abstract-X11-socket.full+lite: Add patch header
     (Description: and Author: field).
+  * Add 607_nxcomp_macosx-X11-launcher-in-private-tmp.full+lite.patch. Fix check
+    for launchd socket path in $DISPLAY on recent Mac OS X systems.
   * debian/libnx-x11.postinst:
     + Don't use dpkg-architecture (bin:package dpkg-dev) in postinst script.
       Instead prep a libnx-x11.postinst script at build time. (Fixes:
diff --git a/debian/patches/607_nxcomp_macosx-X11-launcher-in-private-tmp.full+lite.patch b/debian/patches/607_nxcomp_macosx-X11-launcher-in-private-tmp.full+lite.patch
new file mode 100644
index 0000000..535671f
--- /dev/null
+++ b/debian/patches/607_nxcomp_macosx-X11-launcher-in-private-tmp.full+lite.patch
@@ -0,0 +1,14 @@
+Description: Detection for Mac OS X's launchd service on Mac OS X 10.10 and beyond
+Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+
+--- a/nxcomp/Loop.cpp
++++ b/nxcomp/Loop.cpp
+@@ -4183,7 +4183,7 @@
+ 
+   #ifdef __APPLE__
+ 
+-  if (strncasecmp(display, "/tmp/launch", 11) == 0)
++  if ((strncasecmp(display, "/tmp/launch", 11) == 0) || (strncasecmp(display, "/private/tmp/com.apple.launchd", 30) == 0))
+   {
+     #ifdef TEST
+     *logofs << "Loop: Using launchd service on socket '"
diff --git a/debian/patches/series b/debian/patches/series
index 7b068d1..806cb3d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -68,6 +68,7 @@
 604_nx-X11_recent-freetype-API.full.patch
 605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full.patch
 606_nx-X11_build-on-aarch64.full.patch
+607_nxcomp_macosx-X11-launcher-in-private-tmp.full+lite.patch
 990_fix-DEBUG-and-TEST-builds.full.patch
 999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch
 016_nx-X11_install-location.debian.patch

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


More information about the x2go-commits mailing list