diff options
| author | Jeremy Huddleston <jeremy@yuffie.local> | 2009-02-03 09:58:51 -0800 |
|---|---|---|
| committer | Jeremy Huddleston <jeremy@yuffie.local> | 2009-02-03 10:04:18 -0800 |
| commit | 0d5dd1501af35d8edcea5672b4cc539ce1251975 (patch) | |
| tree | 00473e0774c93c6a8769df70426e687fff2f0cb6 | |
| parent | 0dbc356795bbab3889b5f1684f55bd193757d0c9 (diff) | |
XQuartz: Accept bundle version 2.1.6 to work with our startup method
(cherry picked from commit 7f2966557374cb5ea22bc7b73d5ca04891eb5e78)
| -rw-r--r-- | hw/xquartz/mach-startup/stub.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/xquartz/mach-startup/stub.c b/hw/xquartz/mach-startup/stub.c index 893d19c8d..7eb894c70 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); } |