[webkit-changes] [268339] branches/safari-611.1.3-branch/Source

Sun, 11 Oct 2020 19:22:51 -0700

Title: [268339] branches/safari-611.1.3-branch/Source
Revision
268339
Author
kocsen_ch...@apple.com
Date
2020-10-11 19:21:21 -0700 (Sun, 11 Oct 2020)

Log Message

Cherry-pick r268330. rdar://problem/70188497

    Strip patch version from TARGET_MAC_OS_X_VERSION_MAJOR when building for macOS Big Sur
    or later
    https://bugs.webkit.org/show_bug.cgi?id=217594
    rdar://70188497

    Patch by Luming Yin <luming_...@apple.com> on 2020-10-11
    Reviewed by Darin Adler.

    To ensure successful Mac Catalyst WebKit builds, strip the patch version from
    TARGET_MAC_OS_X_VERSION_MAJOR by using two `base:`s on MACOSX_DEPLOYMENT_TARGET.

    * Configurations/Base.xcconfig:

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@268330 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

Diff

Modified: branches/safari-611.1.3-branch/Source/_javascript_Core/ChangeLog (268338 => 268339)


--- branches/safari-611.1.3-branch/Source/_javascript_Core/ChangeLog	2020-10-12 02:21:13 UTC (rev 268338)
+++ branches/safari-611.1.3-branch/Source/_javascript_Core/ChangeLog	2020-10-12 02:21:21 UTC (rev 268339)
@@ -1,5 +1,38 @@
 2020-10-11  Kocsen Chung  <kocsen_ch...@apple.com>
 
+        Cherry-pick r268330. rdar://problem/70188497
+
+    Strip patch version from TARGET_MAC_OS_X_VERSION_MAJOR when building for macOS Big Sur
+    or later
+    https://bugs.webkit.org/show_bug.cgi?id=217594
+    rdar://70188497
+    
+    Patch by Luming Yin <luming_...@apple.com> on 2020-10-11
+    Reviewed by Darin Adler.
+    
+    To ensure successful Mac Catalyst WebKit builds, strip the patch version from
+    TARGET_MAC_OS_X_VERSION_MAJOR by using two `base:`s on MACOSX_DEPLOYMENT_TARGET.
+    
+    * Configurations/Base.xcconfig:
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@268330 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-10-11  Luming Yin  <luming_...@apple.com>
+
+            Strip patch version from TARGET_MAC_OS_X_VERSION_MAJOR when building for macOS Big Sur
+            or later
+            https://bugs.webkit.org/show_bug.cgi?id=217594
+            rdar://70188497
+
+            Reviewed by Darin Adler.
+
+            To ensure successful Mac Catalyst WebKit builds, strip the patch version from
+            TARGET_MAC_OS_X_VERSION_MAJOR by using two `base:`s on MACOSX_DEPLOYMENT_TARGET.
+
+            * Configurations/Base.xcconfig:
+
+2020-10-11  Kocsen Chung  <kocsen_ch...@apple.com>
+
         Cherry-pick r268327. rdar://problem/70168426
 
     Ignore deployment suffix and identifier when computing major OS version for macOS

Modified: branches/safari-611.1.3-branch/Source/_javascript_Core/Configurations/Base.xcconfig (268338 => 268339)


--- branches/safari-611.1.3-branch/Source/_javascript_Core/Configurations/Base.xcconfig	2020-10-12 02:21:13 UTC (rev 268338)
+++ branches/safari-611.1.3-branch/Source/_javascript_Core/Configurations/Base.xcconfig	2020-10-12 02:21:21 UTC (rev 268339)
@@ -106,7 +106,7 @@
 TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_10 = 10$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier)
 
 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_LEGACY_VERSION_IDENTIFIER))
-TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MACOSX_DEPLOYMENT_TARGET:base)0000
+TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MACOSX_DEPLOYMENT_TARGET:base:base)0000
 TARGET_MAC_OS_X_VERSION_MAJOR_10_13 = 101300
 TARGET_MAC_OS_X_VERSION_MAJOR_10_14 = 101400
 TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500

Modified: branches/safari-611.1.3-branch/Source/ThirdParty/ANGLE/ChangeLog (268338 => 268339)


--- branches/safari-611.1.3-branch/Source/ThirdParty/ANGLE/ChangeLog	2020-10-12 02:21:13 UTC (rev 268338)
+++ branches/safari-611.1.3-branch/Source/ThirdParty/ANGLE/ChangeLog	2020-10-12 02:21:21 UTC (rev 268339)
@@ -1,5 +1,38 @@
 2020-10-11  Kocsen Chung  <kocsen_ch...@apple.com>
 
+        Cherry-pick r268330. rdar://problem/70188497
+
+    Strip patch version from TARGET_MAC_OS_X_VERSION_MAJOR when building for macOS Big Sur
+    or later
+    https://bugs.webkit.org/show_bug.cgi?id=217594
+    rdar://70188497
+    
+    Patch by Luming Yin <luming_...@apple.com> on 2020-10-11
+    Reviewed by Darin Adler.
+    
+    To ensure successful Mac Catalyst WebKit builds, strip the patch version from
+    TARGET_MAC_OS_X_VERSION_MAJOR by using two `base:`s on MACOSX_DEPLOYMENT_TARGET.
+    
+    * Configurations/Base.xcconfig:
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@268330 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-10-11  Luming Yin  <luming_...@apple.com>
+
+            Strip patch version from TARGET_MAC_OS_X_VERSION_MAJOR when building for macOS Big Sur
+            or later
+            https://bugs.webkit.org/show_bug.cgi?id=217594
+            rdar://70188497
+
+            Reviewed by Darin Adler.
+
+            To ensure successful Mac Catalyst WebKit builds, strip the patch version from
+            TARGET_MAC_OS_X_VERSION_MAJOR by using two `base:`s on MACOSX_DEPLOYMENT_TARGET.
+
+            * Configurations/Base.xcconfig:
+
+2020-10-11  Kocsen Chung  <kocsen_ch...@apple.com>
+
         Cherry-pick r268327. rdar://problem/70168426
 
     Ignore deployment suffix and identifier when computing major OS version for macOS

Modified: branches/safari-611.1.3-branch/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig (268338 => 268339)


--- branches/safari-611.1.3-branch/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig	2020-10-12 02:21:13 UTC (rev 268338)
+++ branches/safari-611.1.3-branch/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig	2020-10-12 02:21:21 UTC (rev 268339)
@@ -73,7 +73,7 @@
 TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_10 = 10$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier)
 
 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_LEGACY_VERSION_IDENTIFIER))
-TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MACOSX_DEPLOYMENT_TARGET:base)0000
+TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MACOSX_DEPLOYMENT_TARGET:base:base)0000
 TARGET_MAC_OS_X_VERSION_MAJOR_10_13 = 101300
 TARGET_MAC_OS_X_VERSION_MAJOR_10_14 = 101400
 TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500

Modified: branches/safari-611.1.3-branch/Source/ThirdParty/libwebrtc/ChangeLog (268338 => 268339)


--- branches/safari-611.1.3-branch/Source/ThirdParty/libwebrtc/ChangeLog	2020-10-12 02:21:13 UTC (rev 268338)
+++ branches/safari-611.1.3-branch/Source/ThirdParty/libwebrtc/ChangeLog	2020-10-12 02:21:21 UTC (rev 268339)
@@ -1,5 +1,38 @@
 2020-10-11  Kocsen Chung  <kocsen_ch...@apple.com>
 
