Attachment 449408 Details for Bug 235324 – Patch

[patch] Patch

bug-235324-20220118120058.patch (text/plain), 3.30 KB, created by Alex Christensen on 2022-01-18 12:00:59 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2022-01-18 12:00:59 PST

Size: 3.30 KB

patch

obsolete

>Subversion Revision: 288117
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 79355b93956e03454c166ca5cd3cf933a215ab25..36e8327bdfb612beff3c13e998bcf3cdae3369c2 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,16 @@
>+2022-01-18  Alex Christensen  <achristensen@webkit.org>
>+
>+        Don't build WKGroupSession.swift when using Monterey public SDK
>+        https://bugs.webkit.org/show_bug.cgi?id=235324
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/WebKit.xcconfig:
>+        Remove unused exclusion of WKGroupSession.swift which is only built in WebKitSwift.
>+        * Configurations/WebKitSwift.xcconfig:
>+        Remove unused reference to WKCoordinator.mm and WKCoordinator.h which don't exist any more.
>+        Don't build WKGroupSession.swift with the public SDK since it uses "@_spi(Safari)"
>+
> 2022-01-17  ChangSeok Oh  <changseok@webkit.org>
> 
>         [GTK] Implement form validation with gtk3 widgets in the UI process
>diff --git a/Source/WebKit/Configurations/WebKit.xcconfig b/Source/WebKit/Configurations/WebKit.xcconfig
>index 419a968d9bc404444aa9cec9498a273b4d6228fa..a8a0050fd2bca2299ac5803ae8bf3b4de03c1911 100644
>--- a/Source/WebKit/Configurations/WebKit.xcconfig
>+++ b/Source/WebKit/Configurations/WebKit.xcconfig
>@@ -206,12 +206,5 @@ WK_HAVE_URL_FORMATTING_appletvsimulator = NO;
> WK_HAVE_URL_FORMATTING_macosx = $(WK_HAVE_URL_FORMATTING$(WK_MACOS_1014));
> WK_HAVE_URL_FORMATTING_MACOS_SINCE_1014 = YES;
> 
>-WK_HAVE_COORDINATOR = $(WK_HAVE_COORDINATOR_$(WK_PLATFORM_NAME));
>-WK_HAVE_COORDINATOR_macosx = $(WK_HAVE_COORDINATOR$(WK_MACOS_1200));
>-WK_HAVE_COORDINATOR_MACOS_SINCE_1200 = YES;
>-
>-WK_EXCLUDED_COORDINATOR_FILES = $(WK_EXCLUDED_COORDINATOR_FILES_$(WK_NOT_$(WK_HAVE_COORDINATOR)));
>-WK_EXCLUDED_COORDINATOR_FILES_YES = WKCoordinator.h WKCoordinator.mm WKGroupSession.swift
>-
>-EXCLUDED_SOURCE_FILE_NAMES = libWebKitAdditions.a $(WK_EXCLUDED_COORDINATOR_FILES) $(EXCLUDED_IOS_RESOURCE_FILE_NAMES) $(EXCLUDED_MACOS_PLUGIN_FILE_NAMES)
>+EXCLUDED_SOURCE_FILE_NAMES = libWebKitAdditions.a $(EXCLUDED_IOS_RESOURCE_FILE_NAMES) $(EXCLUDED_MACOS_PLUGIN_FILE_NAMES)
> SWIFT_INSTALL_OBJC_HEADER = NO
>diff --git a/Source/WebKit/Configurations/WebKitSwift.xcconfig b/Source/WebKit/Configurations/WebKitSwift.xcconfig
>index 43fd2d019a8f6d8c9d71cfa22a2d1083c9bc5300..9f2406214d3dd32f91bfc9aa54e212b964dc06b0 100644
>--- a/Source/WebKit/Configurations/WebKitSwift.xcconfig
>+++ b/Source/WebKit/Configurations/WebKitSwift.xcconfig
>@@ -34,8 +34,10 @@ WK_HAVE_COORDINATOR = $(WK_HAVE_COORDINATOR_$(WK_PLATFORM_NAME));
> WK_HAVE_COORDINATOR_macosx = $(WK_HAVE_COORDINATOR$(WK_MACOS_1200));
> WK_HAVE_COORDINATOR_MACOS_SINCE_1200 = YES;
> 
>-WK_EXCLUDED_COORDINATOR_FILES = $(WK_EXCLUDED_COORDINATOR_FILES_$(WK_NOT_$(WK_HAVE_COORDINATOR)));
>-WK_EXCLUDED_COORDINATOR_FILES_YES = WKCoordinator.h WKCoordinator.mm WKGroupSession.swift
>+WK_EXCLUDED_COORDINATOR_FILES = $(WK_EXCLUDED_COORDINATOR_FILES_$(USE_INTERNAL_SDK))
>+WK_EXCLUDED_COORDINATOR_FILES_ = WKGroupSession.swift
>+WK_EXCLUDED_COORDINATOR_FILES_YES = $(WK_EXCLUDED_COORDINATOR_FILES_YES_$(WK_NOT_$(WK_HAVE_COORDINATOR)));
>+WK_EXCLUDED_COORDINATOR_FILES_YES_YES = WKGroupSession.swift
> 
> EXCLUDED_SOURCE_FILE_NAMES = $(WK_EXCLUDED_COORDINATOR_FILES) $(EXCLUDED_IOS_RESOURCE_FILE_NAMES) $(EXCLUDED_MACOS_PLUGIN_FILE_NAMES)
> SWIFT_INSTALL_OBJC_HEADER = NO

Actions: View | Formatted Diff | Diff

Attachments on bug 235324: 449408