Diff
Modified: trunk/PerformanceTests/DecoderTest/Configurations/DebugRelease.xcconfig (286957 => 286958)
--- trunk/PerformanceTests/DecoderTest/Configurations/DebugRelease.xcconfig 2021-12-13 18:32:50 UTC (rev 286957)
+++ trunk/PerformanceTests/DecoderTest/Configurations/DebugRelease.xcconfig 2021-12-13 18:35:11 UTC (rev 286958)
@@ -28,27 +28,6 @@
_ONLY_ACTIVE_ARCH_ = YES;
-// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
-// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
-TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
-TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
-
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
-TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
-TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
-
-MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
-MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
-MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
-MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
-MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
-
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
Modified: trunk/PerformanceTests/MediaTime/Configurations/DebugRelease.xcconfig (286957 => 286958)
--- trunk/PerformanceTests/MediaTime/Configurations/DebugRelease.xcconfig 2021-12-13 18:32:50 UTC (rev 286957)
+++ trunk/PerformanceTests/MediaTime/Configurations/DebugRelease.xcconfig 2021-12-13 18:35:11 UTC (rev 286958)
@@ -26,27 +26,6 @@
ARCHS = $(ARCHS_STANDARD_32_64_BIT);
_ONLY_ACTIVE_ARCH_ = YES;
-// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
-// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
-TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
-TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
-
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
-TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
-TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
-
-MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
-MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
-MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
-MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
-MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
-
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
Modified: trunk/Source/_javascript_Core/ChangeLog (286957 => 286958)
--- trunk/Source/_javascript_Core/ChangeLog 2021-12-13 18:32:50 UTC (rev 286957)
+++ trunk/Source/_javascript_Core/ChangeLog 2021-12-13 18:35:11 UTC (rev 286958)
@@ -1,3 +1,12 @@
+2021-12-13 Elliott Williams <e...@apple.com>
+
+ Deployment target for macOS 11+ does not follow minor version bumps
+ https://bugs.webkit.org/show_bug.cgi?id=233906
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Configurations/DebugRelease.xcconfig:
+
2021-12-13 Adrian Perez de Castro <ape...@igalia.com>
Unreviewed build fix after r286936
Modified: trunk/Source/_javascript_Core/Configurations/DebugRelease.xcconfig (286957 => 286958)
--- trunk/Source/_javascript_Core/Configurations/DebugRelease.xcconfig 2021-12-13 18:32:50 UTC (rev 286957)
+++ trunk/Source/_javascript_Core/Configurations/DebugRelease.xcconfig 2021-12-13 18:35:11 UTC (rev 286958)
@@ -28,27 +28,6 @@
_ONLY_ACTIVE_ARCH_ = YES;
-// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
-// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
-TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
-TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
-
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
-TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
-TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
-
-MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
-MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
-MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
-MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
-MACOSX_DEPLOYMENT_TARGET_130000 = 13.0;
-
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
Modified: trunk/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig (286957 => 286958)
--- trunk/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig 2021-12-13 18:32:50 UTC (rev 286957)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig 2021-12-13 18:35:11 UTC (rev 286958)
@@ -5,27 +5,6 @@
_ONLY_ACTIVE_ARCH_ = YES;
-// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
-// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
-TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
-TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
-
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
-TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
-TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
-
-MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
-MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
-MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
-MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
-MACOSX_DEPLOYMENT_TARGET_130000 = 13.0;
-
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
Modified: trunk/Source/ThirdParty/gtest/xcode/Config/DebugProject.xcconfig (286957 => 286958)
--- trunk/Source/ThirdParty/gtest/xcode/Config/DebugProject.xcconfig 2021-12-13 18:32:50 UTC (rev 286957)
+++ trunk/Source/ThirdParty/gtest/xcode/Config/DebugProject.xcconfig 2021-12-13 18:35:11 UTC (rev 286958)
@@ -17,13 +17,6 @@
// Deployment postprocessing is what triggers Xcode to strip, turn it off
DEPLOYMENT_POSTPROCESSING = NO
-MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
-MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
-MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
-MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
-MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
-
// Dead code stripping off
DEAD_CODE_STRIPPING = NO
Modified: trunk/Source/ThirdParty/gtest/xcode/Config/ReleaseProject.xcconfig (286957 => 286958)
--- trunk/Source/ThirdParty/gtest/xcode/Config/ReleaseProject.xcconfig 2021-12-13 18:32:50 UTC (rev 286957)
+++ trunk/Source/ThirdParty/gtest/xcode/Config/ReleaseProject.xcconfig 2021-12-13 18:35:11 UTC (rev 286958)
@@ -19,13 +19,6 @@
// Deploment postprocessing is what triggers Xcode to strip
DEPLOYMENT_POSTPROCESSING = YES
-MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
-MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
-MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
-MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
-MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
-
// No symbols
GCC_GENERATE_DEBUGGING_SYMBOLS = NO
Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig (286957 => 286958)
--- trunk/Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig 2021-12-13 18:32:50 UTC (rev 286957)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig 2021-12-13 18:35:11 UTC (rev 286958)
@@ -29,27 +29,6 @@
_ONLY_ACTIVE_ARCH_ = YES;
-// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
-// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
-TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
-TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
-
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
-TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
-TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
-
-MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
-MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
-MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
-MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
-MACOSX_DEPLOYMENT_TARGET_130000 = 13.0;
-
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
Modified: trunk/Source/WTF/ChangeLog (286957 => 286958)
--- trunk/Source/WTF/ChangeLog 2021-12-13 18:32:50 UTC (rev 286957)
+++ trunk/Source/WTF/ChangeLog 2021-12-13 18:35:11 UTC (rev 286958)
@@ -1,3 +1,13 @@
+2021-12-13 Elliott Williams <e...@apple.com>
+
+ Deployment target for macOS 11+ does not follow minor version bumps
+ https://bugs.webkit.org/show_bug.cgi?id=233906
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Configurations/DebugRelease.xcconfig:
+ * wtf/PlatformHave.h: Add feature define which has been public since macOS 11.0
+
2021-12-11 Don Olmstead <don.olmst...@sony.com>
Add a std::nullptr_t constructor for RefPtr
Modified: trunk/Source/WTF/Configurations/DebugRelease.xcconfig (286957 => 286958)
--- trunk/Source/WTF/Configurations/DebugRelease.xcconfig 2021-12-13 18:32:50 UTC (rev 286957)
+++ trunk/Source/WTF/Configurations/DebugRelease.xcconfig 2021-12-13 18:35:11 UTC (rev 286958)
@@ -27,27 +27,6 @@
ARCHS = $(ARCHS_STANDARD_32_64_BIT);
_ONLY_ACTIVE_ARCH_ = YES;
-// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
-// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
-TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
-TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
-
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
-TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
-TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
-
-MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
-MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
-MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
-MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
-MACOSX_DEPLOYMENT_TARGET_130000 = 13.0;
-
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
Modified: trunk/Source/WTF/wtf/PlatformHave.h (286957 => 286958)
--- trunk/Source/WTF/wtf/PlatformHave.h 2021-12-13 18:32:50 UTC (rev 286957)
+++ trunk/Source/WTF/wtf/PlatformHave.h 2021-12-13 18:35:11 UTC (rev 286958)
@@ -633,6 +633,10 @@
#define HAVE_PASSKIT_INSTALLMENTS 1
#endif
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000) || PLATFORM(IOS)
+#define HAVE_PASSKIT_NEW_BUTTON_TYPES 1
+#endif
+
#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 120000) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000)
#define HAVE_PASSKIT_RECURRING_SUMMARY_ITEM 1
#define HAVE_PASSKIT_DEFERRED_SUMMARY_ITEM 1
Modified: trunk/Source/WebCore/ChangeLog (286957 => 286958)
--- trunk/Source/WebCore/ChangeLog 2021-12-13 18:32:50 UTC (rev 286957)
+++ trunk/Source/WebCore/ChangeLog 2021-12-13 18:35:11 UTC (rev 286958)
@@ -1,3 +1,31 @@
+2021-12-13 Elliott Williams <e...@apple.com>
+
+ Deployment target for macOS 11+ does not follow minor version bumps
+ https://bugs.webkit.org/show_bug.cgi?id=233906
+
+ Reviewed by Alexey Proskuryakov.
+
+ Changes the deployment target for macOS 11 and above to use the default SDK version, instead
+ of looking up a version using TARGET_MAC_OS_X_VERSION_MAJOR.
+
+ Prior to macOS 11, the deployment target did NOT change between minor versions (e.g.
+ "10.15" was the deployment target for all builds of 10.15.x). Now, minor releases may
+ change the deployment target, so we cannot rely solely on the MAC_OS_X_VERSION_MAJOR to
+ determine what deployment target to build for.
+
+ Since the deployment target may change within different versions of a major release,
+ TARGET_MAC_OS_X_VERSION_MAJOR is no longer useful for selecting a deployment target. It
+ should be considered read-only. To build for a non-default macOS version, set the
+ deployment target directly.
+
+ Reverts changes made in https://commits.webkit.org/230363@main, now that Xcode has been
+ fixed in rdar://problem/70185899.
+
+ * Configurations/DebugRelease.xcconfig:
+ * platform/graphics/cocoa/FontCacheCoreText.cpp:
+ (WebCore::variationAxes): Removes a defensive unguarded-availability pragma, now that the
+ underlying issue is fixed.
+
2021-12-13 Alan Bujtas <za...@apple.com>
[LFC][IFC] Display boxes have physical geometry.
Modified: trunk/Source/WebCore/Configurations/DebugRelease.xcconfig (286957 => 286958)
--- trunk/Source/WebCore/Configurations/DebugRelease.xcconfig 2021-12-13 18:32:50 UTC (rev 286957)
+++ trunk/Source/WebCore/Configurations/DebugRelease.xcconfig 2021-12-13 18:35:11 UTC (rev 286958)
@@ -28,27 +28,6 @@
_ONLY_ACTIVE_ARCH_ = YES;
-// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
-// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
-TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
-TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
-
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
-TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
-TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
-
-MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
-MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
-MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
-MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
-MACOSX_DEPLOYMENT_TARGET_130000 = 13.0;
-
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
Modified: trunk/Source/WebCore/PAL/Configurations/DebugRelease.xcconfig (286957 => 286958)
--- trunk/Source/WebCore/PAL/Configurations/DebugRelease.xcconfig 2021-12-13 18:32:50 UTC (rev 286957)
+++ trunk/Source/WebCore/PAL/Configurations/DebugRelease.xcconfig 2021-12-13 18:35:11 UTC (rev 286958)
@@ -28,27 +28,6 @@
_ONLY_ACTIVE_ARCH_ = YES;
-// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
-// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
-TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
-TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
-
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
-TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
-TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
-
-MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
-MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
-MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
-MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
-MACOSX_DEPLOYMENT_TARGET_130000 = 13.0;
-
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
Modified: trunk/Source/WebCore/PAL/pal/spi/cocoa/PassKitSPI.h (286957 => 286958)
--- trunk/Source/WebCore/PAL/pal/spi/cocoa/PassKitSPI.h 2021-12-13 18:32:50 UTC (rev 286957)
+++ trunk/Source/WebCore/PAL/pal/spi/cocoa/PassKitSPI.h 2021-12-13 18:35:11 UTC (rev 286958)
@@ -456,6 +456,14 @@
PKPaymentButtonTypeCheckout,
PKPaymentButtonTypeBook,
PKPaymentButtonTypeSubscribe,
+ PKPaymentButtonTypeReload,
+ PKPaymentButtonTypeAddMoney,
+ PKPaymentButtonTypeTopUp,
+ PKPaymentButtonTypeOrder,
+ PKPaymentButtonTypeRent,
+ PKPaymentButtonTypeSupport,
+ PKPaymentButtonTypeContribute,
+ PKPaymentButtonTypeTip,
};
#endif // !HAVE(PASSKIT_RECURRING_SUMMARY_ITEM)
Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp (286957 => 286958)
--- trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2021-12-13 18:32:50 UTC (rev 286957)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2021-12-13 18:35:11 UTC (rev 286958)
@@ -305,10 +305,7 @@
#if defined(HAVE_CTFontCopyVariationAxesInternal) // This macro is defined inside CoreText, not WebKit.
if (shouldLocalizeAxisNames == ShouldLocalizeAxisNames::Yes)
return adoptCF(CTFontCopyVariationAxes(font));
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunguarded-availability-new"
return adoptCF(CTFontCopyVariationAxesInternal(font));
-#pragma clang diagnostic pop
#else
UNUSED_PARAM(shouldLocalizeAxisNames);
return adoptCF(CTFontCopyVariationAxes(font));
Modified: trunk/Source/WebGPU/ChangeLog (286957 => 286958)
--- trunk/Source/WebGPU/ChangeLog 2021-12-13 18:32:50 UTC (rev 286957)
+++ trunk/Source/WebGPU/ChangeLog 2021-12-13 18:35:11 UTC (rev 286958)
@@ -1,3 +1,12 @@
+2021-12-13 Elliott Williams <e...@apple.com>
+
+ Deployment target for macOS 11+ does not follow minor version bumps
+ https://bugs.webkit.org/show_bug.cgi?id=233906
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Configurations/DebugRelease.xcconfig:
+
2021-12-10 Michael Saboff <msab...@apple.com>
https://bugs.webkit.org/show_bug.cgi?id=234173
Modified: trunk/Source/WebGPU/Configurations/DebugRelease.xcconfig (286957 => 286958)
--- trunk/Source/WebGPU/Configurations/DebugRelease.xcconfig 2021-12-13 18:32:50 UTC (rev 286957)
+++ trunk/Source/WebGPU/Configurations/DebugRelease.xcconfig 2021-12-13 18:35:11 UTC (rev 286958)
@@ -28,27 +28,6 @@
_ONLY_ACTIVE_ARCH_ = YES;
-// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
-// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
-TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
-TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
-
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
-TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
-TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
-
-MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
-MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
-MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
-MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
-MACOSX_DEPLOYMENT_TARGET_130000 = 13.0;
-
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
Modified: trunk/Source/WebInspectorUI/ChangeLog (286957 => 286958)
--- trunk/Source/WebInspectorUI/ChangeLog 2021-12-13 18:32:50 UTC (rev 286957)
+++ trunk/Source/WebInspectorUI/ChangeLog 2021-12-13 18:35:11 UTC (rev 286958)
@@ -1,3 +1,12 @@
+2021-12-13 Elliott Williams <e...@apple.com>
+
+ Deployment target for macOS 11+ does not follow minor version bumps
+ https://bugs.webkit.org/show_bug.cgi?id=233906
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Configurations/DebugRelease.xcconfig:
+
2021-12-10 Michael Saboff <msab...@apple.com>
https://bugs.webkit.org/show_bug.cgi?id=234173
Modified: trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig (286957 => 286958)
--- trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig 2021-12-13 18:32:50 UTC (rev 286957)
+++ trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig 2021-12-13 18:35:11 UTC (rev 286958)
@@ -5,27 +5,6 @@
_ONLY_ACTIVE_ARCH_ = YES;
-// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
-// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
-TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
-TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
-
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
-TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
-TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
-
-MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
-MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
-MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
-MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
-MACOSX_DEPLOYMENT_TARGET_130000 = 13.0;
-
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
Modified: trunk/Source/WebKit/ChangeLog (286957 => 286958)
--- trunk/Source/WebKit/ChangeLog 2021-12-13 18:32:50 UTC (rev 286957)
+++ trunk/Source/WebKit/ChangeLog 2021-12-13 18:35:11 UTC (rev 286958)
@@ -1,3 +1,12 @@
+2021-12-13 Elliott Williams <e...@apple.com>
+
+ Deployment target for macOS 11+ does not follow minor version bumps
+ https://bugs.webkit.org/show_bug.cgi?id=233906
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Configurations/DebugRelease.xcconfig:
+
2021-12-13 Joonghun Park <jh718.p...@samsung.com>
Unreviewed. Fix build error since r286946.
Modified: trunk/Source/WebKit/Configurations/DebugRelease.xcconfig (286957 => 286958)
--- trunk/Source/WebKit/Configurations/DebugRelease.xcconfig 2021-12-13 18:32:50 UTC (rev 286957)
+++ trunk/Source/WebKit/Configurations/DebugRelease.xcconfig 2021-12-13 18:35:11 UTC (rev 286958)
@@ -28,27 +28,6 @@
_ONLY_ACTIVE_ARCH_ = YES;
-// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
-// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
-TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
-TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
-
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
-TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
-TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
-
-MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
-MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
-MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
-MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
-MACOSX_DEPLOYMENT_TARGET_130000 = 13.0;
-
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
Modified: trunk/Source/WebKitLegacy/mac/Configurations/DebugRelease.xcconfig (286957 => 286958)
--- trunk/Source/WebKitLegacy/mac/Configurations/DebugRelease.xcconfig 2021-12-13 18:32:50 UTC (rev 286957)
+++ trunk/Source/WebKitLegacy/mac/Configurations/DebugRelease.xcconfig 2021-12-13 18:35:11 UTC (rev 286958)
@@ -28,27 +28,6 @@
_ONLY_ACTIVE_ARCH_ = YES;
-// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
-// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
-TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
-TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
-
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
-TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
-TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
-
-MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
-MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
-MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
-MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
-MACOSX_DEPLOYMENT_TARGET_130000 = 13.0;
-
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
Modified: trunk/Source/bmalloc/ChangeLog (286957 => 286958)
--- trunk/Source/bmalloc/ChangeLog 2021-12-13 18:32:50 UTC (rev 286957)
+++ trunk/Source/bmalloc/ChangeLog 2021-12-13 18:35:11 UTC (rev 286958)
@@ -1,3 +1,12 @@
+2021-12-13 Elliott Williams <e...@apple.com>
+
+ Deployment target for macOS 11+ does not follow minor version bumps
+ https://bugs.webkit.org/show_bug.cgi?id=233906
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Configurations/DebugRelease.xcconfig:
+
2021-12-12 Zan Dobersek <zdober...@igalia.com>
[libpas] make build.sh, test.sh, build_and_test.sh, and clean.sh work on Linux
Modified: trunk/Source/bmalloc/Configurations/DebugRelease.xcconfig (286957 => 286958)
--- trunk/Source/bmalloc/Configurations/DebugRelease.xcconfig 2021-12-13 18:32:50 UTC (rev 286957)
+++ trunk/Source/bmalloc/Configurations/DebugRelease.xcconfig 2021-12-13 18:35:11 UTC (rev 286958)
@@ -27,27 +27,6 @@
ARCHS = $(ARCHS_STANDARD_32_64_BIT);
_ONLY_ACTIVE_ARCH_ = YES;
-// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
-// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
-TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
-TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
-
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
-TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
-TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
-
-MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
-MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
-MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
-MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
-MACOSX_DEPLOYMENT_TARGET_130000 = 13.0;
-
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
Modified: trunk/Tools/ContentExtensionTester/Configurations/DebugRelease.xcconfig (286957 => 286958)
--- trunk/Tools/ContentExtensionTester/Configurations/DebugRelease.xcconfig 2021-12-13 18:32:50 UTC (rev 286957)
+++ trunk/Tools/ContentExtensionTester/Configurations/DebugRelease.xcconfig 2021-12-13 18:35:11 UTC (rev 286958)
@@ -25,27 +25,6 @@
_ONLY_ACTIVE_ARCH_ = YES;
-// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
-// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
-TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
-TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
-
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
-TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
-TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
-
-MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
-MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
-MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
-MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
-MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
-
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
Modified: trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig (286957 => 286958)
--- trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig 2021-12-13 18:32:50 UTC (rev 286957)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig 2021-12-13 18:35:11 UTC (rev 286958)
@@ -28,27 +28,6 @@
_ONLY_ACTIVE_ARCH_ = YES;
-// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
-// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
-TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
-TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
-
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
-TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
-TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
-
-MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
-MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
-MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
-MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
-MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
-
CODE_SIGN_IDENTITY[sdk=macosx*] = $(CODE_SIGN_IDENTITY_$(USE_INTERNAL_SDK));
CODE_SIGN_IDENTITY_ = $(CODE_SIGN_IDENTITY_NO);
CODE_SIGN_IDENTITY_NO = -;
Modified: trunk/Tools/ImageDiff/cg/Configurations/DebugRelease.xcconfig (286957 => 286958)
--- trunk/Tools/ImageDiff/cg/Configurations/DebugRelease.xcconfig 2021-12-13 18:32:50 UTC (rev 286957)
+++ trunk/Tools/ImageDiff/cg/Configurations/DebugRelease.xcconfig 2021-12-13 18:35:11 UTC (rev 286958)
@@ -27,27 +27,6 @@
_ONLY_ACTIVE_ARCH_ = YES;
-// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
-// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
-TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
-TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
-
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
-TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
-TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
-
-MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
-MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
-MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
-MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
-MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
-
SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK));
SDKROOT_ = macosx;
SDKROOT_YES = macosx.internal;
Modified: trunk/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig (286957 => 286958)
--- trunk/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig 2021-12-13 18:32:50 UTC (rev 286957)
+++ trunk/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig 2021-12-13 18:35:11 UTC (rev 286958)
@@ -28,27 +28,6 @@
_ONLY_ACTIVE_ARCH_ = YES;
-// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
-// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
-TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
-TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
-
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
-TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
-TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
-
-MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
-MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
-MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
-MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
-MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
-
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK));
Modified: trunk/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig (286957 => 286958)
--- trunk/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig 2021-12-13 18:32:50 UTC (rev 286957)
+++ trunk/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig 2021-12-13 18:35:11 UTC (rev 286958)
@@ -28,27 +28,6 @@
_ONLY_ACTIVE_ARCH_ = YES;
-// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
-// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
-TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
-TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
-
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
-TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
-TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
-
-MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
-MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
-MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
-MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
-MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
-
WEBKIT_UMBRELLA_FRAMEWORKS_DIR = $(BUILT_PRODUCTS_DIR);
SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK));
Modified: trunk/Tools/WebEditingTester/Configurations/DebugRelease.xcconfig (286957 => 286958)
--- trunk/Tools/WebEditingTester/Configurations/DebugRelease.xcconfig 2021-12-13 18:32:50 UTC (rev 286957)
+++ trunk/Tools/WebEditingTester/Configurations/DebugRelease.xcconfig 2021-12-13 18:35:11 UTC (rev 286958)
@@ -27,27 +27,6 @@
_ONLY_ACTIVE_ARCH_ = YES;
-// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
-// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
-TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
-TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
-
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
-TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
-TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
-
-MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
-MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
-MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
-MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
-MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
-
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK));
Modified: trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig (286957 => 286958)
--- trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig 2021-12-13 18:32:50 UTC (rev 286957)
+++ trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig 2021-12-13 18:35:11 UTC (rev 286958)
@@ -28,27 +28,6 @@
_ONLY_ACTIVE_ARCH_ = YES;
-// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
-// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
-TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
-TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
-
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
-TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
-TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
-
-MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
-MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
-MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
-MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
-MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
-
SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK));
SDKROOT_ = macosx;
SDKROOT_YES = macosx.internal;
Modified: trunk/Tools/lldb/lldbWebKitTester/Configurations/DebugRelease.xcconfig (286957 => 286958)
--- trunk/Tools/lldb/lldbWebKitTester/Configurations/DebugRelease.xcconfig 2021-12-13 18:32:50 UTC (rev 286957)
+++ trunk/Tools/lldb/lldbWebKitTester/Configurations/DebugRelease.xcconfig 2021-12-13 18:35:11 UTC (rev 286958)
@@ -25,27 +25,6 @@
_ONLY_ACTIVE_ARCH_ = YES;
-// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
-// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
-TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
-TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
-TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
-
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
-TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
-TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
-
-MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
-MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
-MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
-MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
-MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
-
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
