summaryrefslogtreecommitdiff
authorJeremy Huddleston <jeremyhu@freedesktop.org>2009-09-27 06:41:45 (GMT)
committer Jeremy Huddleston <jeremyhu@freedesktop.org>2009-09-27 20:53:02 (GMT)
commit77099b933a0362d40a28f9afea46c5cc97c29e13 (patch) (side-by-side diff)
tree5a9dfcafa5e483f8caee6c17f519cf719215af79
parent7958f6b75b3c6b8a827188af2e684f181bdd7688 (diff)
downloadxserver-77099b933a0362d40a28f9afea46c5cc97c29e13.zip
xserver-77099b933a0362d40a28f9afea46c5cc97c29e13.tar.gz
XQuartz: Stop checking version numbers of the bundle because CFBundleGetVersionNumber is gimpish
(cherry picked from commit 9f5bdd89608ec12012592ff395b82e954fbb4da8)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--hw/xquartz/mach-startup/stub.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/hw/xquartz/mach-startup/stub.c b/hw/xquartz/mach-startup/stub.c
index 7a557bd..fd831a8 100644
--- a/hw/xquartz/mach-startup/stub.c
+++ b/hw/xquartz/mach-startup/stub.c
@@ -96,20 +96,6 @@ static void set_x11_path() {
exit(3);
}
- ver = CFBundleGetVersionNumber(bundle);
- if( !(ver >= 0x02308000 || (ver >= 0x02168000 && ver < 0x02208000))) {
- CFStringRef versionStr = CFBundleGetValueForInfoDictionaryKey(bundle, kCFBundleVersionKey);
- const char * versionCStr = "Unknown";
-
- if(versionStr)
- versionCStr = CFStringGetCStringPtr(versionStr, kCFStringEncodingMacRoman);
-
- 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 or 2.1.6\n", versionCStr, (unsigned)ver);
- exit(9);
- }
-
strlcat(x11_path, kX11AppBundlePath, sizeof(x11_path));
#ifdef DEBUG
fprintf(stderr, "Xquartz: X11.app = %s\n", x11_path);