aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2014-10-18 23:04:25 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2014-10-18 23:05:49 +0200
commitb0727a02ff417b3983b10e02dbc1eb9a4878b2ac (patch)
tree8ba35779b729ab0a5de4f32b15d2fcbac3b8b12f /debian
parentefe4d1f73bfdf804b1a6683408483a9e795dba4d (diff)
downloadnx-libs-b0727a02ff417b3983b10e02dbc1eb9a4878b2ac.tar.gz
nx-libs-b0727a02ff417b3983b10e02dbc1eb9a4878b2ac.tar.bz2
nx-libs-b0727a02ff417b3983b10e02dbc1eb9a4878b2ac.zip
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.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
-rw-r--r--debian/patches/607_nxcomp_macosx-X11-launcher-in-private-tmp.full+lite.patch14
-rw-r--r--debian/patches/series1
3 files changed, 17 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index f0cc2d68f..f90efa2c3 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 000000000..535671fef
--- /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@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 7b068d1ce..806cb3d29 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