[X2Go-Commits] [nx-libs] 11/14: Detection for Mac OS X's launchd service on Mac OS X 10.10 and beyond (607_nxcomp_macosx-X11-launcher-in-private-tmp.full+lite.patch).

git-admin at x2go.org git-admin at x2go.org
Fri Feb 13 13:59:13 CET 2015


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

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

commit a8fb7d4f5149e28216ffd38838af1cbfd6527002
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Feb 13 13:38:39 2015 +0100

    Detection for Mac OS X's launchd service on Mac OS X 10.10 and beyond (607_nxcomp_macosx-X11-launcher-in-private-tmp.full+lite.patch).
---
 ...osx-X11-launcher-in-private-tmp.full+lite.patch |   14 --------------
 debian/patches/series                              |    1 -
 nxcomp/Loop.cpp                                    |    2 +-
 3 files changed, 1 insertion(+), 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 535671f..0000000
--- 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 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 e975e3c..0c9d343 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 c8c95bd..7bc154f 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 '"

--
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