+        Cherry-pick r268330. rdar://problem/70188497
+
+    Strip patch version from TARGET_MAC_OS_X_VERSION_MAJOR when building for macOS Big Sur
+    or later
+    https://bugs.webkit.org/show_bug.cgi?id=217594
+    rdar://70188497
+    
+    Patch by Luming Yin <luming_...@apple.com> on 2020-10-11
+    Reviewed by Darin Adler.
+    
+    To ensure successful Mac Catalyst WebKit builds, strip the patch version from
+    TARGET_MAC_OS_X_VERSION_MAJOR by using two `base:`s on MACOSX_DEPLOYMENT_TARGET.
+    
+    * Configurations/Base.xcconfig:
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@268330 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-10-11  Luming Yin  <luming_...@apple.com>
+
+            Strip patch version from TARGET_MAC_OS_X_VERSION_MAJOR when building for macOS Big Sur
+            or later
+            https://bugs.webkit.org/show_bug.cgi?id=217594
+            rdar://70188497
+
+            Reviewed by Darin Adler.
+
+            To ensure successful Mac Catalyst WebKit builds, strip the patch version from
+            TARGET_MAC_OS_X_VERSION_MAJOR by using two `base:`s on MACOSX_DEPLOYMENT_TARGET.
+
+            * Configurations/Base.xcconfig:
+
+2020-10-11  Kocsen Chung  <kocsen_ch...@apple.com>
+
         Cherry-pick r268327. rdar://problem/70168426
 
     Ignore deployment suffix and identifier when computing major OS version for macOS

Modified: branches/safari-611.1.3-branch/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig (268338 => 268339)


--- branches/safari-611.1.3-branch/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig	2020-10-12 02:21:13 UTC (rev 268338)
+++ branches/safari-611.1.3-branch/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig	2020-10-12 02:21:21 UTC (rev 268339)
@@ -73,7 +73,7 @@
 TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_10 = 10$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier)
 
 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_LEGACY_VERSION_IDENTIFIER))
-TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MACOSX_DEPLOYMENT_TARGET:base)0000
+TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MACOSX_DEPLOYMENT_TARGET:base:base)0000
 TARGET_MAC_OS_X_VERSION_MAJOR_10_13 = 101300
 TARGET_MAC_OS_X_VERSION_MAJOR_10_14 = 101400
 TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500

Modified: branches/safari-611.1.3-branch/Source/WTF/ChangeLog (268338 => 268339)


--- branches/safari-611.1.3-branch/Source/WTF/ChangeLog	2020-10-12 02:21:13 UTC (rev 268338)
+++ branches/safari-611.1.3-branch/Source/WTF/ChangeLog	2020-10-12 02:21:21 UTC (rev 268339)
@@ -1,5 +1,38 @@
 2020-10-11  Kocsen Chung  <kocsen_ch...@apple.com>
 
+        Cherry-pick r268330. rdar://problem/70188497
+
+    Strip patch version from TARGET_MAC_OS_X_VERSION_MAJOR when building for macOS Big Sur
+    or later
+    https://bugs.webkit.org/show_bug.cgi?id=217594
+    rdar://70188497
+    
+    Patch by Luming Yin <luming_...@apple.com> on 2020-10-11
+    Reviewed by Darin Adler.
+    
+    To ensure successful Mac Catalyst WebKit builds, strip the patch version from
+    TARGET_MAC_OS_X_VERSION_MAJOR by using two `base:`s on MACOSX_DEPLOYMENT_TARGET.
+    
+    * Configurations/Base.xcconfig:
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@268330 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-10-11  Luming Yin  <luming_...@apple.com>
+
+            Strip patch version from TARGET_MAC_OS_X_VERSION_MAJOR when building for macOS Big Sur
+            or later
+            https://bugs.webkit.org/show_bug.cgi?id=217594
+            rdar://70188497
+
+            Reviewed by Darin Adler.
+
+            To ensure successful Mac Catalyst WebKit builds, strip the patch version from
+            TARGET_MAC_OS_X_VERSION_MAJOR by using two `base:`s on MACOSX_DEPLOYMENT_TARGET.
+
+            * Configurations/Base.xcconfig:
+
+2020-10-11  Kocsen Chung  <kocsen_ch...@apple.com>
+
         Cherry-pick r268327. rdar://problem/70168426
 
     Ignore deployment suffix and identifier when computing major OS version for macOS

