From 9e60373e575f15d1b699d67e91e1e8a66b4097aa Mon Sep 17 00:00:00 2001 From: Charlie Fenton Date: Mon, 16 Dec 2013 03:19:48 -0800 Subject: [PATCH] Mac: Strictly enforce API compatibility with OS 10.5 when building BOINC Manager. --- clientgui/mac/MacAccessiblity.mm | 4 ++-- mac_build/boinc.xcodeproj/project.pbxproj | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/clientgui/mac/MacAccessiblity.mm b/clientgui/mac/MacAccessiblity.mm index 1b03599c20..51be1538ed 100644 --- a/clientgui/mac/MacAccessiblity.mm +++ b/clientgui/mac/MacAccessiblity.mm @@ -320,10 +320,10 @@ static void wxRectToNSRect(wxRect &wxr, NSRect &nsr) { } else if ([attribute isEqualToString:NSAccessibilityRoleDescriptionAttribute]) { return NSAccessibilityRoleDescription(NSAccessibilityStaticTextRole, - (isHeader && !isEventLog) ? NSAccessibilitySortButtonSubrole : nil); + (isHeader && !isEventLog) ? NSAccessibilitySortButtonRole : nil); } else if ([attribute isEqualToString:NSAccessibilitySubroleAttribute]) { - return NSAccessibilitySortButtonSubrole; + return NSAccessibilitySortButtonRole; } else if ([attribute isEqualToString:NSAccessibilitySortDirectionAttribute]) { if (col == BOINCView->m_iSortColumn) { diff --git a/mac_build/boinc.xcodeproj/project.pbxproj b/mac_build/boinc.xcodeproj/project.pbxproj index 3eb1482104..1ee3e073da 100755 --- a/mac_build/boinc.xcodeproj/project.pbxproj +++ b/mac_build/boinc.xcodeproj/project.pbxproj @@ -183,7 +183,6 @@ DD531BC60C193D3800742E50 /* MacInstaller.icns in Resources */ = {isa = PBXBuildFile; fileRef = DD531BC50C193D3800742E50 /* MacInstaller.icns */; }; DD531BC80C193D5200742E50 /* MacUninstaller.icns in Resources */ = {isa = PBXBuildFile; fileRef = DD531BC70C193D5200742E50 /* MacUninstaller.icns */; }; DD5BF77D0D4F3D0C00EDF980 /* mac_icon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD6381450870DB78007A2F8E /* mac_icon.cpp */; }; - DD5FDE85185F165000D997CB /* MacNotification.mm in Sources */ = {isa = PBXBuildFile; fileRef = DD5FDE84185F165000D997CB /* MacNotification.mm */; }; DD5FE1B517828887003339DF /* translate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDF9350F176B0D0C00A2793C /* translate.cpp */; }; DD6381F90870DD83007A2F8E /* make_app_icon_h.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD6381F80870DD83007A2F8E /* make_app_icon_h.cpp */; }; DD6617880A3FFD8C00FFEBEB /* check_security.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD6617870A3FFD8C00FFEBEB /* check_security.cpp */; }; @@ -357,6 +356,7 @@ DDAEB54012F8295800EDEDBE /* LogBOINC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD81C41407C5D13E0098A04D /* LogBOINC.cpp */; }; DDAEC9FF07FA5A5C00A7BC36 /* SetVersion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDAEC9E707FA58A000A7BC36 /* SetVersion.cpp */; }; DDB219B210B3BBA900417AEF /* WaitPermissions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDB219B110B3BBA900417AEF /* WaitPermissions.cpp */; }; + DDB295C9185B0DBD00B9F842 /* MacNotification.mm in Sources */ = {isa = PBXBuildFile; fileRef = DDB295C8185B0DBD00B9F842 /* MacNotification.mm */; }; DDB4A91E1411840800032E5D /* proc_control.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDB4A91C1411840800032E5D /* proc_control.cpp */; }; DDB4A91F1411840800032E5D /* proc_control.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDB4A91C1411840800032E5D /* proc_control.cpp */; }; DDB4A9201411871200032E5D /* proc_control.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDB4A91C1411840800032E5D /* proc_control.cpp */; }; @@ -890,7 +890,6 @@ DD58C46A08F334EA00C1DF66 /* wizardex.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = wizardex.h; path = ../clientgui/wizardex.h; sourceTree = SOURCE_ROOT; }; DD5EF07007C5B329007CCE8D /* whetstone.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = whetstone.cpp; sourceTree = ""; }; DD5EF08807C5B7C7007CCE8D /* version.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = version.h; path = ../version.h; sourceTree = SOURCE_ROOT; }; - DD5FDE84185F165000D997CB /* MacNotification.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = MacNotification.mm; path = ../clientgui/mac/MacNotification.mm; sourceTree = ""; }; DD6381450870DB78007A2F8E /* mac_icon.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = mac_icon.cpp; sourceTree = ""; }; DD6381EA0870DC9D007A2F8E /* MakeAppIcon_h */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = MakeAppIcon_h; sourceTree = BUILT_PRODUCTS_DIR; }; DD6381F80870DD83007A2F8E /* make_app_icon_h.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = make_app_icon_h.cpp; sourceTree = ""; }; @@ -1081,6 +1080,7 @@ DDB219A410B3BB6100417AEF /* WaitPermissions.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = WaitPermissions.app; sourceTree = BUILT_PRODUCTS_DIR; }; DDB219A610B3BB6200417AEF /* WaitPermissions-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "WaitPermissions-Info.plist"; sourceTree = ""; }; DDB219B110B3BBA900417AEF /* WaitPermissions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WaitPermissions.cpp; path = ../mac_installer/WaitPermissions.cpp; sourceTree = SOURCE_ROOT; }; + DDB295C8185B0DBD00B9F842 /* MacNotification.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = MacNotification.mm; path = ../clientgui/mac/MacNotification.mm; sourceTree = ""; }; DDB4A91C1411840800032E5D /* proc_control.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = proc_control.cpp; sourceTree = ""; }; DDB4A91D1411840800032E5D /* proc_control.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = proc_control.h; sourceTree = ""; }; DDB506F80958446900181B75 /* ProxyInfoPage.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = ProxyInfoPage.cpp; path = ../clientgui/ProxyInfoPage.cpp; sourceTree = SOURCE_ROOT; }; @@ -1986,8 +1986,8 @@ DD1907FA17D1A2F100596F03 /* MacAccessiblity.mm */, DD77A71612F2D1C9006B82E9 /* MacBitmapComboBox.cpp */, DD77A71712F2D1C9006B82E9 /* MacBitmapComboBox.h */, - DD5FDE84185F165000D997CB /* MacNotification.mm */, DDA9D3BB09189A8C0060E7A7 /* Mac_GUI.cpp */, + DDB295C8185B0DBD00B9F842 /* MacNotification.mm */, DDA12AAD0A369C5800FBDD12 /* SecurityUtility.cpp */, DD7748B40A356D6C0025D05E /* SetupSecurity.cpp */, DDA12A910A369AB500FBDD12 /* SetupSecurity.h */, @@ -2895,6 +2895,7 @@ DDC321AE12E45162006CB55F /* sg_PanelBase.cpp in Sources */, DDDD6D8012E4611300C258A0 /* sg_ProjectPanel.cpp in Sources */, DD7A5D8312EEBE5E0006268E /* sg_TaskCommandPopup.cpp in Sources */, + DDB295C9185B0DBD00B9F842 /* MacNotification.mm in Sources */, DD7A5D9F12EEBFC20006268E /* sg_ProjectWebSitesPopup.cpp in Sources */, DD7A5DAB12EEC37B0006268E /* sg_ProjectCommandPopup.cpp in Sources */, DD77A71812F2D1C9006B82E9 /* MacBitmapComboBox.cpp in Sources */, @@ -2906,7 +2907,6 @@ DD262C781366D2A200C9A187 /* cc_config.cpp in Sources */, DD11E5B617D1A89700947975 /* MacAccessiblity.mm in Sources */, DD76BF9817CB465E0075936D /* opencl_boinc.cpp in Sources */, - DD5FDE85185F165000D997CB /* MacNotification.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3547,7 +3547,7 @@ "\"$(SRCROOT)/../../wxWidgets-3.0.0/build/osx/build/Debug\"", "../../sqlite-autoconf-3071401/.libs/", ); - MACOSX_DEPLOYMENT_TARGET = 10.4; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_CFLAGS = ( "-DHAVE_CONFIG_H", "-D_FILE_OFFSET_BITS=64", @@ -3559,6 +3559,7 @@ "-DSANDBOX", "-D_DEBUG", "-DHAVE_STRCASECMP_IN_STRING_H", + "-DMAC_OS_X_VERSION_MAX_ALLOWED=1050", ); OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)"; OTHER_LDFLAGS = ( @@ -3569,7 +3570,6 @@ "-lm", ); PRODUCT_NAME = BOINCManager; - SDKROOT = macosx; SKIP_INSTALL = YES; STRIP_INSTALLED_PRODUCT = NO; WARNING_CFLAGS = ( @@ -3603,7 +3603,7 @@ "\"$(SRCROOT)/../../wxWidgets-3.0.0/build/osx/build/Release\"", "../../sqlite-autoconf-3071401/.libs/", ); - MACOSX_DEPLOYMENT_TARGET = 10.4; + MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_CFLAGS = ( "-DHAVE_CONFIG_H", "-D_FILE_OFFSET_BITS=64", @@ -3616,6 +3616,7 @@ "-DNDEBUG", "-DHAVE_STRCASECMP_IN_STRING_H", "-DBUILDING_MANAGER", + "-DMAC_OS_X_VERSION_MAX_ALLOWED=1050", ); OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)"; OTHER_LDFLAGS = ( @@ -3626,7 +3627,6 @@ "-lm", ); PRODUCT_NAME = BOINCManager; - SDKROOT = macosx; SKIP_INSTALL = YES; STRIP_INSTALLED_PRODUCT = NO; WARNING_CFLAGS = ( @@ -3988,7 +3988,7 @@ ../clientgui/mac/config.h, ); PREBINDING = NO; - SDKROOT = ""; + SDKROOT = macosx; SKIP_INSTALL = YES; STRINGS_FILE_OUTPUT_ENCODING = "UTF-8"; STRIP_INSTALLED_PRODUCT = YES; @@ -4156,7 +4156,7 @@ ../clientgui/mac/config.h, ); PREBINDING = NO; - SDKROOT = ""; + SDKROOT = macosx; SKIP_INSTALL = YES; STRINGS_FILE_OUTPUT_ENCODING = "UTF-8"; STRIP_INSTALLED_PRODUCT = NO;