diff options
| author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2016-10-19 16:01:51 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-10-28 16:15:19 +0100 |
| commit | 8f9c46a7642c090ca07e26a6e188dc2146988139 (patch) | |
| tree | a53c60630a972f4d362954cdd7d2758b40e7bcd5 /meta/recipes-sato/webkit | |
| parent | ccffdd32aee2170b784ab4eaebb6cca1194f8dac (diff) | |
| download | poky-8f9c46a7642c090ca07e26a6e188dc2146988139.tar.gz | |
webkitgtk: update to 2.14.1
Rebase 0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch
(From OE-Core rev: a44d50c827b5180ff901d31c443ea02e100b10d5)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/webkit')
| -rw-r--r-- | meta/recipes-sato/webkit/files/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch | 272 | ||||
| -rw-r--r-- | meta/recipes-sato/webkit/webkitgtk_2.14.1.bb (renamed from meta/recipes-sato/webkit/webkitgtk_2.12.5.bb) | 26 |
2 files changed, 128 insertions, 170 deletions
diff --git a/meta/recipes-sato/webkit/files/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch b/meta/recipes-sato/webkit/files/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch index 25b3c9f243..ef209c81ae 100644 --- a/meta/recipes-sato/webkit/files/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch +++ b/meta/recipes-sato/webkit/files/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 53a00058184cd710c6f4375f4daab49d7e885a30 Mon Sep 17 00:00:00 2001 | 1 | From 20ee11dd188e1538f8cdd17a289dc6f9c63a011e Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sun, 17 Apr 2016 12:35:41 -0700 | 3 | Date: Sun, 17 Apr 2016 12:35:41 -0700 |
| 4 | Subject: [PATCH] WebKitMacros: Append to -I and not to -isystem | 4 | Subject: [PATCH] WebKitMacros: Append to -I and not to -isystem |
| @@ -15,82 +15,95 @@ and ends up with compile errors e.g. | |||
| 15 | /usr/include/c++/6.0.0/cstdlib:75:25: fatal error: stdlib.h: No such file or directory | 15 | /usr/include/c++/6.0.0/cstdlib:75:25: fatal error: stdlib.h: No such file or directory |
| 16 | 16 | ||
| 17 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 17 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 18 | --- | ||
| 19 | Upstream-Status: Pending | 18 | Upstream-Status: Pending |
| 19 | --- | ||
| 20 | Source/JavaScriptCore/shell/CMakeLists.txt | 2 +- | ||
| 21 | Source/WebCore/PlatformGTK.cmake | 6 +++--- | ||
| 22 | Source/WebKit2/PlatformGTK.cmake | 2 +- | ||
| 23 | Source/cmake/WebKitMacros.cmake | 2 +- | ||
| 24 | Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt | 2 +- | ||
| 25 | Tools/ImageDiff/CMakeLists.txt | 2 +- | ||
| 26 | Tools/MiniBrowser/gtk/CMakeLists.txt | 2 +- | ||
| 27 | Tools/TestWebKitAPI/PlatformGTK.cmake | 2 +- | ||
| 28 | Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt | 2 +- | ||
| 29 | Tools/WebKitTestRunner/CMakeLists.txt | 2 +- | ||
| 30 | 10 files changed, 12 insertions(+), 12 deletions(-) | ||
| 20 | 31 | ||
| 21 | Source/cmake/WebKitMacros.cmake | 2 +- | 32 | diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt |
| 22 | 1 file changed, 1 insertion(+), 1 deletion(-) | 33 | index 155c797..80fe22b 100644 |
| 23 | 34 | --- a/Source/JavaScriptCore/shell/CMakeLists.txt | |
| 24 | Index: webkitgtk-2.12.1/Source/JavaScriptCore/CMakeLists.txt | 35 | +++ b/Source/JavaScriptCore/shell/CMakeLists.txt |
| 25 | =================================================================== | 36 | @@ -20,7 +20,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() |
| 26 | --- webkitgtk-2.12.1.orig/Source/JavaScriptCore/CMakeLists.txt | ||
| 27 | +++ webkitgtk-2.12.1/Source/JavaScriptCore/CMakeLists.txt | ||
| 28 | @@ -1311,7 +1311,7 @@ add_subdirectory(shell) | ||
| 29 | 37 | ||
| 30 | WEBKIT_WRAP_SOURCELIST(${JavaScriptCore_SOURCES}) | 38 | WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES}) |
| 31 | include_directories(${JavaScriptCore_INCLUDE_DIRECTORIES}) | 39 | include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES}) |
| 32 | -include_directories(SYSTEM ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}) | 40 | -include_directories(SYSTEM ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}) |
| 33 | +include_directories(${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}) | 41 | +include_directories(${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}) |
| 34 | add_library(JavaScriptCore ${JavaScriptCore_LIBRARY_TYPE} ${JavaScriptCore_HEADERS} ${JavaScriptCore_SOURCES}) | 42 | add_executable(jsc ${JSC_SOURCES}) |
| 35 | target_link_libraries(JavaScriptCore ${JavaScriptCore_LIBRARIES}) | 43 | target_link_libraries(jsc ${JSC_LIBRARIES}) |
| 36 | set_target_properties(JavaScriptCore PROPERTIES COMPILE_DEFINITIONS "BUILDING_JavaScriptCore") | ||
| 37 | Index: webkitgtk-2.12.1/Source/WTF/wtf/CMakeLists.txt | ||
| 38 | =================================================================== | ||
| 39 | --- webkitgtk-2.12.1.orig/Source/WTF/wtf/CMakeLists.txt | ||
| 40 | +++ webkitgtk-2.12.1/Source/WTF/wtf/CMakeLists.txt | ||
| 41 | @@ -286,7 +286,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() | ||
| 42 | |||
| 43 | WEBKIT_WRAP_SOURCELIST(${WTF_SOURCES}) | ||
| 44 | include_directories(${WTF_INCLUDE_DIRECTORIES}) | ||
| 45 | -include_directories(SYSTEM ${WTF_SYSTEM_INCLUDE_DIRECTORIES}) | ||
| 46 | +include_directories(${WTF_SYSTEM_INCLUDE_DIRECTORIES}) | ||
| 47 | add_library(WTF ${WTF_LIBRARY_TYPE} ${WTF_HEADERS} ${WTF_SOURCES}) | ||
| 48 | target_link_libraries(WTF ${WTF_LIBRARIES}) | ||
| 49 | set_target_properties(WTF PROPERTIES COMPILE_DEFINITIONS "BUILDING_WTF") | ||
| 50 | Index: webkitgtk-2.12.1/Source/WebCore/CMakeLists.txt | ||
| 51 | =================================================================== | ||
| 52 | --- webkitgtk-2.12.1.orig/Source/WebCore/CMakeLists.txt | ||
| 53 | +++ webkitgtk-2.12.1/Source/WebCore/CMakeLists.txt | ||
| 54 | @@ -3748,7 +3748,7 @@ WEBKIT_WRAP_SOURCELIST(${WebCore_IDL_FIL | ||
| 55 | WEBKIT_WRAP_SOURCELIST(${WebCoreTestSupport_IDL_FILES} ${WebCoreTestSupport_SOURCES}) | ||
| 56 | |||
| 57 | include_directories(${WebCore_INCLUDE_DIRECTORIES} ${WebCoreTestSupport_INCLUDE_DIRECTORIES}) | ||
| 58 | -include_directories(SYSTEM ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}) | ||
| 59 | +include_directories(${WebCore_SYSTEM_INCLUDE_DIRECTORIES}) | ||
| 60 | |||
| 61 | if (MSVC) | ||
| 62 | ADD_PRECOMPILED_HEADER("WebCorePrefix.h" "WebCorePrefix.cpp" WebCore_SOURCES) | ||
| 63 | Index: webkitgtk-2.12.1/Source/WebKit/CMakeLists.txt | ||
| 64 | =================================================================== | ||
| 65 | --- webkitgtk-2.12.1.orig/Source/WebKit/CMakeLists.txt | ||
| 66 | +++ webkitgtk-2.12.1/Source/WebKit/CMakeLists.txt | ||
| 67 | @@ -28,7 +28,7 @@ set(WebKit_LIBRARIES | ||
| 68 | WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() | ||
| 69 | |||
| 70 | include_directories(${WebKit_INCLUDE_DIRECTORIES}) | ||
| 71 | -include_directories(SYSTEM ${WebKit_SYSTEM_INCLUDE_DIRECTORIES}) | ||
| 72 | +include_directories(${WebKit_SYSTEM_INCLUDE_DIRECTORIES}) | ||
| 73 | 44 | ||
| 74 | if (MSVC) | 45 | diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake |
| 75 | ADD_PRECOMPILED_HEADER("WebKitPrefix.h" "win/WebKitPrefix.cpp" WebKit_SOURCES) | 46 | index 567bd79..1fabea8 100644 |
| 76 | Index: webkitgtk-2.12.1/Source/WebKit2/CMakeLists.txt | 47 | --- a/Source/WebCore/PlatformGTK.cmake |
| 77 | =================================================================== | 48 | +++ b/Source/WebCore/PlatformGTK.cmake |
| 78 | --- webkitgtk-2.12.1.orig/Source/WebKit2/CMakeLists.txt | 49 | @@ -340,7 +340,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2) |
| 79 | +++ webkitgtk-2.12.1/Source/WebKit2/CMakeLists.txt | 50 | ${GTK2_INCLUDE_DIRS} |
| 80 | @@ -756,7 +756,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() | 51 | ${GDK2_INCLUDE_DIRS} |
| 81 | GENERATE_WEBKIT2_MESSAGE_SOURCES(WebKit2_DERIVED_SOURCES "${WebKit2_MESSAGES_IN_FILES}") | 52 | ) |
| 53 | - target_include_directories(WebCorePlatformGTK2 SYSTEM PRIVATE | ||
| 54 | + target_include_directories(WebCorePlatformGTK2 PRIVATE | ||
| 55 | ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} | ||
| 56 | ) | ||
| 57 | target_link_libraries(WebCorePlatformGTK2 | ||
| 58 | @@ -365,7 +365,7 @@ WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebCorePlatformGTK) | ||
| 59 | target_include_directories(WebCorePlatformGTK PRIVATE | ||
| 60 | ${WebCore_INCLUDE_DIRECTORIES} | ||
| 61 | ) | ||
| 62 | -target_include_directories(WebCorePlatformGTK SYSTEM PRIVATE | ||
| 63 | +target_include_directories(WebCorePlatformGTK PRIVATE | ||
| 64 | ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} | ||
| 65 | ${GTK_INCLUDE_DIRS} | ||
| 66 | ${GDK_INCLUDE_DIRS} | ||
| 67 | @@ -383,7 +383,7 @@ include_directories( | ||
| 68 | "${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}" | ||
| 69 | ) | ||
| 82 | 70 | ||
| 83 | include_directories(${WebKit2_INCLUDE_DIRECTORIES}) | 71 | -include_directories(SYSTEM |
| 84 | -include_directories(SYSTEM ${WebKit2_SYSTEM_INCLUDE_DIRECTORIES}) | 72 | +include_directories( |
| 85 | +include_directories(${WebKit2_SYSTEM_INCLUDE_DIRECTORIES}) | 73 | ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} |
| 86 | add_library(WebKit2 ${WebKit2_LIBRARY_TYPE} ${WebKit2_SOURCES} ${WebKit2_DERIVED_SOURCES}) | 74 | ) |
| 87 | 75 | ||
| 88 | add_dependencies(WebKit2 WebCore ${WEBKIT2_EXTRA_DEPENDENCIES}) | 76 | diff --git a/Source/WebKit2/PlatformGTK.cmake b/Source/WebKit2/PlatformGTK.cmake |
| 89 | Index: webkitgtk-2.12.1/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt | 77 | index e4805a4..c57df5d 100644 |
| 90 | =================================================================== | 78 | --- a/Source/WebKit2/PlatformGTK.cmake |
| 91 | --- webkitgtk-2.12.1.orig/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt | 79 | +++ b/Source/WebKit2/PlatformGTK.cmake |
| 92 | +++ webkitgtk-2.12.1/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt | 80 | @@ -822,7 +822,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2) |
| 93 | @@ -42,7 +42,7 @@ set(WebKitTestNetscapePlugin_SYSTEM_INCL | 81 | target_include_directories(WebKitPluginProcess2 PRIVATE |
| 82 | ${WebKit2CommonIncludeDirectories} | ||
| 83 | ) | ||
| 84 | - target_include_directories(WebKitPluginProcess2 SYSTEM PRIVATE | ||
| 85 | + target_include_directories(WebKitPluginProcess2 PRIVATE | ||
| 86 | ${WebKit2CommonSystemIncludeDirectories} | ||
| 87 | ${GTK2_INCLUDE_DIRS} | ||
| 88 | ${GDK2_INCLUDE_DIRS} | ||
| 89 | diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake | ||
| 90 | index 043e78e..8b3b642 100644 | ||
| 91 | --- a/Source/cmake/WebKitMacros.cmake | ||
| 92 | +++ b/Source/cmake/WebKitMacros.cmake | ||
| 93 | @@ -224,7 +224,7 @@ endmacro() | ||
| 94 | |||
| 95 | macro(WEBKIT_FRAMEWORK _target) | ||
| 96 | include_directories(${${_target}_INCLUDE_DIRECTORIES}) | ||
| 97 | - include_directories(SYSTEM ${${_target}_SYSTEM_INCLUDE_DIRECTORIES}) | ||
| 98 | + include_directories(${${_target}_SYSTEM_INCLUDE_DIRECTORIES}) | ||
| 99 | add_library(${_target} ${${_target}_LIBRARY_TYPE} | ||
| 100 | ${${_target}_HEADERS} | ||
| 101 | ${${_target}_SOURCES} | ||
| 102 | diff --git a/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt b/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt | ||
| 103 | index c431667..6dff244 100644 | ||
| 104 | --- a/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt | ||
| 105 | +++ b/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt | ||
| 106 | @@ -42,7 +42,7 @@ set(WebKitTestNetscapePlugin_SYSTEM_INCLUDE_DIRECTORIES | ||
| 94 | ) | 107 | ) |
| 95 | 108 | ||
| 96 | include_directories(${WebKitTestNetscapePlugin_INCLUDE_DIRECTORIES}) | 109 | include_directories(${WebKitTestNetscapePlugin_INCLUDE_DIRECTORIES}) |
| @@ -99,11 +112,11 @@ Index: webkitgtk-2.12.1/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt | |||
| 99 | 112 | ||
| 100 | set(WebKitTestNetscapePlugin_LIBRARIES | 113 | set(WebKitTestNetscapePlugin_LIBRARIES |
| 101 | ${X11_LIBRARIES} | 114 | ${X11_LIBRARIES} |
| 102 | Index: webkitgtk-2.12.1/Tools/ImageDiff/CMakeLists.txt | 115 | diff --git a/Tools/ImageDiff/CMakeLists.txt b/Tools/ImageDiff/CMakeLists.txt |
| 103 | =================================================================== | 116 | index b15443f..87e03bf 100644 |
| 104 | --- webkitgtk-2.12.1.orig/Tools/ImageDiff/CMakeLists.txt | 117 | --- a/Tools/ImageDiff/CMakeLists.txt |
| 105 | +++ webkitgtk-2.12.1/Tools/ImageDiff/CMakeLists.txt | 118 | +++ b/Tools/ImageDiff/CMakeLists.txt |
| 106 | @@ -14,7 +14,7 @@ set(IMAGE_DIFF_LIBRARIES | 119 | @@ -14,6 +14,6 @@ set(IMAGE_DIFF_LIBRARIES |
| 107 | WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() | 120 | WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() |
| 108 | 121 | ||
| 109 | include_directories(${IMAGE_DIFF_INCLUDE_DIRECTORIES}) | 122 | include_directories(${IMAGE_DIFF_INCLUDE_DIRECTORIES}) |
| @@ -111,12 +124,11 @@ Index: webkitgtk-2.12.1/Tools/ImageDiff/CMakeLists.txt | |||
| 111 | +include_directories(${IMAGE_DIFF_SYSTEM_INCLUDE_DIRECTORIES}) | 124 | +include_directories(${IMAGE_DIFF_SYSTEM_INCLUDE_DIRECTORIES}) |
| 112 | add_executable(ImageDiff ${IMAGE_DIFF_SOURCES}) | 125 | add_executable(ImageDiff ${IMAGE_DIFF_SOURCES}) |
| 113 | target_link_libraries(ImageDiff ${IMAGE_DIFF_LIBRARIES}) | 126 | target_link_libraries(ImageDiff ${IMAGE_DIFF_LIBRARIES}) |
| 114 | set_target_properties(ImageDiff PROPERTIES FOLDER "Tools") | 127 | diff --git a/Tools/MiniBrowser/gtk/CMakeLists.txt b/Tools/MiniBrowser/gtk/CMakeLists.txt |
| 115 | Index: webkitgtk-2.12.1/Tools/MiniBrowser/gtk/CMakeLists.txt | 128 | index 0704bc6..619e5a5 100644 |
| 116 | =================================================================== | 129 | --- a/Tools/MiniBrowser/gtk/CMakeLists.txt |
| 117 | --- webkitgtk-2.12.1.orig/Tools/MiniBrowser/gtk/CMakeLists.txt | 130 | +++ b/Tools/MiniBrowser/gtk/CMakeLists.txt |
| 118 | +++ webkitgtk-2.12.1/Tools/MiniBrowser/gtk/CMakeLists.txt | 131 | @@ -58,7 +58,7 @@ endif () |
| 119 | @@ -55,7 +55,7 @@ endif () | ||
| 120 | add_definitions(-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6) | 132 | add_definitions(-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6) |
| 121 | 133 | ||
| 122 | include_directories(${MiniBrowser_INCLUDE_DIRECTORIES}) | 134 | include_directories(${MiniBrowser_INCLUDE_DIRECTORIES}) |
| @@ -124,55 +136,11 @@ Index: webkitgtk-2.12.1/Tools/MiniBrowser/gtk/CMakeLists.txt | |||
| 124 | +include_directories(${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES}) | 136 | +include_directories(${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES}) |
| 125 | add_executable(MiniBrowser ${MiniBrowser_SOURCES}) | 137 | add_executable(MiniBrowser ${MiniBrowser_SOURCES}) |
| 126 | target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES}) | 138 | target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES}) |
| 127 | set_target_properties(MiniBrowser PROPERTIES FOLDER "Tools") | ||
| 128 | Index: webkitgtk-2.12.1/Tools/WebKitTestRunner/CMakeLists.txt | ||
| 129 | =================================================================== | ||
| 130 | --- webkitgtk-2.12.1.orig/Tools/WebKitTestRunner/CMakeLists.txt | ||
| 131 | +++ webkitgtk-2.12.1/Tools/WebKitTestRunner/CMakeLists.txt | ||
| 132 | @@ -115,7 +115,7 @@ GENERATE_BINDINGS(WebKitTestRunner_SOURC | ||
| 133 | WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() | ||
| 134 | |||
| 135 | include_directories(${WebKitTestRunner_INCLUDE_DIRECTORIES}) | ||
| 136 | -include_directories(SYSTEM ${WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES}) | ||
| 137 | +include_directories(${WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES}) | ||
| 138 | 139 | ||
| 139 | add_library(TestRunnerInjectedBundle SHARED ${WebKitTestRunnerInjectedBundle_SOURCES}) | 140 | diff --git a/Tools/TestWebKitAPI/PlatformGTK.cmake b/Tools/TestWebKitAPI/PlatformGTK.cmake |
| 140 | target_link_libraries(TestRunnerInjectedBundle ${WebKitTestRunner_LIBRARIES}) | 141 | index 7552cc2..2eb44d5 100644 |
| 141 | Index: webkitgtk-2.12.1/Source/WebCore/PlatformGTK.cmake | 142 | --- a/Tools/TestWebKitAPI/PlatformGTK.cmake |
| 142 | =================================================================== | 143 | +++ b/Tools/TestWebKitAPI/PlatformGTK.cmake |
| 143 | --- webkitgtk-2.12.1.orig/Source/WebCore/PlatformGTK.cmake | ||
| 144 | +++ webkitgtk-2.12.1/Source/WebCore/PlatformGTK.cmake | ||
| 145 | @@ -324,7 +324,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2) | ||
| 146 | ${GTK2_INCLUDE_DIRS} | ||
| 147 | ${GDK2_INCLUDE_DIRS} | ||
| 148 | ) | ||
| 149 | - target_include_directories(WebCorePlatformGTK2 SYSTEM PRIVATE | ||
| 150 | + target_include_directories(WebCorePlatformGTK2 PRIVATE | ||
| 151 | ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} | ||
| 152 | ) | ||
| 153 | target_link_libraries(WebCorePlatformGTK2 | ||
| 154 | @@ -366,7 +366,7 @@ WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebCoreP | ||
| 155 | target_include_directories(WebCorePlatformGTK PRIVATE | ||
| 156 | ${WebCore_INCLUDE_DIRECTORIES} | ||
| 157 | ) | ||
| 158 | -target_include_directories(WebCorePlatformGTK SYSTEM PRIVATE | ||
| 159 | +target_include_directories(WebCorePlatformGTK PRIVATE | ||
| 160 | ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} | ||
| 161 | ${GTK_INCLUDE_DIRS} | ||
| 162 | ${GDK_INCLUDE_DIRS} | ||
| 163 | @@ -384,7 +384,7 @@ include_directories( | ||
| 164 | "${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}" | ||
| 165 | ) | ||
| 166 | |||
| 167 | -include_directories(SYSTEM | ||
| 168 | +include_directories( | ||
| 169 | ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} | ||
| 170 | ) | ||
| 171 | |||
| 172 | Index: webkitgtk-2.12.1/Tools/TestWebKitAPI/PlatformGTK.cmake | ||
| 173 | =================================================================== | ||
| 174 | --- webkitgtk-2.12.1.orig/Tools/TestWebKitAPI/PlatformGTK.cmake | ||
| 175 | +++ webkitgtk-2.12.1/Tools/TestWebKitAPI/PlatformGTK.cmake | ||
| 176 | @@ -20,7 +20,7 @@ include_directories( | 144 | @@ -20,7 +20,7 @@ include_directories( |
| 177 | ${WEBKIT2_DIR}/UIProcess/API/gtk | 145 | ${WEBKIT2_DIR}/UIProcess/API/gtk |
| 178 | ) | 146 | ) |
| @@ -182,10 +150,10 @@ Index: webkitgtk-2.12.1/Tools/TestWebKitAPI/PlatformGTK.cmake | |||
| 182 | ${GDK3_INCLUDE_DIRS} | 150 | ${GDK3_INCLUDE_DIRS} |
| 183 | ${GLIB_INCLUDE_DIRS} | 151 | ${GLIB_INCLUDE_DIRS} |
| 184 | ${GTK3_INCLUDE_DIRS} | 152 | ${GTK3_INCLUDE_DIRS} |
| 185 | Index: webkitgtk-2.12.1/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt | 153 | diff --git a/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt b/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt |
| 186 | =================================================================== | 154 | index b0b4739..434e4ca 100644 |
| 187 | --- webkitgtk-2.12.1.orig/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt | 155 | --- a/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt |
| 188 | +++ webkitgtk-2.12.1/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt | 156 | +++ b/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt |
| 189 | @@ -23,7 +23,7 @@ include_directories( | 157 | @@ -23,7 +23,7 @@ include_directories( |
| 190 | ${TOOLS_DIR}/TestWebKitAPI/gtk/WebKit2Gtk | 158 | ${TOOLS_DIR}/TestWebKitAPI/gtk/WebKit2Gtk |
| 191 | ) | 159 | ) |
| @@ -195,29 +163,19 @@ Index: webkitgtk-2.12.1/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt | |||
| 195 | ${ATSPI_INCLUDE_DIRS} | 163 | ${ATSPI_INCLUDE_DIRS} |
| 196 | ${GLIB_INCLUDE_DIRS} | 164 | ${GLIB_INCLUDE_DIRS} |
| 197 | ${GSTREAMER_INCLUDE_DIRS} | 165 | ${GSTREAMER_INCLUDE_DIRS} |
| 198 | Index: webkitgtk-2.12.1/Source/WebKit2/PlatformGTK.cmake | 166 | diff --git a/Tools/WebKitTestRunner/CMakeLists.txt b/Tools/WebKitTestRunner/CMakeLists.txt |
| 199 | =================================================================== | 167 | index 7db90f2..a4f917f 100644 |
| 200 | --- webkitgtk-2.12.1.orig/Source/WebKit2/PlatformGTK.cmake | 168 | --- a/Tools/WebKitTestRunner/CMakeLists.txt |
| 201 | +++ webkitgtk-2.12.1/Source/WebKit2/PlatformGTK.cmake | 169 | +++ b/Tools/WebKitTestRunner/CMakeLists.txt |
| 202 | @@ -816,7 +816,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2) | 170 | @@ -116,7 +116,7 @@ GENERATE_BINDINGS(WebKitTestRunner_SOURCES |
| 203 | target_include_directories(WebKitPluginProcess2 PRIVATE | 171 | WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() |
| 204 | ${WebKit2CommonIncludeDirectories} | ||
| 205 | ) | ||
| 206 | - target_include_directories(WebKitPluginProcess2 SYSTEM PRIVATE | ||
| 207 | + target_include_directories(WebKitPluginProcess2 PRIVATE | ||
| 208 | ${WebKit2CommonSystemIncludeDirectories} | ||
| 209 | ${GTK2_INCLUDE_DIRS} | ||
| 210 | ${GDK2_INCLUDE_DIRS} | ||
| 211 | Index: webkitgtk-2.12.1/Source/JavaScriptCore/shell/CMakeLists.txt | ||
| 212 | =================================================================== | ||
| 213 | --- webkitgtk-2.12.1.orig/Source/JavaScriptCore/shell/CMakeLists.txt | ||
| 214 | +++ webkitgtk-2.12.1/Source/JavaScriptCore/shell/CMakeLists.txt | ||
| 215 | @@ -20,7 +20,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() | ||
| 216 | 172 | ||
| 217 | WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES}) | 173 | include_directories(${WebKitTestRunner_INCLUDE_DIRECTORIES}) |
| 218 | include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES}) | 174 | -include_directories(SYSTEM ${WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES}) |
| 219 | -include_directories(SYSTEM ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}) | 175 | +include_directories(${WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES}) |
| 220 | +include_directories(${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}) | 176 | |
| 221 | add_executable(jsc ${JSC_SOURCES}) | 177 | add_library(TestRunnerInjectedBundle SHARED ${WebKitTestRunnerInjectedBundle_SOURCES}) |
| 222 | target_link_libraries(jsc ${JSC_LIBRARIES}) | 178 | target_link_libraries(TestRunnerInjectedBundle ${WebKitTestRunner_LIBRARIES}) |
| 223 | set_target_properties(jsc PROPERTIES FOLDER "JavaScriptCore") | 179 | -- |
| 180 | 2.9.3 | ||
| 181 | |||
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.12.5.bb b/meta/recipes-sato/webkit/webkitgtk_2.14.1.bb index 941d0e2060..f85a33d40e 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.12.5.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.14.1.bb | |||
| @@ -10,19 +10,19 @@ LIC_FILES_CHKSUM = "file://Source/JavaScriptCore/COPYING.LIB;md5=d0c6d6397a5d842 | |||
| 10 | file://Source/WebCore/LICENSE-LGPL-2.1;md5=a778a33ef338abbaf8b8a7c36b6eec80 \ | 10 | file://Source/WebCore/LICENSE-LGPL-2.1;md5=a778a33ef338abbaf8b8a7c36b6eec80 \ |
| 11 | " | 11 | " |
| 12 | 12 | ||
| 13 | SRC_URI = "\ | 13 | SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ |
| 14 | http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ | 14 | file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \ |
| 15 | file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \ | 15 | file://0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch \ |
| 16 | file://0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch \ | 16 | file://0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch \ |
| 17 | file://0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch \ | 17 | file://musl-fixes.patch \ |
| 18 | file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \ | 18 | file://ppc-musl-fix.patch \ |
| 19 | file://musl-fixes.patch \ | 19 | file://0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch \ |
| 20 | file://ppc-musl-fix.patch \ | 20 | file://0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch \ |
| 21 | file://0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch \ | 21 | file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \ |
| 22 | file://0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch \ | 22 | " |
| 23 | " | 23 | |
| 24 | SRC_URI[md5sum] = "7a9ea00ec195488db90fdeb2d174ddaf" | 24 | SRC_URI[md5sum] = "8d6c60dc41604d3bbd43165a674c07e5" |
| 25 | SRC_URI[sha256sum] = "6b147854b864a5f115fadb97b2b6200b2f696db015216a34e7298d11c88b1c40" | 25 | SRC_URI[sha256sum] = "2e2d76c328de65bed6e0e4f096b2720a366654b27fc1af0830ece90bc4b7ceb5" |
| 26 | 26 | ||
| 27 | inherit cmake lib_package pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc | 27 | inherit cmake lib_package pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc |
| 28 | 28 | ||