Modified: branches/safari-611.1.3-branch/Source/WTF/Configurations/Base.xcconfig (268338 => 268339)


--- branches/safari-611.1.3-branch/Source/WTF/Configurations/Base.xcconfig	2020-10-12 02:21:13 UTC (rev 268338)
+++ branches/safari-611.1.3-branch/Source/WTF/Configurations/Base.xcconfig	2020-10-12 02:21:21 UTC (rev 268339)
@@ -106,7 +106,7 @@
 TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_10 = 10$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier)
 
 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_LEGACY_VERSION_IDENTIFIER))
-TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MACOSX_DEPLOYMENT_TARGET:base)0000
+TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MACOSX_DEPLOYMENT_TARGET:base:base)0000
 TARGET_MAC_OS_X_VERSION_MAJOR_10_13 = 101300
 TARGET_MAC_OS_X_VERSION_MAJOR_10_14 = 101400
 TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500

Modified: branches/safari-611.1.3-branch/Source/WebCore/ChangeLog (268338 => 268339)


--- branches/safari-611.1.3-branch/Source/WebCore/ChangeLog	2020-10-12 02:21:13 UTC (rev 268338)
+++ branches/safari-611.1.3-branch/Source/WebCore/ChangeLog	2020-10-12 02:21:21 UTC (rev 268339)
@@ -1,5 +1,38 @@
 2020-10-11  Kocsen Chung  <kocsen_ch...@apple.com>
 
+        Cherry-pick r268330. rdar://problem/70188497
+
+    Strip patch version from TARGET_MAC_OS_X_VERSION_MAJOR when building for macOS Big Sur
+    or later
+    https://bugs.webkit.org/show_bug.cgi?id=217594
+    rdar://70188497
+    
+    Patch by Luming Yin <luming_...@apple.com> on 2020-10-11
+    Reviewed by Darin Adler.
+    
+    To ensure successful Mac Catalyst WebKit builds, strip the patch version from
+    TARGET_MAC_OS_X_VERSION_MAJOR by using two `base:`s on MACOSX_DEPLOYMENT_TARGET.
+    
+    * Configurations/Base.xcconfig:
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@268330 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-10-11  Luming Yin  <luming_...@apple.com>
+
+            Strip patch version from TARGET_MAC_OS_X_VERSION_MAJOR when building for macOS Big Sur
+            or later
+            https://bugs.webkit.org/show_bug.cgi?id=217594
+            rdar://70188497
+
+            Reviewed by Darin Adler.
+
+            To ensure successful Mac Catalyst WebKit builds, strip the patch version from
+            TARGET_MAC_OS_X_VERSION_MAJOR by using two `base:`s on MACOSX_DEPLOYMENT_TARGET.
+
+            * Configurations/Base.xcconfig:
+
+2020-10-11  Kocsen Chung  <kocsen_ch...@apple.com>
+
         Cherry-pick r268327. rdar://problem/70168426
 
     Ignore deployment suffix and identifier when computing major OS version for macOS

Modified: branches/safari-611.1.3-branch/Source/WebCore/Configurations/Base.xcconfig (268338 => 268339)


--- branches/safari-611.1.3-branch/Source/WebCore/Configurations/Base.xcconfig	2020-10-12 02:21:13 UTC (rev 268338)
+++ branches/safari-611.1.3-branch/Source/WebCore/Configurations/Base.xcconfig	2020-10-12 02:21:21 UTC (rev 268339)
@@ -96,7 +96,7 @@
 TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_10 = 10$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier)
 
 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_LEGACY_VERSION_IDENTIFIER))
-TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MACOSX_DEPLOYMENT_TARGET:base)0000
+TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MACOSX_DEPLOYMENT_TARGET:base:base)0000
 TARGET_MAC_OS_X_VERSION_MAJOR_10_13 = 101300
 TARGET_MAC_OS_X_VERSION_MAJOR_10_14 = 101400
 TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500

Modified: branches/safari-611.1.3-branch/Source/WebCore/PAL/ChangeLog (268338 => 268339)


--- branches/safari-611.1.3-branch/Source/WebCore/PAL/ChangeLog	2020-10-12 02:21:13 UTC (rev 268338)
+++ branches/safari-611.1.3-branch/Source/WebCore/PAL/ChangeLog	2020-10-12 02:21:21 UTC (rev 268339)
@@ -1,5 +1,38 @@
 2020-10-11  Kocsen Chung  <kocsen_ch...@apple.com>
 
+        Cherry-pick r268330. rdar://problem/70188497
+
+    Strip patch version from TARGET_MAC_OS_X_VERSION_MAJOR when building for macOS Big Sur
+    or later
+    https://bugs.webkit.org/show_bug.cgi?id=217594
+    rdar://70188497
+    
+    Patch by Luming Yin <luming_...@apple.com> on 2020-10-11
+    Reviewed by Darin Adler.
+    
+    To ensure successful Mac Catalyst WebKit builds, strip the patch version from
+    TARGET_MAC_OS_X_VERSION_MAJOR by using two `base:`s on MACOSX_DEPLOYMENT_TARGET.
+    
+    * Configurations/Base.xcconfig:
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@268330 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-10-11  Luming Yin  <luming_...@apple.com>
+
+            Strip patch version from TARGET_MAC_OS_X_VERSION_MAJOR when building for macOS Big Sur
+            or later
+            https://bugs.webkit.org/show_bug.cgi?id=217594
+            rdar://70188497
+
+            Reviewed by Darin Adler.
+
+            To ensure successful Mac Catalyst WebKit builds, strip the patch version from
+            TARGET_MAC_OS_X_VERSION_MAJOR by using two `base:`s on MACOSX_DEPLOYMENT_TARGET.
+
+            * Configurations/Base.xcconfig:
+
+2020-10-11  Kocsen Chung  <kocsen_ch...@apple.com>
+
         Cherry-pick r268327. rdar://problem/70168426
 
     Ignore deployment suffix and identifier when computing major OS version for macOS

Modified: branches/safari-611.1.3-branch/Source/WebCore/PAL/Configurations/Base.xcconfig (268338 => 268339)


--- branches/safari-611.1.3-branch/Source/WebCore/PAL/Configurations/Base.xcconfig	2020-10-12 02:21:13 UTC (rev 268338)
+++ branches/safari-611.1.3-branch/Source/WebCore/PAL/Configurations/Base.xcconfig	2020-10-12 02:21:21 UTC (rev 268339)
@@ -94,7 +94,7 @@
 TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_10 = 10$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier)
 
 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_LEGACY_VERSION_IDENTIFIER))
-TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MACOSX_DEPLOYMENT_TARGET:base)0000
+TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MACOSX_DEPLOYMENT_TARGET:base:base)0000
 TARGET_MAC_OS_X_VERSION_MAJOR_10_13 = 101300
 TARGET_MAC_OS_X_VERSION_MAJOR_10_14 = 101400
 TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500

Modified: branches/safari-611.1.3-branch/Source/WebInspectorUI/ChangeLog (268338 => 268339)


--- branches/safari-611.1.3-branch/Source/WebInspectorUI/ChangeLog	2020-10-12 02:21:13 UTC (rev 268338)
+++ branches/safari-611.1.3-branch/Source/WebInspectorUI/ChangeLog	2020-10-12 02:21:21 UTC (rev 268339)
@@ -1,5 +1,38 @@
 2020-10-11  Kocsen Chung  <kocsen_ch...@apple.com>
 
