Attachment 369442 Details for Bug 197723 – Patch

[patch] Patch

bug-197723.diff (text/plain), 4.25 KB, created by Don Olmstead on 2019-05-08 16:17:56 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Don Olmstead

Created: 2019-05-08 16:17:56 PDT

Size: 4.25 KB

patch

obsolete

>diff --git a/ChangeLog b/ChangeLog
>index 890b2d8f94b..bcaff80a97c 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-05-08  Don Olmstead  <don.olmstead@sony.com>
>+
>+        [PlayStation] Update port options
>+        https://bugs.webkit.org/show_bug.cgi?id=197723
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Update the options used.
>+
>+        * Source/cmake/OptionsPlayStation.cmake:
>+
> 2019-05-07  Keith Rollin  <krollin@apple.com>
> 
>         Add option to build-webkit to control whether or not XCBuild is used
>diff --git a/Source/cmake/OptionsPlayStation.cmake b/Source/cmake/OptionsPlayStation.cmake
>index 8d6556fd80c..a4e879339ac 100644
>--- a/Source/cmake/OptionsPlayStation.cmake
>+++ b/Source/cmake/OptionsPlayStation.cmake
>@@ -18,9 +18,10 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SMOOTH_SCROLLING PRIVATE ON)
> # Experimental features
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_APPLICATION_MANIFEST PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_PAINTING_API PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_TYPED_OM PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FILTERS_LEVEL_2 PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_REMOTE_INSPECTOR PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SERVICE_WORKER PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VARIATION_FONTS PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
> 
> # Features to investigate
>@@ -30,6 +31,9 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL PRIVATE ${ENABLE_EXPERIMENTAL_FEAT
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD PRIVATE OFF)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_AUDIO PRIVATE OFF)
> 
>+# Reenable after updating fontconfig
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VARIATION_FONTS PRIVATE OFF)
>+
> # No support planned
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTPDIR PRIVATE OFF)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GEOLOCATION PRIVATE OFF)
>@@ -69,7 +73,6 @@ list(APPEND CMAKE_PREFIX_PATH ${WEBKIT_LIBRARIES_DIR})
> 
> find_library(C_STD_LIBRARY c)
> find_library(KERNEL_LIBRARY kernel)
>-find_library(POSIX_COMPATABILITY_LIBRARY posixex)
> 
> find_package(Cairo REQUIRED)
> find_package(CURL REQUIRED)
>@@ -108,7 +111,9 @@ SET_AND_EXPOSE_TO_BUILD(USE_CURL ON)
> SET_AND_EXPOSE_TO_BUILD(USE_FREETYPE ON)
> SET_AND_EXPOSE_TO_BUILD(USE_HARFBUZZ ON)
> SET_AND_EXPOSE_TO_BUILD(USE_LIBWPE ON)
>-SET_AND_EXPOSE_TO_BUILD(USE_INSPECTOR_SOCKET_SERVER ENABLE_REMOTE_INSPECTOR)
>+
>+SET_AND_EXPOSE_TO_BUILD(USE_INSPECTOR_SOCKET_SERVER ${ENABLE_REMOTE_INSPECTOR})
>+SET_AND_EXPOSE_TO_BUILD(USE_UNIX_DOMAIN_SOCKETS ON)
> 
> # Rendering options
> SET_AND_EXPOSE_TO_BUILD(ENABLE_GRAPHICS_CONTEXT_3D ON)
>@@ -119,10 +124,9 @@ SET_AND_EXPOSE_TO_BUILD(USE_OPENGL_ES ON)
> SET_AND_EXPOSE_TO_BUILD(USE_TEXTURE_MAPPER ON)
> SET_AND_EXPOSE_TO_BUILD(USE_TEXTURE_MAPPER_GL ON)
> SET_AND_EXPOSE_TO_BUILD(USE_TILED_BACKING_STORE ON)
>-SET_AND_EXPOSE_TO_BUILD(USE_UNIX_DOMAIN_SOCKETS ON)
> 
> set(WTF_LIBRARY_TYPE STATIC)
>-set(JavaScriptCore_LIBRARY_TYPE SHARED)
>+set(JavaScriptCore_LIBRARY_TYPE STATIC)
> set(WebCore_LIBRARY_TYPE STATIC)
> 
> set(ENABLE_API_TESTS ON)
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 4c86eb3b321..7242c149791 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-05-08  Don Olmstead  <don.olmstead@sony.com>
>+
>+        [PlayStation] Update port options
>+        https://bugs.webkit.org/show_bug.cgi?id=197723
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        ICU headers were missing from TestWTF.
>+
>+        * TestWebKitAPI/PlatformPlayStation.cmake:
>+
> 2019-05-08  Jonathan Bedard  <jbedard@apple.com>
> 
>         Change my status to be a WebKit reviewer.
>diff --git a/Tools/TestWebKitAPI/PlatformPlayStation.cmake b/Tools/TestWebKitAPI/PlatformPlayStation.cmake
>index 952d043f062..abb8690f80a 100644
>--- a/Tools/TestWebKitAPI/PlatformPlayStation.cmake
>+++ b/Tools/TestWebKitAPI/PlatformPlayStation.cmake
>@@ -10,6 +10,10 @@ list(APPEND TestWTF_SOURCES
>     generic/UtilitiesGeneric.cpp
> )
> 
>+list(APPEND TestWTF_PRIVATE_INCLUDE_DIRECTORIES
>+    ${ICU_INCLUDE_DIRS}
>+)
>+
> list(APPEND TestWebCore_SOURCES
>     ${test_main_SOURCES}
> )

Actions: View | Formatted Diff | Diff

Attachments on bug 197723: 369442