Attachment 349047 Details for Bug 189362 – Patch

[patch] Patch

bug-189362-20180906114151.patch (text/plain), 8.55 KB, created by Daniel Bates on 2018-09-06 11:41:51 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Bates

Created: 2018-09-06 11:41:51 PDT

Size: 8.55 KB

patch

obsolete

>Subversion Revision: 235512
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index f950ca9559df3119b9988010803f549dbedbb551..0c4b25abbe1ff1f8455a1fb1aaec97a6bd303695 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-09-06  Daniel Bates  <dabates@apple.com>
>+
>+        [Xcode] Prefer system frameworks built into $(BUILT_PRODUCTS_DIR)/System/Library/Frameworks
>+        https://bugs.webkit.org/show_bug.cgi?id=189362
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Treat frameworks built into $(BUILT_PRODUCTS_DIR)/System/Library/Frameworks as system frameworks
>+        so that Xcode does not treat compile time warnings as errors when WebKit includes a header(s) from
>+        such frameworks that has compile time warnings.
>+
>+        * Configurations/WebCore.xcconfig:
>+
> 2018-08-30  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC][Floating] Block formatting context roots avoid floats.
>diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog
>index 7cc5f633dad3e8eecd5ed8638c89c009bfc88110..bb626476407537f6168bd515b7369b22d7afa6df 100644
>--- a/Source/WebCore/PAL/ChangeLog
>+++ b/Source/WebCore/PAL/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-09-06  Daniel Bates  <dabates@apple.com>
>+
>+        [Xcode] Prefer system frameworks built into $(BUILT_PRODUCTS_DIR)/System/Library/Frameworks
>+        https://bugs.webkit.org/show_bug.cgi?id=189362
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Treat frameworks built into $(BUILT_PRODUCTS_DIR)/System/Library/Frameworks as system frameworks
>+        so that Xcode does not treat compile time warnings as errors when WebKit includes a header(s) from
>+        such frameworks that has compile time warnings.
>+
>+        * Configurations/PAL.xcconfig:
>+
> 2018-08-29  Jer Noble  <jer.noble@apple.com>
> 
>         Muted elements do not have their Now Playing status updated when unmuted.
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 8c0762ca694f9a06585f6580cc786d730028460a..6f9d199a446d269e41941d1e4a7771e1f46b65e5 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-09-06  Daniel Bates  <dabates@apple.com>
>+
>+        [Xcode] Prefer system frameworks built into $(BUILT_PRODUCTS_DIR)/System/Library/Frameworks
>+        https://bugs.webkit.org/show_bug.cgi?id=189362
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Treat frameworks built into $(BUILT_PRODUCTS_DIR)/System/Library/Frameworks as system frameworks
>+        so that Xcode does not treat compile time warnings as errors when WebKit includes a header(s) from
>+        such frameworks that has compile time warnings.
>+
>+        * Configurations/BaseTarget.xcconfig:
>+
> 2018-08-30  Olivia Barnett  <obarnett@apple.com>
> 
>         Web Share API compatible with AppleTV and WatchOS
>diff --git a/Source/WebKitLegacy/mac/ChangeLog b/Source/WebKitLegacy/mac/ChangeLog
>index 99b64c09886fc42c52d9dbb6cf989d7df41db1f1..ba9797d839db21c8c4c79273acd1504481c5cf1e 100644
>--- a/Source/WebKitLegacy/mac/ChangeLog
>+++ b/Source/WebKitLegacy/mac/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-09-06  Daniel Bates  <dabates@apple.com>
>+
>+        [Xcode] Prefer system frameworks built into $(BUILT_PRODUCTS_DIR)/System/Library/Frameworks
>+        https://bugs.webkit.org/show_bug.cgi?id=189362
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Treat frameworks built into $(BUILT_PRODUCTS_DIR)/System/Library/Frameworks as system frameworks
>+        so that Xcode does not treat compile time warnings as errors when WebKit includes a header(s) from
>+        such frameworks that has compile time warnings.
>+
>+        * Configurations/WebKitLegacy.xcconfig:
>+
> 2018-08-29  Olivia Barnett  <obarnett@apple.com>
> 
>         Implement the Web Share API
>diff --git a/Source/WebCore/Configurations/WebCore.xcconfig b/Source/WebCore/Configurations/WebCore.xcconfig
>index a0befd4fdf5463e9975164d77516ee38322ec007..ddc5d0cd29b39b323882a6aff38e091455982c97 100644
>--- a/Source/WebCore/Configurations/WebCore.xcconfig
>+++ b/Source/WebCore/Configurations/WebCore.xcconfig
>@@ -35,7 +35,7 @@ FRAMEWORK_SEARCH_PATHS_ios_Debug = $(BUILT_PRODUCTS_DIR) $(WK_PRIVATE_FRAMEWORKS
> FRAMEWORK_SEARCH_PATHS_ios_Release = $(FRAMEWORK_SEARCH_PATHS_ios_Debug);
> FRAMEWORK_SEARCH_PATHS[sdk=macosx*] = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR);
> 
>-SYSTEM_FRAMEWORK_SEARCH_PATHS = $(inherited) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks
>+SYSTEM_FRAMEWORK_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR)/System/Library/Frameworks $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks
> 
> LIBRARY_SEARCH_PATHS = $(inherited) "$(WK_LIBWEBRTC_LIBRARY_DIR)";
> ADDITIONAL_CFLAGS = -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks;
>diff --git a/Source/WebCore/PAL/Configurations/PAL.xcconfig b/Source/WebCore/PAL/Configurations/PAL.xcconfig
>index 95fa0ccfc41831f800a1fba057005d251c971821..b751bba8055dcadeed569f114685b1fe0d2f6f60 100644
>--- a/Source/WebCore/PAL/Configurations/PAL.xcconfig
>+++ b/Source/WebCore/PAL/Configurations/PAL.xcconfig
>@@ -31,7 +31,7 @@ FRAMEWORK_SEARCH_PATHS_ios_Debug = $(BUILT_PRODUCTS_DIR);
> FRAMEWORK_SEARCH_PATHS_ios_Release = $(FRAMEWORK_SEARCH_PATHS_ios_Debug);
> FRAMEWORK_SEARCH_PATHS[sdk=macosx*] = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR);
> 
>-SYSTEM_FRAMEWORK_SEARCH_PATHS = $(inherited) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks;
>+SYSTEM_FRAMEWORK_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR)/System/Library/Frameworks $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks;
> 
> OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
> OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
>diff --git a/Source/WebKit/Configurations/BaseTarget.xcconfig b/Source/WebKit/Configurations/BaseTarget.xcconfig
>index 405d63bbb012a39e65da8ba8b8908358a258bd6c..65d7161547373cfe9cbb95901f514133e61f0398 100644
>--- a/Source/WebKit/Configurations/BaseTarget.xcconfig
>+++ b/Source/WebKit/Configurations/BaseTarget.xcconfig
>@@ -31,7 +31,7 @@ FRAMEWORK_SEARCH_PATHS_base = "$(UMBRELLA_FRAMEWORKS_DIR)"
> FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(FRAMEWORK_SEARCH_PATHS_base) $(WK_PRIVATE_FRAMEWORKS_DIR);
> FRAMEWORK_SEARCH_PATHS = $(FRAMEWORK_SEARCH_PATHS_base);
> 
>-SYSTEM_FRAMEWORK_SEARCH_PATHS = $(inherited) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks;
>+SYSTEM_FRAMEWORK_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR)/System/Library/Frameworks $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks;
> 
> GCC_PREFIX_HEADER = WebKit2Prefix.h;
> GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) $(WK_MANUAL_SANDBOXING_DEFINES) $(WK_CORE_PREDICTION_DEFINES) U_HIDE_DEPRECATED_API U_DISABLE_RENAMING=1 U_SHOW_CPLUSPLUS_API=0 FRAMEWORK_NAME=WebKit;
>diff --git a/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig b/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig
>index 993fac544d20a510fa40fc2dc36cb0cbbce3f584..84f72e670373103a087648926bd4f26a4a4d7e5e 100644
>--- a/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig
>+++ b/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig
>@@ -42,7 +42,7 @@ FRAMEWORK_SEARCH_PATHS_ios_Debug = $(BUILT_PRODUCTS_DIR) $(WK_PRIVATE_FRAMEWORKS
> FRAMEWORK_SEARCH_PATHS_ios_Release = $(FRAMEWORK_SEARCH_PATHS_ios_Debug);
> FRAMEWORK_SEARCH_PATHS_COCOA_TOUCH_NO = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR) "$(UMBRELLA_FRAMEWORKS_DIR)";
> 
>-SYSTEM_FRAMEWORK_SEARCH_PATHS = $(inherited) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks;
>+SYSTEM_FRAMEWORK_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR)/System/Library/Frameworks $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks;
> 
> OTHER_CFLAGS = $(OTHER_CFLAGS_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
> OTHER_CFLAGS_COCOA_TOUCH_YES = $(inherited) -isystem $(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders;

Actions: View | Formatted Diff | Diff

Attachments on bug 189362: 349047 | 349081