+        Cherry-pick r268330. rdar://problem/70188497
+
+    Strip patch version from TARGET_MAC_OS_X_VERSION_MAJOR when building for macOS Big Sur
+    or later
+    https://bugs.webkit.org/show_bug.cgi?id=217594
+    rdar://70188497
+    
+    Patch by Luming Yin <luming_...@apple.com> on 2020-10-11
+    Reviewed by Darin Adler.
+    
+    To ensure successful Mac Catalyst WebKit builds, strip the patch version from
+    TARGET_MAC_OS_X_VERSION_MAJOR by using two `base:`s on MACOSX_DEPLOYMENT_TARGET.
+    
+    * Configurations/Base.xcconfig:
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@268330 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-10-11  Luming Yin  <luming_...@apple.com>
+
+            Strip patch version from TARGET_MAC_OS_X_VERSION_MAJOR when building for macOS Big Sur
+            or later
+            https://bugs.webkit.org/show_bug.cgi?id=217594
+            rdar://70188497
+
+            Reviewed by Darin Adler.
+
+            To ensure successful Mac Catalyst WebKit builds, strip the patch version from
+            TARGET_MAC_OS_X_VERSION_MAJOR by using two `base:`s on MACOSX_DEPLOYMENT_TARGET.
+
+            * Configurations/Base.xcconfig:
+
+2020-10-11  Kocsen Chung  <kocsen_ch...@apple.com>
+
         Cherry-pick r268327. rdar://problem/70168426
 
     Ignore deployment suffix and identifier when computing major OS version for macOS

Modified: branches/safari-611.1.3-branch/Source/WebInspectorUI/Configurations/Base.xcconfig (268338 => 268339)


--- branches/safari-611.1.3-branch/Source/WebInspectorUI/Configurations/Base.xcconfig	2020-10-12 02:21:13 UTC (rev 268338)
+++ branches/safari-611.1.3-branch/Source/WebInspectorUI/Configurations/Base.xcconfig	2020-10-12 02:21:21 UTC (rev 268339)
@@ -76,7 +76,7 @@
 TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_10 = 10$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier)
 
 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_LEGACY_VERSION_IDENTIFIER))
-TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MACOSX_DEPLOYMENT_TARGET:base)0000
+TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MACOSX_DEPLOYMENT_TARGET:base:base)0000
 TARGET_MAC_OS_X_VERSION_MAJOR_10_13 = 101300
 TARGET_MAC_OS_X_VERSION_MAJOR_10_14 = 101400
 TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500

Modified: branches/safari-611.1.3-branch/Source/WebKit/ChangeLog (268338 => 268339)


--- branches/safari-611.1.3-branch/Source/WebKit/ChangeLog	2020-10-12 02:21:13 UTC (rev 268338)
+++ branches/safari-611.1.3-branch/Source/WebKit/ChangeLog	2020-10-12 02:21:21 UTC (rev 268339)
@@ -1,5 +1,38 @@
 2020-10-11  Kocsen Chung  <kocsen_ch...@apple.com>
 
+        Cherry-pick r268330. rdar://problem/70188497
+
+    Strip patch version from TARGET_MAC_OS_X_VERSION_MAJOR when building for macOS Big Sur
+    or later
+    https://bugs.webkit.org/show_bug.cgi?id=217594
+    rdar://70188497
+    
+    Patch by Luming Yin <luming_...@apple.com> on 2020-10-11
+    Reviewed by Darin Adler.
+    
+    To ensure successful Mac Catalyst WebKit builds, strip the patch version from
+    TARGET_MAC_OS_X_VERSION_MAJOR by using two `base:`s on MACOSX_DEPLOYMENT_TARGET.
+    
+    * Configurations/Base.xcconfig:
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@268330 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-10-11  Luming Yin  <luming_...@apple.com>
+
+            Strip patch version from TARGET_MAC_OS_X_VERSION_MAJOR when building for macOS Big Sur
+            or later
+            https://bugs.webkit.org/show_bug.cgi?id=217594
+            rdar://70188497
+
+            Reviewed by Darin Adler.
+
+            To ensure successful Mac Catalyst WebKit builds, strip the patch version from
+            TARGET_MAC_OS_X_VERSION_MAJOR by using two `base:`s on MACOSX_DEPLOYMENT_TARGET.
+
+            * Configurations/Base.xcconfig:
+
+2020-10-11  Kocsen Chung  <kocsen_ch...@apple.com>
+
         Cherry-pick r268327. rdar://problem/70168426
 
     Ignore deployment suffix and identifier when computing major OS version for macOS

