Attachment 340106 Details for Bug 185519 – Patch

[patch] Patch

bug-185519-20180510105526.patch (text/plain), 3.20 KB, created by Tim Horton on 2018-05-10 10:55:27 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Tim Horton

Created: 2018-05-10 10:55:27 PDT

Size: 3.20 KB

patch

obsolete

>Subversion Revision: 231644
>diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
>index 09117e09fff39f98d27758b7f4952872c15ef4c4..0e9f953fdca8a55d64761fec31706486eba0111f 100644
>--- a/Source/WTF/ChangeLog
>+++ b/Source/WTF/ChangeLog
>@@ -1,3 +1,13 @@
>+2018-05-10  Tim Horton  <timothy_horton@apple.com>
>+
>+        Fix the build after r231393
>+        https://bugs.webkit.org/show_bug.cgi?id=185519
>+        <rdar://problem/40131741>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * wtf/Platform.h:
>+
> 2018-05-09  Michael Catanzaro  <mcatanzaro@igalia.com>
> 
>         [WPE] Build cleanly with GCC 8 and ICU 60
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index fe930cab9e1c6b8d951f9cb5aa768cbca1bff4cb..f364bd9146351415441e6f7e2c4567d692bfab6a 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,13 @@
>+2018-05-10  Tim Horton  <timothy_horton@apple.com>
>+
>+        Fix the build after r231393
>+        https://bugs.webkit.org/show_bug.cgi?id=185519
>+        <rdar://problem/40131741>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/WebCore.xcconfig:
>+
> 2018-05-10  Eric Carlson  <eric.carlson@apple.com>
> 
>         Log missing cues correctly
>diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
>index ad79f28837b69a8f4700f13662c6bddb33451750..1f0ed538cd0b5ada4252b65d3e01ad59cc751ae3 100644
>--- a/Source/WTF/wtf/Platform.h
>+++ b/Source/WTF/wtf/Platform.h
>@@ -1311,7 +1311,7 @@
> #define HAVE_RSA_PSS 1
> #endif
> 
>-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000)
>+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000 && !PLATFORM(APPLETV))
> #define HAVE_URL_FORMATTING 1
> #endif
> 
>diff --git a/Source/WebCore/Configurations/WebCore.xcconfig b/Source/WebCore/Configurations/WebCore.xcconfig
>index 65bc781ff0f4ac8036442306aa844b11f8fe92c8..252af49e47700ba2d8ce4c26cc72037f6ce7be00 100644
>--- a/Source/WebCore/Configurations/WebCore.xcconfig
>+++ b/Source/WebCore/Configurations/WebCore.xcconfig
>@@ -187,8 +187,14 @@ TEXT_BASED_API_FILE = WebCore.tbd
> WK_HAVE_DEVICE_IDENTITY = $(WK_HAVE_DEVICE_IDENTITY_$(PLATFORM_NAME));
> WK_HAVE_DEVICE_IDENTITY_iphoneos = YES;
> 
>-WK_HAVE_URL_FORMATTING = $(WK_HAVE_URL_FORMATTING_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
>-WK_HAVE_URL_FORMATTING_COCOA_TOUCH_YES = $(WK_HAVE_URL_FORMATTING$(WK_IOS_12));
>-WK_HAVE_URL_FORMATTING_COCOA_TOUCH_NO = $(WK_HAVE_URL_FORMATTING$(WK_MACOS_1014));
>+WK_HAVE_URL_FORMATTING = $(WK_HAVE_URL_FORMATTING_$(WK_PLATFORM_NAME));
>+WK_HAVE_URL_FORMATTING_iphoneos = $(WK_HAVE_URL_FORMATTING$(WK_IOS_12));
>+WK_HAVE_URL_FORMATTING_iphoneminimalsimulator = $(WK_HAVE_URL_FORMATTING$(WK_IOS_12));
>+WK_HAVE_URL_FORMATTING_iphonesimulator = $(WK_HAVE_URL_FORMATTING$(WK_IOS_12));
>+WK_HAVE_URL_FORMATTING_watchos = $(WK_HAVE_URL_FORMATTING$(WK_IOS_12));
>+WK_HAVE_URL_FORMATTING_watchsimulator = $(WK_HAVE_URL_FORMATTING$(WK_IOS_12));
>+WK_HAVE_URL_FORMATTING_appletvos = NO
>+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_URL_FORMATTING_IOS_SINCE_12 = YES;

Actions: View | Formatted Diff | Diff

Attachments on bug 185519: 340106