xserver: Branch 'xorg-server-1.5-apple'
Jeremy Huddleston
jeremyhu at kemper.freedesktop.org
Tue Feb 3 10:04:04 PST 2009
hw/xquartz/mach-startup/stub.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 43a2df39685e76829ffe6183633bcb3d80fb118c
Author: Jeremy Huddleston <jeremy at yuffie.local>
Date: Tue Feb 3 09:58:51 2009 -0800
XQuartz: Accept bundle version 2.1.6 to work with our startup method
(cherry picked from commit 7f2966557374cb5ea22bc7b73d5ca04891eb5e78)
diff --git a/hw/xquartz/mach-startup/stub.c b/hw/xquartz/mach-startup/stub.c
index 893d19c..7eb894c 100644
--- a/hw/xquartz/mach-startup/stub.c
+++ b/hw/xquartz/mach-startup/stub.c
@@ -101,7 +101,7 @@ static void set_x11_path() {
}
ver = CFBundleGetVersionNumber(bundle);
- if(ver < 0x02308000) {
+ if( !(ver >= 0x02308000 || (ver >= 0x02168000 && ver < 0x02208000))) {
CFStringRef versionStr = CFBundleGetValueForInfoDictionaryKey(bundle, kCFBundleVersionKey);
const char * versionCStr = "Unknown";
@@ -110,7 +110,7 @@ static void set_x11_path() {
fprintf(stderr, "Xquartz: Could not find a new enough X11.app LSFindApplicationForInfo() returned\n");
fprintf(stderr, " X11.app = %s\n", x11_path);
- fprintf(stderr, " Version = %s (%x), Expected Version > 2.3.0\n", versionCStr, (unsigned)ver);
+ fprintf(stderr, " Version = %s (%x), Expected Version > 2.3.0 or 2.1.6\n", versionCStr, (unsigned)ver);
exit(9);
}
More information about the xorg-commit
mailing list