Modified: branches/safari-611.1.3-branch/Source/WebKit/Configurations/Base.xcconfig (268338 => 268339)


--- branches/safari-611.1.3-branch/Source/WebKit/Configurations/Base.xcconfig	2020-10-12 02:21:13 UTC (rev 268338)
+++ branches/safari-611.1.3-branch/Source/WebKit/Configurations/Base.xcconfig	2020-10-12 02:21:21 UTC (rev 268339)
@@ -92,7 +92,7 @@
 TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_10 = 10$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier)
 
 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_LEGACY_VERSION_IDENTIFIER))
-TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MACOSX_DEPLOYMENT_TARGET:base)0000
+TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MACOSX_DEPLOYMENT_TARGET:base:base)0000
 TARGET_MAC_OS_X_VERSION_MAJOR_10_13 = 101300
 TARGET_MAC_OS_X_VERSION_MAJOR_10_14 = 101400
 TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500

Modified: branches/safari-611.1.3-branch/Source/WebKitLegacy/mac/ChangeLog (268338 => 268339)


--- branches/safari-611.1.3-branch/Source/WebKitLegacy/mac/ChangeLog	2020-10-12 02:21:13 UTC (rev 268338)
+++ branches/safari-611.1.3-branch/Source/WebKitLegacy/mac/ChangeLog	2020-10-12 02:21:21 UTC (rev 268339)
@@ -1,5 +1,38 @@
 2020-10-11  Kocsen Chung  <kocsen_ch...@apple.com>
 
+        Cherry-pick r268330. rdar://problem/70188497
+
+    Strip patch version from TARGET_MAC_OS_X_VERSION_MAJOR when building for macOS Big Sur
+    or later
+    https://bugs.webkit.org/show_bug.cgi?id=217594
+    rdar://70188497
+    
+    Patch by Luming Yin <luming_...@apple.com> on 2020-10-11
+    Reviewed by Darin Adler.
+    
+    To ensure successful Mac Catalyst WebKit builds, strip the patch version from
+    TARGET_MAC_OS_X_VERSION_MAJOR by using two `base:`s on MACOSX_DEPLOYMENT_TARGET.
+    
+    * Configurations/Base.xcconfig:
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@268330 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-10-11  Luming Yin  <luming_...@apple.com>
+
+            Strip patch version from TARGET_MAC_OS_X_VERSION_MAJOR when building for macOS Big Sur
+            or later
+            https://bugs.webkit.org/show_bug.cgi?id=217594
+            rdar://70188497
+
+            Reviewed by Darin Adler.
+
+            To ensure successful Mac Catalyst WebKit builds, strip the patch version from
+            TARGET_MAC_OS_X_VERSION_MAJOR by using two `base:`s on MACOSX_DEPLOYMENT_TARGET.
+
+            * Configurations/Base.xcconfig:
+
+2020-10-11  Kocsen Chung  <kocsen_ch...@apple.com>
+
         Cherry-pick r268327. rdar://problem/70168426
 
     Ignore deployment suffix and identifier when computing major OS version for macOS

Modified: branches/safari-611.1.3-branch/Source/WebKitLegacy/mac/Configurations/Base.xcconfig (268338 => 268339)


