[GTK][WPE] Remove temporary workaround in Source/WebKit/Platform*.cmake
authortpopela@redhat.com <tpopela@redhat.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 27 Nov 2018 15:29:55 +0000 (15:29 +0000)
committertpopela@redhat.com <tpopela@redhat.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 27 Nov 2018 15:29:55 +0000 (15:29 +0000)
https://bugs.webkit.org/show_bug.cgi?id=192008

Reviewed by Michael Catanzaro.

Looks like it's not needed anymore as the code compiles fine without
it.

* PlatformGTK.cmake:
* PlatformWPE.cmake:

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

Source/WebKit/ChangeLog
Source/WebKit/PlatformGTK.cmake
Source/WebKit/PlatformWPE.cmake

index 76fd3f4..8f58d23 100644 (file)
@@ -1,3 +1,16 @@
+2018-11-27  Tomas Popela  <tpopela@redhat.com>
+
+        [GTK][WPE] Remove temporary workaround in Source/WebKit/Platform*.cmake
+        https://bugs.webkit.org/show_bug.cgi?id=192008
+
+        Reviewed by Michael Catanzaro.
+
+        Looks like it's not needed anymore as the code compiles fine without
+        it.
+
+        * PlatformGTK.cmake:
+        * PlatformWPE.cmake:
+
 2018-11-27  Antti Koivisto  <antti@apple.com>
 
         Factor mask layer applying in RemoteLayerTreePropertyApplier into a shared function
index facdc55..2281274 100644 (file)
@@ -26,9 +26,6 @@ if (NOT DEVELOPER_MODE AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
     WEBKIT_ADD_TARGET_PROPERTIES(WebKit LINK_FLAGS "-Wl,--version-script,${CMAKE_CURRENT_SOURCE_DIR}/webkitglib-symbols.map")
 endif ()
 
-# Temporary workaround to allow the build to succeed.
-file(REMOVE "${FORWARDING_HEADERS_DIR}/WebCore/Settings.h")
-
 set(WebKit_USE_PREFIX_HEADER ON)
 
 list(APPEND WebKit_UNIFIED_SOURCE_LIST_FILES
index e6ee84e..9ea7dee 100644 (file)
@@ -24,9 +24,6 @@ if (NOT DEVELOPER_MODE AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
     WEBKIT_ADD_TARGET_PROPERTIES(WebKit LINK_FLAGS "-Wl,--version-script,${CMAKE_CURRENT_SOURCE_DIR}/webkitglib-symbols.map")
 endif ()
 
-# Temporary workaround to allow the build to succeed.
-file(REMOVE "${FORWARDING_HEADERS_DIR}/WebCore/Settings.h")
-
 set(WebKit_USE_PREFIX_HEADER ON)
 
 add_custom_target(webkitwpe-forwarding-headers