xserver: Branch 'master' - 2 commits

[Jeremy Huddleston]

 configure.ac                   |    3 ++-
 hw/xquartz/mach-startup/stub.c |    8 ++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit ca64b5949d229a60a3c62b6d29d51873b7694bd6
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Fri Nov 21 11:20:31 2008 -0800

    XQuartz: Don't use LS to find X11.app on Tiger.
    (cherry picked from commit e62107e55261ef252a2a24dd26a60e5dd295d560)

diff --git a/hw/xquartz/mach-startup/stub.c b/hw/xquartz/mach-startup/stub.c
index a011c4e..bc4f7ec 100644
--- a/hw/xquartz/mach-startup/stub.c
+++ b/hw/xquartz/mach-startup/stub.c
@@ -50,6 +50,8 @@
 
 #include <signal.h>
 
+#include <AvailabilityMacros.h>
+
 #include "launchd_fd.h"
 
 #ifndef BUILD_DATE
@@ -66,6 +68,8 @@ static char x11_path[PATH_MAX + 1];
 static pid_t x11app_pid = 0;
 
 static void set_x11_path() {
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
+
     CFURLRef appURL = NULL;
     CFBundleRef bundle = NULL;
     OSStatus osstatus = LSFindApplicationForInfo(kLSUnknownCreator, CFSTR(kX11AppBundleId), nil, nil, &appURL);
@@ -117,6 +121,10 @@ static void set_x11_path() {
                     kX11AppBundleId, (int)osstatus);
             exit(11);
     }
+#else
+    /* TODO: Make Tiger smarter... but TBH, this should never get called on Tiger... */
+    strlcpy(x11_path, "/Applications/Utilities/X11.app/Contents/MacOS/X11", sizeof(x11_path));
+#endif
 }
 
 static int connect_to_socket(const char *filename) {
commit 701f8e3a94d2b659ebcfffd09acd1d66f9e797b8
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Fri Nov 21 11:08:00 2008 -0800

    XQuartz: Update applewm deps
    (cherry picked from commit 0ad91c59be8759a9c9e9d4f639056d8c689a3bc5)

diff --git a/configure.ac b/configure.ac
index 2cdce2f..d557b70 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1543,7 +1543,8 @@ if test "x$XQUARTZ" = xyes; then
 
 	CFLAGS="${CFLAGS} -DROOTLESS_WORKAROUND -DNO_ALLOCA"
 
-	PKG_CHECK_MODULES(APPLEWM, [applewmproto >= 1.1.1])
+	PKG_CHECK_MODULES(APPLEWMPROTO, [applewmproto >= 1.1.1])
+	PKG_CHECK_MODULES(APPLEWM, [applewm >= 1.0.0])
 
 	if test "x$STANDALONE_XPBPROXY" = xyes ; then
 		AC_DEFINE(STANDALONE_XPBPROXY,1,[Build a standalone xpbproxy])