diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-04-21 08:09:12 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-05-12 08:51:09 +0100 |
commit | 99df0c34705006cbab9de58bf6b796728a295b7a (patch) | |
tree | 36795369ee372b623d083350b3942f5bc0f85d69 /meta/recipes-sato/webkit | |
parent | 2b070ef738a30f23963fed4bec3470557a5dc2a3 (diff) | |
download | poky-99df0c34705006cbab9de58bf6b796728a295b7a.tar.gz |
webkitgtk: Upgrade to 2.16.1
Fix build with gcc7
Move all patches to webkit folder
Drop patches that were backports or have been upstreamed
(From OE-Core rev: bfbdd1a2069f199be9ba0909dd512469ff17b65e)
Signed-off-by: Khem Raj <raj.khem@gmail.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 | 185 | ||||
-rw-r--r-- | meta/recipes-sato/webkit/files/detect_atomics.patch | 38 | ||||
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch (renamed from meta/recipes-sato/webkit/files/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch (renamed from meta/recipes-sato/webkit/files/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch (renamed from meta/recipes-sato/webkit/files/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch (renamed from meta/recipes-sato/webkit/files/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch (renamed from meta/recipes-sato/webkit/files/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/cross-compile.patch (renamed from meta/recipes-sato/webkit/files/cross-compile.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/gcc7.patch | 23 | ||||
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/musl-fixes.patch (renamed from meta/recipes-sato/webkit/files/musl-fixes.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/ppc-musl-fix.patch (renamed from meta/recipes-sato/webkit/files/ppc-musl-fix.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/x32_support.patch | 13 | ||||
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk_2.16.1.bb (renamed from meta/recipes-sato/webkit/webkitgtk_2.14.5.bb) | 8 |
13 files changed, 32 insertions, 235 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 deleted file mode 100644 index a4face2765..0000000000 --- a/meta/recipes-sato/webkit/files/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch +++ /dev/null | |||
@@ -1,185 +0,0 @@ | |||
1 | From 20ee11dd188e1538f8cdd17a289dc6f9c63a011e Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 17 Apr 2016 12:35:41 -0700 | ||
4 | Subject: [PATCH] WebKitMacros: Append to -I and not to -isystem | ||
5 | |||
6 | gcc-6 has now introduced stdlib.h in libstdc++ for better | ||
7 | compliance and its including the C library stdlib.h using | ||
8 | include_next which is sensitive to order of system header | ||
9 | include paths. Its infact better to not tinker with the | ||
10 | system header include paths at all. Since adding /usr/include | ||
11 | to -system is redundant and compiler knows about it moreover | ||
12 | now with gcc6 it interferes with compiler's functioning | ||
13 | and ends up with compile errors e.g. | ||
14 | |||
15 | /usr/include/c++/6.0.0/cstdlib:75:25: fatal error: stdlib.h: No such file or directory | ||
16 | |||
17 | This is also an issue with clang (when using libstdc++ >= 6) | ||
18 | |||
19 | Upstream bug: https://bugs.webkit.org/show_bug.cgi?id=161697 | ||
20 | |||
21 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
22 | Upstream-Status: Pending | ||
23 | --- | ||
24 | Source/JavaScriptCore/shell/CMakeLists.txt | 2 +- | ||
25 | Source/WebCore/PlatformGTK.cmake | 6 +++--- | ||
26 | Source/WebKit2/PlatformGTK.cmake | 2 +- | ||
27 | Source/cmake/WebKitMacros.cmake | 2 +- | ||
28 | Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt | 2 +- | ||
29 | Tools/ImageDiff/CMakeLists.txt | 2 +- | ||
30 | Tools/MiniBrowser/gtk/CMakeLists.txt | 2 +- | ||
31 | Tools/TestWebKitAPI/PlatformGTK.cmake | 2 +- | ||
32 | Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt | 2 +- | ||
33 | Tools/WebKitTestRunner/CMakeLists.txt | 2 +- | ||
34 | 10 files changed, 12 insertions(+), 12 deletions(-) | ||
35 | |||
36 | diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt | ||
37 | index 155c797..80fe22b 100644 | ||
38 | --- a/Source/JavaScriptCore/shell/CMakeLists.txt | ||
39 | +++ b/Source/JavaScriptCore/shell/CMakeLists.txt | ||
40 | @@ -20,7 +20,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() | ||
41 | |||
42 | WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES}) | ||
43 | include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES}) | ||
44 | -include_directories(SYSTEM ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}) | ||
45 | +include_directories(${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}) | ||
46 | add_executable(jsc ${JSC_SOURCES}) | ||
47 | target_link_libraries(jsc ${JSC_LIBRARIES}) | ||
48 | |||
49 | diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake | ||
50 | index 567bd79..1fabea8 100644 | ||
51 | --- a/Source/WebCore/PlatformGTK.cmake | ||
52 | +++ b/Source/WebCore/PlatformGTK.cmake | ||
53 | @@ -340,7 +340,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2) | ||
54 | ${GTK2_INCLUDE_DIRS} | ||
55 | ${GDK2_INCLUDE_DIRS} | ||
56 | ) | ||
57 | - target_include_directories(WebCorePlatformGTK2 SYSTEM PRIVATE | ||
58 | + target_include_directories(WebCorePlatformGTK2 PRIVATE | ||
59 | ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} | ||
60 | ) | ||
61 | target_link_libraries(WebCorePlatformGTK2 | ||
62 | @@ -365,7 +365,7 @@ WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebCorePlatformGTK) | ||
63 | target_include_directories(WebCorePlatformGTK PRIVATE | ||
64 | ${WebCore_INCLUDE_DIRECTORIES} | ||
65 | ) | ||
66 | -target_include_directories(WebCorePlatformGTK SYSTEM PRIVATE | ||
67 | +target_include_directories(WebCorePlatformGTK PRIVATE | ||
68 | ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} | ||
69 | ${GTK_INCLUDE_DIRS} | ||
70 | ${GDK_INCLUDE_DIRS} | ||
71 | @@ -383,7 +383,7 @@ include_directories( | ||
72 | "${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}" | ||
73 | ) | ||
74 | |||
75 | -include_directories(SYSTEM | ||
76 | +include_directories( | ||
77 | ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} | ||
78 | ) | ||
79 | |||
80 | diff --git a/Source/WebKit2/PlatformGTK.cmake b/Source/WebKit2/PlatformGTK.cmake | ||
81 | index e4805a4..c57df5d 100644 | ||
82 | --- a/Source/WebKit2/PlatformGTK.cmake | ||
83 | +++ b/Source/WebKit2/PlatformGTK.cmake | ||
84 | @@ -822,7 +822,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2) | ||
85 | target_include_directories(WebKitPluginProcess2 PRIVATE | ||
86 | ${WebKit2CommonIncludeDirectories} | ||
87 | ) | ||
88 | - target_include_directories(WebKitPluginProcess2 SYSTEM PRIVATE | ||
89 | + target_include_directories(WebKitPluginProcess2 PRIVATE | ||
90 | ${WebKit2CommonSystemIncludeDirectories} | ||
91 | ${GTK2_INCLUDE_DIRS} | ||
92 | ${GDK2_INCLUDE_DIRS} | ||
93 | diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake | ||
94 | index 043e78e..8b3b642 100644 | ||
95 | --- a/Source/cmake/WebKitMacros.cmake | ||
96 | +++ b/Source/cmake/WebKitMacros.cmake | ||
97 | @@ -224,7 +224,7 @@ endmacro() | ||
98 | |||
99 | macro(WEBKIT_FRAMEWORK _target) | ||
100 | include_directories(${${_target}_INCLUDE_DIRECTORIES}) | ||
101 | - include_directories(SYSTEM ${${_target}_SYSTEM_INCLUDE_DIRECTORIES}) | ||
102 | + include_directories(${${_target}_SYSTEM_INCLUDE_DIRECTORIES}) | ||
103 | add_library(${_target} ${${_target}_LIBRARY_TYPE} | ||
104 | ${${_target}_HEADERS} | ||
105 | ${${_target}_SOURCES} | ||
106 | diff --git a/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt b/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt | ||
107 | index c431667..6dff244 100644 | ||
108 | --- a/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt | ||
109 | +++ b/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt | ||
110 | @@ -42,7 +42,7 @@ set(WebKitTestNetscapePlugin_SYSTEM_INCLUDE_DIRECTORIES | ||
111 | ) | ||
112 | |||
113 | include_directories(${WebKitTestNetscapePlugin_INCLUDE_DIRECTORIES}) | ||
114 | -include_directories(SYSTEM ${WebKitTestNetscapePlugin_SYSTEM_INCLUDE_DIRECTORIES}) | ||
115 | +include_directories(${WebKitTestNetscapePlugin_SYSTEM_INCLUDE_DIRECTORIES}) | ||
116 | |||
117 | set(WebKitTestNetscapePlugin_LIBRARIES | ||
118 | ${X11_LIBRARIES} | ||
119 | diff --git a/Tools/ImageDiff/CMakeLists.txt b/Tools/ImageDiff/CMakeLists.txt | ||
120 | index b15443f..87e03bf 100644 | ||
121 | --- a/Tools/ImageDiff/CMakeLists.txt | ||
122 | +++ b/Tools/ImageDiff/CMakeLists.txt | ||
123 | @@ -14,6 +14,6 @@ set(IMAGE_DIFF_LIBRARIES | ||
124 | WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() | ||
125 | |||
126 | include_directories(${IMAGE_DIFF_INCLUDE_DIRECTORIES}) | ||
127 | -include_directories(SYSTEM ${IMAGE_DIFF_SYSTEM_INCLUDE_DIRECTORIES}) | ||
128 | +include_directories(${IMAGE_DIFF_SYSTEM_INCLUDE_DIRECTORIES}) | ||
129 | add_executable(ImageDiff ${IMAGE_DIFF_SOURCES}) | ||
130 | target_link_libraries(ImageDiff ${IMAGE_DIFF_LIBRARIES}) | ||
131 | diff --git a/Tools/MiniBrowser/gtk/CMakeLists.txt b/Tools/MiniBrowser/gtk/CMakeLists.txt | ||
132 | index 0704bc6..619e5a5 100644 | ||
133 | --- a/Tools/MiniBrowser/gtk/CMakeLists.txt | ||
134 | +++ b/Tools/MiniBrowser/gtk/CMakeLists.txt | ||
135 | @@ -58,7 +58,7 @@ endif () | ||
136 | add_definitions(-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6) | ||
137 | |||
138 | include_directories(${MiniBrowser_INCLUDE_DIRECTORIES}) | ||
139 | -include_directories(SYSTEM ${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES}) | ||
140 | +include_directories(${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES}) | ||
141 | add_executable(MiniBrowser ${MiniBrowser_SOURCES}) | ||
142 | target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES}) | ||
143 | |||
144 | diff --git a/Tools/TestWebKitAPI/PlatformGTK.cmake b/Tools/TestWebKitAPI/PlatformGTK.cmake | ||
145 | index 7552cc2..2eb44d5 100644 | ||
146 | --- a/Tools/TestWebKitAPI/PlatformGTK.cmake | ||
147 | +++ b/Tools/TestWebKitAPI/PlatformGTK.cmake | ||
148 | @@ -20,7 +20,7 @@ include_directories( | ||
149 | ${WEBKIT2_DIR}/UIProcess/API/gtk | ||
150 | ) | ||
151 | |||
152 | -include_directories(SYSTEM | ||
153 | +include_directories( | ||
154 | ${GDK3_INCLUDE_DIRS} | ||
155 | ${GLIB_INCLUDE_DIRS} | ||
156 | ${GTK3_INCLUDE_DIRS} | ||
157 | diff --git a/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt b/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt | ||
158 | index b0b4739..434e4ca 100644 | ||
159 | --- a/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt | ||
160 | +++ b/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt | ||
161 | @@ -23,7 +23,7 @@ include_directories( | ||
162 | ${TOOLS_DIR}/TestWebKitAPI/gtk/WebKit2Gtk | ||
163 | ) | ||
164 | |||
165 | -include_directories(SYSTEM | ||
166 | +include_directories( | ||
167 | ${ATSPI_INCLUDE_DIRS} | ||
168 | ${GLIB_INCLUDE_DIRS} | ||
169 | ${GSTREAMER_INCLUDE_DIRS} | ||
170 | diff --git a/Tools/WebKitTestRunner/CMakeLists.txt b/Tools/WebKitTestRunner/CMakeLists.txt | ||
171 | index 7db90f2..a4f917f 100644 | ||
172 | --- a/Tools/WebKitTestRunner/CMakeLists.txt | ||
173 | +++ b/Tools/WebKitTestRunner/CMakeLists.txt | ||
174 | @@ -116,7 +116,7 @@ GENERATE_BINDINGS(WebKitTestRunner_SOURCES | ||
175 | WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() | ||
176 | |||
177 | include_directories(${WebKitTestRunner_INCLUDE_DIRECTORIES}) | ||
178 | -include_directories(SYSTEM ${WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES}) | ||
179 | +include_directories(${WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES}) | ||
180 | |||
181 | add_library(TestRunnerInjectedBundle SHARED ${WebKitTestRunnerInjectedBundle_SOURCES}) | ||
182 | target_link_libraries(TestRunnerInjectedBundle ${WebKitTestRunner_LIBRARIES}) | ||
183 | -- | ||
184 | 2.9.3 | ||
185 | |||
diff --git a/meta/recipes-sato/webkit/files/detect_atomics.patch b/meta/recipes-sato/webkit/files/detect_atomics.patch deleted file mode 100644 index c4e80a7d96..0000000000 --- a/meta/recipes-sato/webkit/files/detect_atomics.patch +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | Sourced from https://bugs.webkit.org/show_bug.cgi?id=161900 | ||
2 | |||
3 | on arm fixes | ||
4 | |||
5 | | /usr/src/debug/libgcc/6.2.0-r0/gcc-6.2.0/build.arm-oe-linux-gnueabi.arm-oe-linux-gnueabi/libgcc/../../../../../../../work-shared/gcc-6.2.0-r0/gcc-6.2.0/libgcc/config/arm/linux-atomic-64bit.c:117: multiple definition of `__sync_sub_and_fetch_8' | ||
6 | |||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | |||
9 | Upstream-Status: Backport | ||
10 | |||
11 | diff --git a/Source/WTF/wtf/CMakeLists.txt b/Source/WTF/wtf/CMakeLists.txt | ||
12 | index 867999e..ea69322 100644 | ||
13 | --- a/Source/WTF/wtf/CMakeLists.txt | ||
14 | +++ b/Source/WTF/wtf/CMakeLists.txt | ||
15 | @@ -171,7 +171,6 @@ set(WTF_HEADERS | ||
16 | |||
17 | set(WTF_SOURCES | ||
18 | Assertions.cpp | ||
19 | - Atomics.cpp | ||
20 | BitVector.cpp | ||
21 | CompilationThread.cpp | ||
22 | CrossThreadCopier.cpp | ||
23 | @@ -276,6 +275,15 @@ if (NOT USE_SYSTEM_MALLOC) | ||
24 | list(APPEND WTF_LIBRARIES bmalloc) | ||
25 | endif () | ||
26 | |||
27 | +file(WRITE ${CMAKE_BINARY_DIR}/test_atomics.cpp | ||
28 | + "int main(void)\n" | ||
29 | + "{ long long x = 1; return (int) __sync_add_and_fetch_8(&x, 1); }\n") | ||
30 | +try_compile(ATOMICS_BUILD_SUCCEEDED ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/test_atomics.cpp) | ||
31 | +if (NOT ATOMICS_BUILD_SUCCEEDED) | ||
32 | + list(APPEND WTF_SOURCES Atomics.cpp) | ||
33 | +endif () | ||
34 | +file(REMOVE ${CMAKE_BINARY_DIR}/test_atomics.cpp) | ||
35 | + | ||
36 | list(APPEND WTF_SOURCES | ||
37 | unicode/icu/CollatorICU.cpp | ||
38 | ) | ||
diff --git a/meta/recipes-sato/webkit/files/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch b/meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch index fae3b0b2e5..fae3b0b2e5 100644 --- a/meta/recipes-sato/webkit/files/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch +++ b/meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch | |||
diff --git a/meta/recipes-sato/webkit/files/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch index 615fe4f402..615fe4f402 100644 --- a/meta/recipes-sato/webkit/files/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch +++ b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch | |||
diff --git a/meta/recipes-sato/webkit/files/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch b/meta/recipes-sato/webkit/webkitgtk/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch index 93a69c0292..93a69c0292 100644 --- a/meta/recipes-sato/webkit/files/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch +++ b/meta/recipes-sato/webkit/webkitgtk/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch | |||
diff --git a/meta/recipes-sato/webkit/files/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch index 586dd2375c..586dd2375c 100644 --- a/meta/recipes-sato/webkit/files/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch +++ b/meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch | |||
diff --git a/meta/recipes-sato/webkit/files/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch b/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch index 3f71297f50..3f71297f50 100644 --- a/meta/recipes-sato/webkit/files/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch +++ b/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch | |||
diff --git a/meta/recipes-sato/webkit/files/cross-compile.patch b/meta/recipes-sato/webkit/webkitgtk/cross-compile.patch index 4d1de72851..4d1de72851 100644 --- a/meta/recipes-sato/webkit/files/cross-compile.patch +++ b/meta/recipes-sato/webkit/webkitgtk/cross-compile.patch | |||
diff --git a/meta/recipes-sato/webkit/webkitgtk/gcc7.patch b/meta/recipes-sato/webkit/webkitgtk/gcc7.patch new file mode 100644 index 0000000000..aee29a9a72 --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/gcc7.patch | |||
@@ -0,0 +1,23 @@ | |||
1 | Imported from | ||
2 | https://src.fedoraproject.org/cgit/rpms/webkitgtk4.git/plain/gcc7.patch | ||
3 | |||
4 | Add to CXX flags since webkitgtk uses c++ compiler by default | ||
5 | Fixes | ||
6 | Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h:119:67: error: no matching function for call to 'JSC::JSGenericTypedArrayView<Adaptor>::vector() const' | ||
7 | | return bitwise_cast<const typename Adaptor::Type*>(vector()); | ||
8 | |||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com | ||
10 | Upstream-Status: Pending | ||
11 | |||
12 | diff -up webkitgtk-2.15.90/Source/cmake/OptionsCommon.cmake.gcc7 webkitgtk-2.15.90/Source/cmake/OptionsCommon.cmake | ||
13 | --- webkitgtk-2.15.90/Source/cmake/OptionsCommon.cmake.gcc7 2017-02-21 09:57:13.168916004 +0100 | ||
14 | +++ webkitgtk-2.15.90/Source/cmake/OptionsCommon.cmake 2017-02-21 09:58:12.811563156 +0100 | ||
15 | @@ -41,6 +41,8 @@ if (COMPILER_IS_GCC_OR_CLANG) | ||
16 | set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-exceptions -fno-strict-aliasing") | ||
17 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-strict-aliasing -fno-rtti") | ||
18 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y") | ||
19 | + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-expansion-to-defined") | ||
20 | + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-expansion-to-defined") | ||
21 | endif () | ||
22 | |||
23 | if (COMPILER_IS_CLANG AND CMAKE_GENERATOR STREQUAL "Ninja") | ||
diff --git a/meta/recipes-sato/webkit/files/musl-fixes.patch b/meta/recipes-sato/webkit/webkitgtk/musl-fixes.patch index 4fdd56fea0..4fdd56fea0 100644 --- a/meta/recipes-sato/webkit/files/musl-fixes.patch +++ b/meta/recipes-sato/webkit/webkitgtk/musl-fixes.patch | |||
diff --git a/meta/recipes-sato/webkit/files/ppc-musl-fix.patch b/meta/recipes-sato/webkit/webkitgtk/ppc-musl-fix.patch index 5f58e4953e..5f58e4953e 100644 --- a/meta/recipes-sato/webkit/files/ppc-musl-fix.patch +++ b/meta/recipes-sato/webkit/webkitgtk/ppc-musl-fix.patch | |||
diff --git a/meta/recipes-sato/webkit/webkitgtk/x32_support.patch b/meta/recipes-sato/webkit/webkitgtk/x32_support.patch index fea4c27147..5f23837585 100644 --- a/meta/recipes-sato/webkit/webkitgtk/x32_support.patch +++ b/meta/recipes-sato/webkit/webkitgtk/x32_support.patch | |||
@@ -3,11 +3,11 @@ Subject: Fix FTBFS in x32 | |||
3 | Bug-Debian: https://bugs.debian.org/700795 | 3 | Bug-Debian: https://bugs.debian.org/700795 |
4 | Upstream-Status: Pending | 4 | Upstream-Status: Pending |
5 | Signed-off-by: Christopher Larson <chris_larson@mentor.com> | 5 | Signed-off-by: Christopher Larson <chris_larson@mentor.com> |
6 | Index: webkitgtk/Source/WTF/wtf/Platform.h | 6 | Index: webkitgtk-2.16.1/Source/WTF/wtf/Platform.h |
7 | =================================================================== | 7 | =================================================================== |
8 | --- webkitgtk.orig/Source/WTF/wtf/Platform.h | 8 | --- webkitgtk-2.16.1.orig/Source/WTF/wtf/Platform.h |
9 | +++ webkitgtk/Source/WTF/wtf/Platform.h | 9 | +++ webkitgtk-2.16.1/Source/WTF/wtf/Platform.h |
10 | @@ -182,8 +182,12 @@ | 10 | @@ -172,7 +172,11 @@ |
11 | /* CPU(X86_64) - AMD64 / Intel64 / x86_64 64-bit */ | 11 | /* CPU(X86_64) - AMD64 / Intel64 / x86_64 64-bit */ |
12 | #if defined(__x86_64__) \ | 12 | #if defined(__x86_64__) \ |
13 | || defined(_M_X64) | 13 | || defined(_M_X64) |
@@ -15,8 +15,7 @@ Index: webkitgtk/Source/WTF/wtf/Platform.h | |||
15 | +#define WTF_CPU_X86_64_32 1 | 15 | +#define WTF_CPU_X86_64_32 1 |
16 | +#else | 16 | +#else |
17 | #define WTF_CPU_X86_64 1 | 17 | #define WTF_CPU_X86_64 1 |
18 | #endif | ||
19 | +#endif | 18 | +#endif |
19 | #define WTF_CPU_X86_SSE2 1 | ||
20 | #endif | ||
20 | 21 | ||
21 | /* CPU(ARM64) - Apple */ | ||
22 | #if (defined(__arm64__) && defined(__APPLE__)) || defined(__aarch64__) | ||
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.14.5.bb b/meta/recipes-sato/webkit/webkitgtk_2.16.1.bb index daa17a94da..4443a5941b 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.14.5.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.16.1.bb | |||
@@ -17,14 +17,12 @@ SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ | |||
17 | file://ppc-musl-fix.patch \ | 17 | file://ppc-musl-fix.patch \ |
18 | file://0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch \ | 18 | file://0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch \ |
19 | file://0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch \ | 19 | file://0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch \ |
20 | file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \ | ||
21 | file://detect_atomics.patch \ | ||
22 | file://x32_support.patch \ | 20 | file://x32_support.patch \ |
23 | file://cross-compile.patch \ | 21 | file://cross-compile.patch \ |
22 | file://gcc7.patch \ | ||
24 | " | 23 | " |
25 | 24 | SRC_URI[md5sum] = "d3bcf995a667fd9febb9ab991acf0ca7" | |
26 | SRC_URI[md5sum] = "7fe3cb2699e64f969b285823c5ae2516" | 25 | SRC_URI[sha256sum] = "eb92383232328ce655b703c64370ed3795662479719ad1b4a869ed46769d2945" |
27 | SRC_URI[sha256sum] = "3ca8f1c33a9b43d6c753dcac1c0788656930e06382b10fdf5c2805ea8f96369f" | ||
28 | 26 | ||
29 | inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc | 27 | inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc |
30 | 28 | ||