summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/webkit/files
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-sato/webkit/files')
-rw-r--r--meta/recipes-sato/webkit/files/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch27
-rw-r--r--meta/recipes-sato/webkit/files/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch48
-rw-r--r--meta/recipes-sato/webkit/files/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch32
-rw-r--r--meta/recipes-sato/webkit/files/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch49
-rw-r--r--meta/recipes-sato/webkit/files/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch185
-rw-r--r--meta/recipes-sato/webkit/files/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch37
-rw-r--r--meta/recipes-sato/webkit/files/cross-compile.patch23
-rw-r--r--meta/recipes-sato/webkit/files/detect_atomics.patch38
-rw-r--r--meta/recipes-sato/webkit/files/musl-fixes.patch48
-rw-r--r--meta/recipes-sato/webkit/files/ppc-musl-fix.patch26
10 files changed, 0 insertions, 513 deletions
diff --git a/meta/recipes-sato/webkit/files/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch b/meta/recipes-sato/webkit/files/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch
deleted file mode 100644
index fae3b0b2e5..0000000000
--- a/meta/recipes-sato/webkit/files/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1From 317a5ac120c44987219bc03486cd2f2d1842c9b9 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 27 Oct 2015 16:02:19 +0200
4Subject: [PATCH] FindGObjectIntrospection.cmake: prefix variables obtained
5 from pkg-config with PKG_CONFIG_SYSROOT_DIR
6
7Upstream-Status: Pending [review on oe-core list]
8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
9---
10 Source/cmake/FindGObjectIntrospection.cmake | 1 +
11 1 file changed, 1 insertion(+)
12
13diff --git a/Source/cmake/FindGObjectIntrospection.cmake b/Source/cmake/FindGObjectIntrospection.cmake
14index e1f49b4..03a4446 100644
15--- a/Source/cmake/FindGObjectIntrospection.cmake
16+++ b/Source/cmake/FindGObjectIntrospection.cmake
17@@ -26,6 +26,7 @@ macro(_GIR_GET_PKGCONFIG_VAR _outvar _varname _extra_args)
18 else ()
19 string(REGEX REPLACE "[\r\n]" " " _result "${_result}")
20 string(REGEX REPLACE " +$" "" _result "${_result}")
21+ string(CONCAT _result $ENV{PKG_CONFIG_SYSROOT_DIR} "${_result}")
22 separate_arguments(_result)
23 set(${_outvar} ${_result} CACHE INTERNAL "")
24 endif ()
25--
262.1.4
27
diff --git a/meta/recipes-sato/webkit/files/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch b/meta/recipes-sato/webkit/files/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch
deleted file mode 100644
index 615fe4f402..0000000000
--- a/meta/recipes-sato/webkit/files/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch
+++ /dev/null
@@ -1,48 +0,0 @@
1From 5760d346b42807b596f479c81f7a6b42eb36065e Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Mon, 29 Aug 2016 16:38:11 +0300
4Subject: [PATCH] Fix racy parallel build of WebKit2-4.0.gir
5
6Upstream-Status: Pending
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8---
9 Source/WebKit2/PlatformGTK.cmake | 9 +++++----
10 1 file changed, 5 insertions(+), 4 deletions(-)
11
12diff --git a/Source/WebKit2/PlatformGTK.cmake b/Source/WebKit2/PlatformGTK.cmake
13index adaa010..f18cf8a 100644
14--- a/Source/WebKit2/PlatformGTK.cmake
15+++ b/Source/WebKit2/PlatformGTK.cmake
16@@ -906,8 +906,9 @@ endif ()
17 string(REGEX MATCHALL "-L[^ ]*"
18 INTROSPECTION_ADDITIONAL_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
19
20-add_custom_command(
21- OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
22+# This is a target and not a command because it's used to build another .gir
23+# and a .typelib, which would trigger two racy parallel builds when using command
24+add_custom_target(WebKit2-${WEBKITGTK_API_VERSION}-gir
25 DEPENDS WebKit2
26 DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
27 COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS=
28@@ -950,7 +951,7 @@ add_custom_command(
29 add_custom_command(
30 OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
31 DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
32- DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
33+ DEPENDS WebKit2-${WEBKITGTK_API_VERSION}-gir
34 COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS}
35 LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}"
36 ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
37@@ -1004,7 +1005,7 @@ add_custom_command(
38
39 add_custom_command(
40 OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib
41- DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
42+ DEPENDS WebKit2-${WEBKITGTK_API_VERSION}-gir
43 COMMAND ${INTROSPECTION_COMPILER} --includedir=${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir -o ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib
44 )
45
46--
472.9.3
48
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
deleted file mode 100644
index 93a69c0292..0000000000
--- a/meta/recipes-sato/webkit/files/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From 48648570e449cf7f84a26dc03c1e3f620fa69757 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Mon, 29 Feb 2016 18:13:39 +0200
4Subject: [PATCH] OptionsGTK.cmake: drop the hardcoded introspection/gtkdoc
5 disabling when cross-compiling
6
7This was not possible to override from the command line and in OpenEmbedded
8(one of the most prominent cross-compilation frameworks) introspection does work fine,
9through the use of qemu target emulation.
10
11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12---
13 Source/cmake/OptionsGTK.cmake | 6 ------
14 1 file changed, 6 deletions(-)
15
16Index: webkitgtk-2.12.1/Source/cmake/OptionsGTK.cmake
17===================================================================
18--- webkitgtk-2.12.1.orig/Source/cmake/OptionsGTK.cmake
19+++ webkitgtk-2.12.1/Source/cmake/OptionsGTK.cmake
20@@ -424,12 +424,6 @@ if (USE_LIBHYPHEN)
21 endif ()
22 endif ()
23
24-# Override the cached variables, gtk-doc and gobject-introspection do not really work when cross-building.
25-if (CMAKE_CROSSCOMPILING)
26- set(ENABLE_GTKDOC OFF)
27- set(ENABLE_INTROSPECTION OFF)
28-endif ()
29-
30 # Override the cached variable, gtk-doc does not really work when building on Mac.
31 if (APPLE)
32 set(ENABLE_GTKDOC OFF)
diff --git a/meta/recipes-sato/webkit/files/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch b/meta/recipes-sato/webkit/files/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch
deleted file mode 100644
index 586dd2375c..0000000000
--- a/meta/recipes-sato/webkit/files/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1From 4eeeaec775e190cf3f5885d7c6717acebd0201a8 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 11 Aug 2016 17:13:51 +0300
4Subject: [PATCH] Tweak gtkdoc settings so that gtkdoc generation works under
5 OpenEmbedded build system
6
7This requires setting a few environment variables so that the transient
8binary is build and linked correctly, and disabling the tweaks to RUN
9variable from gtkdoc.py script so that our qemu wrapper is taken into use.
10
11Upstream-Status: Inappropriate [oe-specific]
12Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
13---
14 Source/PlatformGTK.cmake | 2 +-
15 Tools/gtk/gtkdoc.py | 4 ++--
16 2 files changed, 3 insertions(+), 3 deletions(-)
17
18diff --git a/Source/PlatformGTK.cmake b/Source/PlatformGTK.cmake
19index af4d2e3..b7b93c7 100644
20--- a/Source/PlatformGTK.cmake
21+++ b/Source/PlatformGTK.cmake
22@@ -25,7 +25,7 @@ macro(ADD_GTKDOC_GENERATOR _stamp_name _extra_args)
23 add_custom_command(
24 OUTPUT "${CMAKE_BINARY_DIR}/${_stamp_name}"
25 DEPENDS ${DocumentationDependencies}
26- COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=${CMAKE_C_FLAGS} ${CMAKE_SOURCE_DIR}/Tools/gtk/generate-gtkdoc ${_extra_args}
27+ COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=${CMAKE_C_FLAGS} LD=${CMAKE_C_COMPILER} LDFLAGS=${CMAKE_C_LINK_FLAGS} RUN=${CMAKE_BINARY_DIR}/gtkdoc-qemuwrapper GIR_EXTRA_LIBS_PATH=${CMAKE_BINARY_DIR}/lib ${CMAKE_SOURCE_DIR}/Tools/gtk/generate-gtkdoc ${_extra_args}
28 COMMAND touch ${_stamp_name}
29 WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
30 )
31diff --git a/Tools/gtk/gtkdoc.py b/Tools/gtk/gtkdoc.py
32index 4c8237b..c0205f0 100644
33--- a/Tools/gtk/gtkdoc.py
34+++ b/Tools/gtk/gtkdoc.py
35@@ -318,9 +318,9 @@ class GTKDoc(object):
36 additional_ldflags = '%s %s' % (additional_ldflags, arg)
37 ldflags = ' "-L%s" %s ' % (self.library_path, additional_ldflags) + ldflags
38 current_ld_library_path = env.get('LD_LIBRARY_PATH')
39- if current_ld_library_path:
40+ if current_ld_library_path and 'RUN' not in env:
41 env['RUN'] = 'LD_LIBRARY_PATH="%s:%s" ' % (self.library_path, current_ld_library_path)
42- else:
43+ elif 'RUN' not in env:
44 env['RUN'] = 'LD_LIBRARY_PATH="%s" ' % self.library_path
45
46 if ldflags:
47--
482.8.1
49
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 @@
1From 20ee11dd188e1538f8cdd17a289dc6f9c63a011e 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
17This is also an issue with clang (when using libstdc++ >= 6)
18
19Upstream bug: https://bugs.webkit.org/show_bug.cgi?id=161697
20
21Signed-off-by: Khem Raj <raj.khem@gmail.com>
22Upstream-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
36diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt
37index 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
49diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake
50index 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
80diff --git a/Source/WebKit2/PlatformGTK.cmake b/Source/WebKit2/PlatformGTK.cmake
81index 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}
93diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake
94index 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}
106diff --git a/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt b/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt
107index 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}
119diff --git a/Tools/ImageDiff/CMakeLists.txt b/Tools/ImageDiff/CMakeLists.txt
120index 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})
131diff --git a/Tools/MiniBrowser/gtk/CMakeLists.txt b/Tools/MiniBrowser/gtk/CMakeLists.txt
132index 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
144diff --git a/Tools/TestWebKitAPI/PlatformGTK.cmake b/Tools/TestWebKitAPI/PlatformGTK.cmake
145index 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}
157diff --git a/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt b/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt
158index 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}
170diff --git a/Tools/WebKitTestRunner/CMakeLists.txt b/Tools/WebKitTestRunner/CMakeLists.txt
171index 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--
1842.9.3
185
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
deleted file mode 100644
index 3f71297f50..0000000000
--- a/meta/recipes-sato/webkit/files/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1From bae9f73b2c693b5aa156fed717d6481b60682786 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 28 Oct 2015 14:18:57 +0200
4Subject: [PATCH] When building introspection files, add CMAKE_C_FLAGS to the
5 compiler flags.
6
7g-ir-compiler is using a C compiler internally, so it needs to set
8the proper flags for it.
9
10Upstream-Status: Pending [review on oe-core list]
11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12---
13 Source/WebKit2/PlatformGTK.cmake | 4 ++--
14 1 file changed, 2 insertions(+), 2 deletions(-)
15
16Index: webkitgtk-2.12.1/Source/WebKit2/PlatformGTK.cmake
17===================================================================
18--- webkitgtk-2.12.1.orig/Source/WebKit2/PlatformGTK.cmake
19+++ webkitgtk-2.12.1/Source/WebKit2/PlatformGTK.cmake
20@@ -910,7 +910,7 @@ add_custom_command(
21 OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
22 DEPENDS WebKit2
23 DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
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=
26 ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
27 ${INTROSPECTION_SCANNER}
28 --quiet
29@@ -951,7 +951,7 @@ add_custom_command(
30 OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
31 DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
32 DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
33- COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations
34+ COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS}
35 LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}"
36 ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
37 ${INTROSPECTION_SCANNER}
diff --git a/meta/recipes-sato/webkit/files/cross-compile.patch b/meta/recipes-sato/webkit/files/cross-compile.patch
deleted file mode 100644
index 4d1de72851..0000000000
--- a/meta/recipes-sato/webkit/files/cross-compile.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1Disable the tests meant to run when compiling natively
2
3Upstream-Status: Pending
4Signed-off-by: Khem Raj <raj.khem@gmail.com>
5
6Index: webkitgtk-2.14.5/Source/cmake/OptionsCommon.cmake
7===================================================================
8--- webkitgtk-2.14.5.orig/Source/cmake/OptionsCommon.cmake
9+++ webkitgtk-2.14.5/Source/cmake/OptionsCommon.cmake
10@@ -67,8 +67,11 @@ endif ()
11 # Detect Cortex-A53 core if CPU is ARM64 and OS is Linux.
12 # Query /proc/cpuinfo for each available core and check reported CPU part number: 0xd03 signals Cortex-A53.
13 # (see Main ID Register in ARM Cortex-A53 MPCore Processor Technical Reference Manual)
14-set(WTF_CPU_ARM64_CORTEXA53_INITIALVALUE OFF)
15-if (WTF_CPU_ARM64 AND (${CMAKE_SYSTEM_NAME} STREQUAL "Linux"))
16+if( NOT WTF_CPU_ARM64_CORTEXA53_INITIALVALUE)
17+ set(WTF_CPU_ARM64_CORTEXA53_INITIALVALUE OFF)
18+endif(WTF_CPU_ARM64_CORTEXA53_INITIALVALUE)
19+
20+if (WTF_CPU_ARM64 AND NOT CMAKE_CROSSCOMPILING AND (${CMAKE_SYSTEM_NAME} STREQUAL "Linux"))
21 execute_process(COMMAND nproc OUTPUT_VARIABLE PROC_COUNT)
22 math(EXPR PROC_MAX ${PROC_COUNT}-1)
23 foreach (PROC_ID RANGE ${PROC_MAX})
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 @@
1Sourced from https://bugs.webkit.org/show_bug.cgi?id=161900
2
3on 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
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8
9Upstream-Status: Backport
10
11diff --git a/Source/WTF/wtf/CMakeLists.txt b/Source/WTF/wtf/CMakeLists.txt
12index 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/musl-fixes.patch b/meta/recipes-sato/webkit/files/musl-fixes.patch
deleted file mode 100644
index 4fdd56fea0..0000000000
--- a/meta/recipes-sato/webkit/files/musl-fixes.patch
+++ /dev/null
@@ -1,48 +0,0 @@
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/files/ppc-musl-fix.patch b/meta/recipes-sato/webkit/files/ppc-musl-fix.patch
deleted file mode 100644
index 5f58e4953e..0000000000
--- a/meta/recipes-sato/webkit/files/ppc-musl-fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1ucontext structure is different between musl and glibc for ppc
2therefore its not enough just to check for arch alone, we also
3need to check for libc type.
4
5Fixes errors like
6
7Source/JavaScriptCore/heap/MachineStackMarker.cpp:90:65: error: 'struct mcontext_t' has no member named 'uc_regs'; did you mean 'gregs'?
8 thread->suspendedMachineContext = *userContext->uc_mcontext.uc_regs;
9
10Upstream-Status: Pending
11
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13
14Index: webkitgtk-2.12.3/Source/JavaScriptCore/heap/MachineStackMarker.cpp
15===================================================================
16--- webkitgtk-2.12.3.orig/Source/JavaScriptCore/heap/MachineStackMarker.cpp
17+++ webkitgtk-2.12.3/Source/JavaScriptCore/heap/MachineStackMarker.cpp
18@@ -86,7 +86,7 @@ static void pthreadSignalHandlerSuspendR
19 }
20
21 ucontext_t* userContext = static_cast<ucontext_t*>(ucontext);
22-#if CPU(PPC)
23+#if CPU(PPC) && defined(__GLIBC__)
24 thread->suspendedMachineContext = *userContext->uc_mcontext.uc_regs;
25 #else
26 thread->suspendedMachineContext = userContext->uc_mcontext;
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 07:35:03 +0000