aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/patches/607_nxcomp_macosx-X11-launcher-in-private-tmp.full+lite.patch14
-rw-r--r--debian/patches/series1
-rw-r--r--nxcomp/Loop.cpp2
3 files changed, 1 insertions, 16 deletions
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
deleted file mode 100644
index 535671fef..000000000
--- a/debian/patches/607_nxcomp_macosx-X11-launcher-in-private-tmp.full+lite.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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 e975e3cac..0c9d34366 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
#401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch
-607_nxcomp_macosx-X11-launcher-in-private-tmp.full+lite.patch
990_fix-DEBUG-and-TEST-builds.full.patch
991_fix-hr-typos.full+lite.patch
991_fix-hr-typos.full.patch
diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index c8c95bd72..7bc154f36 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -4183,7 +4183,7 @@ int SetupDisplaySocket(int &xServerAddrFamily, sockaddr *&xServerAddr,
#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 '"