--- branches/safari-611.1.3-branch/Source/WebKitLegacy/mac/Configurations/Base.xcconfig	2020-10-12 02:21:13 UTC (rev 268338)
+++ branches/safari-611.1.3-branch/Source/WebKitLegacy/mac/Configurations/Base.xcconfig	2020-10-12 02:21:21 UTC (rev 268339)
@@ -94,7 +94,7 @@
 TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_10 = 10$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier)
 
 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_LEGACY_VERSION_IDENTIFIER))
-TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MACOSX_DEPLOYMENT_TARGET:base)0000
+TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MACOSX_DEPLOYMENT_TARGET:base:base)0000
 TARGET_MAC_OS_X_VERSION_MAJOR_10_13 = 101300
 TARGET_MAC_OS_X_VERSION_MAJOR_10_14 = 101400
 TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500

Modified: branches/safari-611.1.3-branch/Source/bmalloc/ChangeLog (268338 => 268339)


--- branches/safari-611.1.3-branch/Source/bmalloc/ChangeLog	2020-10-12 02:21:13 UTC (rev 268338)
+++ branches/safari-611.1.3-branch/Source/bmalloc/ChangeLog	2020-10-12 02:21:21 UTC (rev 268339)
@@ -1,5 +1,38 @@
 2020-10-11  Kocsen Chung  <kocsen_ch...@apple.com>
 
+        Cherry-pick r268330. rdar://problem/70188497
+
+    Strip patch version from TARGET_MAC_OS_X_VERSION_MAJOR when building for macOS Big Sur
+    or later
+    https://bugs.webkit.org/show_bug.cgi?id=217594
+    rdar://70188497
+    
+    Patch by Luming Yin <luming_...@apple.com> on 2020-10-11
+    Reviewed by Darin Adler.
+    
+    To ensure successful Mac Catalyst WebKit builds, strip the patch version from
+    TARGET_MAC_OS_X_VERSION_MAJOR by using two `base:`s on MACOSX_DEPLOYMENT_TARGET.
+    
+    * Configurations/Base.xcconfig:
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@268330 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-10-11  Luming Yin  <luming_...@apple.com>
+
+            Strip patch version from TARGET_MAC_OS_X_VERSION_MAJOR when building for macOS Big Sur
+            or later
+            https://bugs.webkit.org/show_bug.cgi?id=217594
+            rdar://70188497
+
+            Reviewed by Darin Adler.
+
+            To ensure successful Mac Catalyst WebKit builds, strip the patch version from
+            TARGET_MAC_OS_X_VERSION_MAJOR by using two `base:`s on MACOSX_DEPLOYMENT_TARGET.
+
+            * Configurations/Base.xcconfig:
+
+2020-10-11  Kocsen Chung  <kocsen_ch...@apple.com>
+
         Cherry-pick r268327. rdar://problem/70168426
 
     Ignore deployment suffix and identifier when computing major OS version for macOS

Modified: branches/safari-611.1.3-branch/Source/bmalloc/Configurations/Base.xcconfig (268338 => 268339)


--- branches/safari-611.1.3-branch/Source/bmalloc/Configurations/Base.xcconfig	2020-10-12 02:21:13 UTC (rev 268338)
+++ branches/safari-611.1.3-branch/Source/bmalloc/Configurations/Base.xcconfig	2020-10-12 02:21:21 UTC (rev 268339)
@@ -100,7 +100,7 @@
 TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_10 = 10$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier)
 
 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_LEGACY_VERSION_IDENTIFIER))
-TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MACOSX_DEPLOYMENT_TARGET:base)0000
+TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MACOSX_DEPLOYMENT_TARGET:base:base)0000
 TARGET_MAC_OS_X_VERSION_MAJOR_10_13 = 101300
 TARGET_MAC_OS_X_VERSION_MAJOR_10_14 = 101400
 TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to