summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/webkit
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-05-11 10:35:11 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-13 13:41:29 +0100
commit268f66fe0e2eddf543fda26c50ef3123c5ef6b1a (patch)
tree791ff3196c09213f040f7112ae215b3ed7894797 /meta/recipes-sato/webkit
parentb5c1f588320e6b1f1804803de9abc0bf71976f3e (diff)
downloadpoky-268f66fe0e2eddf543fda26c50ef3123c5ef6b1a.tar.gz
webkitgtk: Upgrade to 2.12.1
Fix build with gcc-6 Do not tinker with -isystem, this causes issues where gcc does not find standard C++ headers since the default search ordered for system headers is changed and is not correct anymore. Errorr like WebCore/editing/gtk/EditorGtk.cpp:27: /mnt/oe/poky/build/tmp/sysroots/qemuarm/usr/include/c++/6.0.1/cstdlib:75:25: fatal error: stdlib.h: No such file or directory #include_next <stdlib.h> It brings a patch to fix typename mismatch for pow() see https://bugs.webkit.org/show_bug.cgi?id=153071 Drop upstreamed patches User -fPIC on aarch64 to fix relocation truncated to fit: R_AARCH64_LD64_GOTPAGE_LO15 against symbol `__stack_chk_guard@@GLIBC_2.17' defined in .data.rel.ro section (From OE-Core rev: 0a6e162c47017ecf51b466218fb549e0e199f4c4) Signed-off-by: Khem Raj <raj.khem@gmail.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-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch19
-rw-r--r--meta/recipes-sato/webkit/files/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch223
-rw-r--r--meta/recipes-sato/webkit/files/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch19
-rw-r--r--meta/recipes-sato/webkit/files/musl-fixes.patch48
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/0001-Enable-backtrace-on-linux-when-using-glibc.patch39
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-non-glibc-libraries-on-linux.patch61
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/clang.patch25
-rw-r--r--meta/recipes-sato/webkit/webkitgtk_2.12.1.bb (renamed from meta/recipes-sato/webkit/webkitgtk_2.10.7.bb)12
8 files changed, 294 insertions, 152 deletions
diff --git a/meta/recipes-sato/webkit/files/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch b/meta/recipes-sato/webkit/files/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch
index 3d004db29c..93a69c0292 100644
--- a/meta/recipes-sato/webkit/files/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch
+++ b/meta/recipes-sato/webkit/files/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch
@@ -13,11 +13,11 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
13 Source/cmake/OptionsGTK.cmake | 6 ------ 13 Source/cmake/OptionsGTK.cmake | 6 ------
14 1 file changed, 6 deletions(-) 14 1 file changed, 6 deletions(-)
15 15
16diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake 16Index: webkitgtk-2.12.1/Source/cmake/OptionsGTK.cmake
17index e5f1f5b..4698036 100644 17===================================================================
18--- a/Source/cmake/OptionsGTK.cmake 18--- webkitgtk-2.12.1.orig/Source/cmake/OptionsGTK.cmake
19+++ b/Source/cmake/OptionsGTK.cmake 19+++ webkitgtk-2.12.1/Source/cmake/OptionsGTK.cmake
20@@ -443,12 +443,6 @@ if (USE_LIBHYPHEN) 20@@ -424,12 +424,6 @@ if (USE_LIBHYPHEN)
21 endif () 21 endif ()
22 endif () 22 endif ()
23 23
@@ -27,9 +27,6 @@ index e5f1f5b..4698036 100644
27- set(ENABLE_INTROSPECTION OFF) 27- set(ENABLE_INTROSPECTION OFF)
28-endif () 28-endif ()
29- 29-
30 set(DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR ${DERIVED_SOURCES_DIR}/webkitdom) 30 # Override the cached variable, gtk-doc does not really work when building on Mac.
31 set(DERIVED_SOURCES_WEBKITGTK_DIR ${DERIVED_SOURCES_DIR}/webkitgtk) 31 if (APPLE)
32 set(DERIVED_SOURCES_WEBKITGTK_API_DIR ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkit) 32 set(ENABLE_GTKDOC OFF)
33--
342.7.0
35
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
new file mode 100644
index 0000000000..25b3c9f243
--- /dev/null
+++ b/meta/recipes-sato/webkit/files/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch
@@ -0,0 +1,223 @@
1From 53a00058184cd710c6f4375f4daab49d7e885a30 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 17 Apr 2016 12:35:41 -0700
4Subject: [PATCH] WebKitMacros: Append to -I and not to -isystem
5
6gcc-6 has now introduced stdlib.h in libstdc++ for better
7compliance and its including the C library stdlib.h using
8include_next which is sensitive to order of system header
9include paths. Its infact better to not tinker with the
10system header include paths at all. Since adding /usr/include
11to -system is redundant and compiler knows about it moreover
12now with gcc6 it interferes with compiler's functioning
13and 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
17Signed-off-by: Khem Raj <raj.khem@gmail.com>
18---
19Upstream-Status: Pending
20
21 Source/cmake/WebKitMacros.cmake | 2 +-
22 1 file changed, 1 insertion(+), 1 deletion(-)
23
24Index: webkitgtk-2.12.1/Source/JavaScriptCore/CMakeLists.txt
25===================================================================
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
30 WEBKIT_WRAP_SOURCELIST(${JavaScriptCore_SOURCES})
31 include_directories(${JavaScriptCore_INCLUDE_DIRECTORIES})
32-include_directories(SYSTEM ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES})
33+include_directories(${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES})
34 add_library(JavaScriptCore ${JavaScriptCore_LIBRARY_TYPE} ${JavaScriptCore_HEADERS} ${JavaScriptCore_SOURCES})
35 target_link_libraries(JavaScriptCore ${JavaScriptCore_LIBRARIES})
36 set_target_properties(JavaScriptCore PROPERTIES COMPILE_DEFINITIONS "BUILDING_JavaScriptCore")
37Index: 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")
50Index: 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)
63Index: 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
74 if (MSVC)
75 ADD_PRECOMPILED_HEADER("WebKitPrefix.h" "win/WebKitPrefix.cpp" WebKit_SOURCES)
76Index: webkitgtk-2.12.1/Source/WebKit2/CMakeLists.txt
77===================================================================
78--- webkitgtk-2.12.1.orig/Source/WebKit2/CMakeLists.txt
79+++ webkitgtk-2.12.1/Source/WebKit2/CMakeLists.txt
80@@ -756,7 +756,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
81 GENERATE_WEBKIT2_MESSAGE_SOURCES(WebKit2_DERIVED_SOURCES "${WebKit2_MESSAGES_IN_FILES}")
82
83 include_directories(${WebKit2_INCLUDE_DIRECTORIES})
84-include_directories(SYSTEM ${WebKit2_SYSTEM_INCLUDE_DIRECTORIES})
85+include_directories(${WebKit2_SYSTEM_INCLUDE_DIRECTORIES})
86 add_library(WebKit2 ${WebKit2_LIBRARY_TYPE} ${WebKit2_SOURCES} ${WebKit2_DERIVED_SOURCES})
87
88 add_dependencies(WebKit2 WebCore ${WEBKIT2_EXTRA_DEPENDENCIES})
89Index: webkitgtk-2.12.1/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt
90===================================================================
91--- webkitgtk-2.12.1.orig/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt
92+++ webkitgtk-2.12.1/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt
93@@ -42,7 +42,7 @@ set(WebKitTestNetscapePlugin_SYSTEM_INCL
94 )
95
96 include_directories(${WebKitTestNetscapePlugin_INCLUDE_DIRECTORIES})
97-include_directories(SYSTEM ${WebKitTestNetscapePlugin_SYSTEM_INCLUDE_DIRECTORIES})
98+include_directories(${WebKitTestNetscapePlugin_SYSTEM_INCLUDE_DIRECTORIES})
99
100 set(WebKitTestNetscapePlugin_LIBRARIES
101 ${X11_LIBRARIES}
102Index: webkitgtk-2.12.1/Tools/ImageDiff/CMakeLists.txt
103===================================================================
104--- webkitgtk-2.12.1.orig/Tools/ImageDiff/CMakeLists.txt
105+++ webkitgtk-2.12.1/Tools/ImageDiff/CMakeLists.txt
106@@ -14,7 +14,7 @@ set(IMAGE_DIFF_LIBRARIES
107 WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
108
109 include_directories(${IMAGE_DIFF_INCLUDE_DIRECTORIES})
110-include_directories(SYSTEM ${IMAGE_DIFF_SYSTEM_INCLUDE_DIRECTORIES})
111+include_directories(${IMAGE_DIFF_SYSTEM_INCLUDE_DIRECTORIES})
112 add_executable(ImageDiff ${IMAGE_DIFF_SOURCES})
113 target_link_libraries(ImageDiff ${IMAGE_DIFF_LIBRARIES})
114 set_target_properties(ImageDiff PROPERTIES FOLDER "Tools")
115Index: webkitgtk-2.12.1/Tools/MiniBrowser/gtk/CMakeLists.txt
116===================================================================
117--- webkitgtk-2.12.1.orig/Tools/MiniBrowser/gtk/CMakeLists.txt
118+++ webkitgtk-2.12.1/Tools/MiniBrowser/gtk/CMakeLists.txt
119@@ -55,7 +55,7 @@ endif ()
120 add_definitions(-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6)
121
122 include_directories(${MiniBrowser_INCLUDE_DIRECTORIES})
123-include_directories(SYSTEM ${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES})
124+include_directories(${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES})
125 add_executable(MiniBrowser ${MiniBrowser_SOURCES})
126 target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES})
127 set_target_properties(MiniBrowser PROPERTIES FOLDER "Tools")
128Index: 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 add_library(TestRunnerInjectedBundle SHARED ${WebKitTestRunnerInjectedBundle_SOURCES})
140 target_link_libraries(TestRunnerInjectedBundle ${WebKitTestRunner_LIBRARIES})
141Index: webkitgtk-2.12.1/Source/WebCore/PlatformGTK.cmake
142===================================================================
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
172Index: 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(
177 ${WEBKIT2_DIR}/UIProcess/API/gtk
178 )
179
180-include_directories(SYSTEM
181+include_directories(
182 ${GDK3_INCLUDE_DIRS}
183 ${GLIB_INCLUDE_DIRS}
184 ${GTK3_INCLUDE_DIRS}
185Index: webkitgtk-2.12.1/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt
186===================================================================
187--- webkitgtk-2.12.1.orig/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt
188+++ webkitgtk-2.12.1/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt
189@@ -23,7 +23,7 @@ include_directories(
190 ${TOOLS_DIR}/TestWebKitAPI/gtk/WebKit2Gtk
191 )
192
193-include_directories(SYSTEM
194+include_directories(
195 ${ATSPI_INCLUDE_DIRS}
196 ${GLIB_INCLUDE_DIRS}
197 ${GSTREAMER_INCLUDE_DIRS}
198Index: webkitgtk-2.12.1/Source/WebKit2/PlatformGTK.cmake
199===================================================================
200--- webkitgtk-2.12.1.orig/Source/WebKit2/PlatformGTK.cmake
201+++ webkitgtk-2.12.1/Source/WebKit2/PlatformGTK.cmake
202@@ -816,7 +816,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
203 target_include_directories(WebKitPluginProcess2 PRIVATE
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}
211Index: 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
217 WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES})
218 include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES})
219-include_directories(SYSTEM ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES})
220+include_directories(${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES})
221 add_executable(jsc ${JSC_SOURCES})
222 target_link_libraries(jsc ${JSC_LIBRARIES})
223 set_target_properties(jsc PROPERTIES FOLDER "JavaScriptCore")
diff --git a/meta/recipes-sato/webkit/files/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch b/meta/recipes-sato/webkit/files/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch
index 44b43cdbba..3f71297f50 100644
--- a/meta/recipes-sato/webkit/files/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch
+++ b/meta/recipes-sato/webkit/files/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch
@@ -13,28 +13,25 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
13 Source/WebKit2/PlatformGTK.cmake | 4 ++-- 13 Source/WebKit2/PlatformGTK.cmake | 4 ++--
14 1 file changed, 2 insertions(+), 2 deletions(-) 14 1 file changed, 2 insertions(+), 2 deletions(-)
15 15
16diff --git a/Source/WebKit2/PlatformGTK.cmake b/Source/WebKit2/PlatformGTK.cmake 16Index: webkitgtk-2.12.1/Source/WebKit2/PlatformGTK.cmake
17index 706f1e8..14a1c3b 100644 17===================================================================
18--- a/Source/WebKit2/PlatformGTK.cmake 18--- webkitgtk-2.12.1.orig/Source/WebKit2/PlatformGTK.cmake
19+++ b/Source/WebKit2/PlatformGTK.cmake 19+++ webkitgtk-2.12.1/Source/WebKit2/PlatformGTK.cmake
20@@ -884,7 +884,7 @@ add_custom_command( 20@@ -910,7 +910,7 @@ add_custom_command(
21 OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir 21 OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
22 DEPENDS WebKit2 22 DEPENDS WebKit2
23 DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir 23 DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
24- COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations LDFLAGS= 24- COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations LDFLAGS=
25+ COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS= 25+ COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS=
26 LD_LIBRARY_PATH="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" 26 ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
27 ${INTROSPECTION_SCANNER} 27 ${INTROSPECTION_SCANNER}
28 --quiet 28 --quiet
29@@ -930,7 +930,7 @@ add_custom_command( 29@@ -951,7 +951,7 @@ add_custom_command(
30 OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir 30 OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
31 DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir 31 DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
32 DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir 32 DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
33- COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations 33- COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations
34+ COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} 34+ COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS}
35 LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}" 35 LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}"
36 LD_LIBRARY_PATH="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" 36 ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
37 ${INTROSPECTION_SCANNER} 37 ${INTROSPECTION_SCANNER}
38--
392.6.4
40
diff --git a/meta/recipes-sato/webkit/files/musl-fixes.patch b/meta/recipes-sato/webkit/files/musl-fixes.patch
new file mode 100644
index 0000000000..4fdd56fea0
--- /dev/null
+++ b/meta/recipes-sato/webkit/files/musl-fixes.patch
@@ -0,0 +1,48 @@
1Replace __GLIBC__ with __linux__ since musl also supports it
2so checking __linux__ is more accomodating
3
4See http://git.alpinelinux.org/cgit/aports/tree/community/webkit2gtk/musl-fixes.patch?id=219435d86d7e8fac9474344a7431c62bd2525184
5
6Upstream-Status: Pending
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8
9Index: webkitgtk-2.12.1/Source/JavaScriptCore/heap/MachineStackMarker.cpp
10===================================================================
11--- webkitgtk-2.12.1.orig/Source/JavaScriptCore/heap/MachineStackMarker.cpp
12+++ webkitgtk-2.12.1/Source/JavaScriptCore/heap/MachineStackMarker.cpp
13@@ -566,7 +566,7 @@ void* MachineThreads::Thread::Registers:
14 #error Unknown Architecture
15 #endif
16
17-#elif defined(__GLIBC__) && ENABLE(JIT)
18+#elif defined(__linux__) && ENABLE(JIT)
19
20 #if CPU(X86)
21 return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_ESP]);
22@@ -665,7 +665,7 @@ void* MachineThreads::Thread::Registers:
23 #error Unknown Architecture
24 #endif
25
26-#elif defined(__GLIBC__)
27+#elif defined(__linux__) // glibc and musl
28
29 // The following sequence depends on glibc's sys/ucontext.h.
30 #if CPU(X86)
31@@ -747,7 +747,7 @@ void* MachineThreads::Thread::Registers:
32 #error Unknown Architecture
33 #endif
34
35-#elif defined(__GLIBC__)
36+#elif defined(__linux__) // glibc and musl
37
38 // The following sequence depends on glibc's sys/ucontext.h.
39 #if CPU(X86)
40@@ -838,7 +838,7 @@ void* MachineThreads::Thread::Registers:
41 #error Unknown Architecture
42 #endif
43
44-#elif defined(__GLIBC__)
45+#elif defined(__linux__) // glibc and musl
46
47 // The following sequence depends on glibc's sys/ucontext.h.
48 #if CPU(X86)
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Enable-backtrace-on-linux-when-using-glibc.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Enable-backtrace-on-linux-when-using-glibc.patch
deleted file mode 100644
index d7e4ef6263..0000000000
--- a/meta/recipes-sato/webkit/webkitgtk/0001-Enable-backtrace-on-linux-when-using-glibc.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From 0b68ad206d2d90df78d91cad4da19152084014cf Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 16 Sep 2015 05:15:04 +0000
4Subject: [PATCH] Enable backtrace on linux when using glibc
5
6We dont have backtrace() implemented on non-glibc libc's on linux
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10Upstream-Status: Accepted
11
12 Source/WTF/wtf/Assertions.cpp | 4 ++--
13 1 file changed, 2 insertions(+), 2 deletions(-)
14
15diff --git a/Source/WTF/wtf/Assertions.cpp b/Source/WTF/wtf/Assertions.cpp
16index 191d53f..a4d86b5 100644
17--- a/Source/WTF/wtf/Assertions.cpp
18+++ b/Source/WTF/wtf/Assertions.cpp
19@@ -68,7 +68,7 @@
20 #include <unistd.h>
21 #endif
22
23-#if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))
24+#if OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))
25 #include <cxxabi.h>
26 #include <dlfcn.h>
27 #include <execinfo.h>
28@@ -225,7 +225,7 @@ void WTFReportArgumentAssertionFailure(const char* file, int line, const char* f
29
30 void WTFGetBacktrace(void** stack, int* size)
31 {
32-#if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))
33+#if OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))
34 *size = backtrace(stack, *size);
35 #elif OS(WINDOWS)
36 // The CaptureStackBackTrace function is available in XP, but it is not defined
37--
382.5.2
39
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-non-glibc-libraries-on-linux.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-non-glibc-libraries-on-linux.patch
deleted file mode 100644
index 77ebf37efa..0000000000
--- a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-non-glibc-libraries-on-linux.patch
+++ /dev/null
@@ -1,61 +0,0 @@
1From 30e2ef302a329850ba55c7c458c98cbf396186ec Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 31 Dec 2015 21:47:34 +0000
4Subject: [PATCH] Fix build with non-glibc libraries on linux
5
6qualify isnan() calls with std namespace
7malloc_trim is glibc specific API so guard it with __GLIBC__
8let ctype be used on non-glibc ( musl ) C library
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12Upstream-Status: Accepted
13
14 Source/JavaScriptCore/runtime/Options.cpp | 2 +-
15 Source/WTF/wtf/DisallowCType.h | 2 +-
16 Source/WebCore/platform/linux/MemoryPressureHandlerLinux.cpp | 2 ++
17 3 files changed, 4 insertions(+), 2 deletions(-)
18
19diff --git a/Source/JavaScriptCore/runtime/Options.cpp b/Source/JavaScriptCore/runtime/Options.cpp
20index fe830b4..c49aade 100644
21--- a/Source/JavaScriptCore/runtime/Options.cpp
22+++ b/Source/JavaScriptCore/runtime/Options.cpp
23@@ -610,7 +610,7 @@ bool Option::operator==(const Option& other) const
24 case Options::Type::unsignedType:
25 return m_entry.unsignedVal == other.m_entry.unsignedVal;
26 case Options::Type::doubleType:
27- return (m_entry.doubleVal == other.m_entry.doubleVal) || (isnan(m_entry.doubleVal) && isnan(other.m_entry.doubleVal));
28+ return (m_entry.doubleVal == other.m_entry.doubleVal) || (std::isnan(m_entry.doubleVal) && std::isnan(other.m_entry.doubleVal));
29 case Options::Type::int32Type:
30 return m_entry.int32Val == other.m_entry.int32Val;
31 case Options::Type::optionRangeType:
32diff --git a/Source/WTF/wtf/DisallowCType.h b/Source/WTF/wtf/DisallowCType.h
33index d85e767..dc6bcab 100644
34--- a/Source/WTF/wtf/DisallowCType.h
35+++ b/Source/WTF/wtf/DisallowCType.h
36@@ -40,7 +40,7 @@
37 // are used from wx headers. On GTK+ for Mac many GTK+ files include <libintl.h>
38 // or <glib/gi18n-lib.h>, which in turn include <xlocale/_ctype.h> which uses
39 // isacii().
40-#if !(OS(DARWIN) && PLATFORM(GTK)) && !PLATFORM(EFL) && !defined(_LIBCPP_VERSION)
41+#if !(OS(DARWIN) && PLATFORM(GTK)) && !PLATFORM(EFL) && !defined(_LIBCPP_VERSION) && defined(__GLIBC__)
42
43 #include <ctype.h>
44
45diff --git a/Source/WebCore/platform/linux/MemoryPressureHandlerLinux.cpp b/Source/WebCore/platform/linux/MemoryPressureHandlerLinux.cpp
46index ea61909..1495642 100644
47--- a/Source/WebCore/platform/linux/MemoryPressureHandlerLinux.cpp
48+++ b/Source/WebCore/platform/linux/MemoryPressureHandlerLinux.cpp
49@@ -202,7 +202,9 @@ void MemoryPressureHandler::respondToMemoryPressure(Critical critical, Synchrono
50 void MemoryPressureHandler::platformReleaseMemory(Critical)
51 {
52 ReliefLogger log("Run malloc_trim");
53+#ifdef __GLIBC__
54 malloc_trim(0);
55+#endif
56 }
57
58 void MemoryPressureHandler::ReliefLogger::platformLog()
59--
602.6.4
61
diff --git a/meta/recipes-sato/webkit/webkitgtk/clang.patch b/meta/recipes-sato/webkit/webkitgtk/clang.patch
deleted file mode 100644
index e5267138bf..0000000000
--- a/meta/recipes-sato/webkit/webkitgtk/clang.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1Clang's builtin for clear_cache accepts char* and errors out when using void*,
2using char* work on both gcc and clang since char* is auto-converted to void* in gcc case
3
4Source/JavaScriptCore/assembler/ARM64Assembler.h:2857:33: error: cannot initialize a parameter of type 'char *' with an rvalue of type 'void *'
5 __builtin___clear_cache(reinterpret_cast<void*>(begin), reinterpret_cast<void*>(end));
6 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
71 error generated.
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10
11Upstream-Status: Accepted
12
13Index: webkitgtk-2.8.5/Source/JavaScriptCore/assembler/ARM64Assembler.h
14===================================================================
15--- webkitgtk-2.8.5.orig/Source/JavaScriptCore/assembler/ARM64Assembler.h
16+++ webkitgtk-2.8.5/Source/JavaScriptCore/assembler/ARM64Assembler.h
17@@ -2854,7 +2854,7 @@ public:
18 #if OS(LINUX) && COMPILER(GCC)
19 static inline void linuxPageFlush(uintptr_t begin, uintptr_t end)
20 {
21- __builtin___clear_cache(reinterpret_cast<void*>(begin), reinterpret_cast<void*>(end));
22+ __builtin___clear_cache(reinterpret_cast<char*>(begin), reinterpret_cast<char*>(end));
23 }
24 #endif
25
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.10.7.bb b/meta/recipes-sato/webkit/webkitgtk_2.12.1.bb
index 269ae4b5e0..bdbcbeabbf 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.10.7.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.12.1.bb
@@ -12,15 +12,14 @@ LIC_FILES_CHKSUM = "file://Source/JavaScriptCore/COPYING.LIB;md5=d0c6d6397a5d842
12 12
13SRC_URI = "\ 13SRC_URI = "\
14 http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ 14 http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
15 file://clang.patch \
16 file://0001-Enable-backtrace-on-linux-when-using-glibc.patch \
17 file://0001-Fix-build-with-non-glibc-libraries-on-linux.patch \
18 file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \ 15 file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \
19 file://0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch \ 16 file://0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch \
20 file://0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch \ 17 file://0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch \
18 file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \
19 file://musl-fixes.patch \
21 " 20 "
22SRC_URI[md5sum] = "84832b9d8329413b4f1d87df5f7e8efe" 21SRC_URI[md5sum] = "adcbee440d81acfb1ead9ada91bd5e79"
23SRC_URI[sha256sum] = "990d62c82ed6dede31a6ff0a82d847f16b812842ff3e1093d17113627652864e" 22SRC_URI[sha256sum] = "5b1a2d5227553f3cecbdb258c68b384f9235747b2c07c15afb555fe4fa6ae896"
24 23
25inherit cmake lib_package pkgconfig perlnative pythonnative distro_features_check upstream-version-is-even gobject-introspection 24inherit cmake lib_package pkgconfig perlnative pythonnative distro_features_check upstream-version-is-even gobject-introspection
26 25
@@ -75,6 +74,9 @@ EXTRA_OECMAKE_append_aarch64 = " -DUSE_LD_GOLD=OFF "
75EXTRA_OECMAKE_append_mips = " -DENABLE_JIT=OFF " 74EXTRA_OECMAKE_append_mips = " -DENABLE_JIT=OFF "
76EXTRA_OECMAKE_append_mips64 = " -DENABLE_JIT=OFF " 75EXTRA_OECMAKE_append_mips64 = " -DENABLE_JIT=OFF "
77 76
77SECURITY_CFLAGS_remove_aarch64 = "-fpie"
78SECURITY_CFLAGS_append_aarch64 = " -fPIE"
79
78FILES_${PN} += "${libdir}/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so" 80FILES_${PN} += "${libdir}/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so"
79 81
80# http://errors.yoctoproject.org/Errors/Details/20370/ 82# http://errors.yoctoproject.org/Errors/Details/20370/
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-14 17:30:27 +0000