frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XQuartz: Accept bundle version 2.1.6 to work with our startup method 

(cherry picked from commit 7f2966557374cb5ea22bc7b73d5ca04891eb5e78)
This commit is contained in:
Jeremy Huddleston 2009-02-03 09:58:51 -08:00
parent 43a1c91a3d
commit 6869efae74
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/xquartz/mach-startup/stub.c
View File

@ -101,7 +101,7 @@ static void set_x11_path() {
} }
ver = CFBundleGetVersionNumber(bundle); ver = CFBundleGetVersionNumber(bundle);
if(ver < 0x02308000) { if( !(ver >= 0x02308000 || (ver >= 0x02168000 && ver < 0x02208000))) {
CFStringRef versionStr = CFBundleGetValueForInfoDictionaryKey(bundle, kCFBundleVersionKey); CFStringRef versionStr = CFBundleGetValueForInfoDictionaryKey(bundle, kCFBundleVersionKey);
const char * versionCStr = "Unknown"; 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, "Xquartz: Could not find a new enough X11.app LSFindApplicationForInfo() returned\n");
fprintf(stderr, " X11.app = %s\n", x11_path); 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); exit(9);
} }