summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/webkit
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-04-15 12:54:41 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-04-16 11:10:02 +0100
commit3832e64a66af384d5f53139fce40065ccc0e5227 (patch)
tree1427eb83b485de55ef11cba6273c4f547d6b3ec9 /meta/recipes-sato/webkit
parentfb757997883e7f877ef335f464f789c0fb84c2dc (diff)
downloadpoky-3832e64a66af384d5f53139fce40065ccc0e5227.tar.gz
webkitgtk: update to 2.24.0
Drop bad_optional_access.patch, as the code it tweaks has been removed upstream. Rebase other patches. Add an option for jpeg2000 support. (From OE-Core rev: 628e1935431207cbb8ef3e44637f9ad462eea133) Signed-off-by: Alexander Kanavin <alex.kanavin@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/webkitgtk/0001-Fix-build-with-musl.patch12
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch37
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch32
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/bad_optional_access.patch35
-rw-r--r--meta/recipes-sato/webkit/webkitgtk_2.24.0.bb (renamed from meta/recipes-sato/webkit/webkitgtk_2.22.7.bb)6
5 files changed, 42 insertions, 80 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch
index d9a18e0ce9..0c145c7ebd 100644
--- a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch
@@ -1,4 +1,4 @@
1From 322966273a8e085829261a397af37de0fbf51aad Mon Sep 17 00:00:00 2001 1From c4d4d9f1aa74addefdad40294cf16d9e0b3dd6ec Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 6 Oct 2017 17:00:08 +0300 3Date: Fri, 6 Oct 2017 17:00:08 +0300
4Subject: [PATCH] Fix build with musl 4Subject: [PATCH] Fix build with musl
@@ -12,7 +12,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12 2 files changed, 6 insertions(+), 6 deletions(-) 12 2 files changed, 6 insertions(+), 6 deletions(-)
13 13
14diff --git a/Source/JavaScriptCore/runtime/MachineContext.h b/Source/JavaScriptCore/runtime/MachineContext.h 14diff --git a/Source/JavaScriptCore/runtime/MachineContext.h b/Source/JavaScriptCore/runtime/MachineContext.h
15index 836d755..7665d25 100644 15index 823964c2..00841146 100644
16--- a/Source/JavaScriptCore/runtime/MachineContext.h 16--- a/Source/JavaScriptCore/runtime/MachineContext.h
17+++ b/Source/JavaScriptCore/runtime/MachineContext.h 17+++ b/Source/JavaScriptCore/runtime/MachineContext.h
18@@ -188,7 +188,7 @@ static inline void*& stackPointerImpl(mcontext_t& machineContext) 18@@ -188,7 +188,7 @@ static inline void*& stackPointerImpl(mcontext_t& machineContext)
@@ -61,12 +61,12 @@ index 836d755..7665d25 100644
61 // The following sequence depends on glibc's sys/ucontext.h. 61 // The following sequence depends on glibc's sys/ucontext.h.
62 #if CPU(X86) 62 #if CPU(X86)
63diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h 63diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
64index a841946..1e5c7dd 100644 64index 34f7cb14..32ad9150 100644
65--- a/Source/WTF/wtf/Platform.h 65--- a/Source/WTF/wtf/Platform.h
66+++ b/Source/WTF/wtf/Platform.h 66+++ b/Source/WTF/wtf/Platform.h
67@@ -701,7 +701,7 @@ 67@@ -714,7 +714,7 @@
68 #define HAVE_CFNETWORK_STORAGE_PARTITIONING 1 68
69 #endif 69 #endif /* OS(DARWIN) */
70 70
71-#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) 71-#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
72+#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__linux__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) 72+#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__linux__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
diff --git a/meta/recipes-sato/webkit/webkitgtk/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 83fd5129a0..664cea9c75 100644
--- a/meta/recipes-sato/webkit/webkitgtk/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
@@ -1,8 +1,8 @@
1From 9b09974003097c9a408bbeea568996768efe705b Mon Sep 17 00:00:00 2001 1From d3796ad1a19233ee5d3492a5560d7ede882f89cf Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 11 Aug 2016 17:13:51 +0300 3Date: Thu, 11 Aug 2016 17:13:51 +0300
4Subject: [PATCH 05/10] Tweak gtkdoc settings so that gtkdoc generation works 4Subject: [PATCH] Tweak gtkdoc settings so that gtkdoc generation works under
5 under OpenEmbedded build system 5 OpenEmbedded build system
6 6
7This requires setting a few environment variables so that the transient 7This requires setting a few environment variables so that the transient
8binary is build and linked correctly, and disabling the tweaks to RUN 8binary is build and linked correctly, and disabling the tweaks to RUN
@@ -12,28 +12,28 @@ Upstream-Status: Inappropriate [oe-specific]
12Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 12Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
13 13
14--- 14---
15 Source/PlatformGTK.cmake | 2 +- 15 Source/cmake/GtkDoc.cmake | 2 +-
16 Tools/gtk/gtkdoc.py | 4 ++-- 16 Tools/gtkdoc/gtkdoc.py | 4 ++--
17 2 files changed, 3 insertions(+), 3 deletions(-) 17 2 files changed, 3 insertions(+), 3 deletions(-)
18 18
19diff --git a/Source/PlatformGTK.cmake b/Source/PlatformGTK.cmake 19diff --git a/Source/cmake/GtkDoc.cmake b/Source/cmake/GtkDoc.cmake
20index 50b5393..7a31db5 100644 20index 2ee05550..6cb6313d 100644
21--- a/Source/PlatformGTK.cmake 21--- a/Source/cmake/GtkDoc.cmake
22+++ b/Source/PlatformGTK.cmake 22+++ b/Source/cmake/GtkDoc.cmake
23@@ -24,7 +24,7 @@ macro(ADD_GTKDOC_GENERATOR _stamp_name _extra_args) 23@@ -4,7 +4,7 @@ macro(ADD_GTKDOC_GENERATOR _stamp_name _extra_args)
24 add_custom_command( 24 add_custom_command(
25 OUTPUT "${CMAKE_BINARY_DIR}/${_stamp_name}" 25 OUTPUT "${CMAKE_BINARY_DIR}/${_stamp_name}"
26 DEPENDS ${DocumentationDependencies} 26 DEPENDS ${DocumentationDependencies}
27- COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" "CFLAGS=${CMAKE_C_FLAGS} -Wno-unused-parameter" ${CMAKE_SOURCE_DIR}/Tools/gtk/generate-gtkdoc ${_extra_args} 27- COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" "CFLAGS=${CMAKE_C_FLAGS} -Wno-unused-parameter" ${CMAKE_SOURCE_DIR}/Tools/gtkdoc/generate-gtkdoc ${_extra_args}
28+ COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" "CFLAGS=${CMAKE_C_FLAGS} -Wno-unused-parameter" "LD=${CMAKE_C_COMPILER}" "LDFLAGS=${CMAKE_C_LINK_FLAGS}" "RUN=${CMAKE_BINARY_DIR}/gtkdoc-qemuwrapper" ${CMAKE_SOURCE_DIR}/Tools/gtk/generate-gtkdoc -v ${_extra_args} 28+ COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" "CFLAGS=${CMAKE_C_FLAGS} -Wno-unused-parameter" "LD=${CMAKE_C_COMPILER}" "LDFLAGS=${CMAKE_C_LINK_FLAGS}" "RUN=${CMAKE_BINARY_DIR}/gtkdoc-qemuwrapper" ${CMAKE_SOURCE_DIR}/Tools/gtkdoc/generate-gtkdoc ${_extra_args}
29 COMMAND touch ${_stamp_name} 29 COMMAND touch ${_stamp_name}
30 WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" 30 WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
31 VERBATIM 31 VERBATIM
32diff --git a/Tools/gtk/gtkdoc.py b/Tools/gtk/gtkdoc.py 32diff --git a/Tools/gtkdoc/gtkdoc.py b/Tools/gtkdoc/gtkdoc.py
33index 03c8e8e..34fbaff 100644 33index 81ee8cdc..3e11c2f0 100644
34--- a/Tools/gtk/gtkdoc.py 34--- a/Tools/gtkdoc/gtkdoc.py
35+++ b/Tools/gtk/gtkdoc.py 35+++ b/Tools/gtkdoc/gtkdoc.py
36@@ -318,9 +318,9 @@ class GTKDoc(object): 36@@ -317,9 +317,9 @@ class GTKDoc(object):
37 additional_ldflags = '%s %s' % (additional_ldflags, arg) 37 additional_ldflags = '%s %s' % (additional_ldflags, arg)
38 ldflags = ' "-L%s" %s ' % (self.library_path, additional_ldflags) + ldflags 38 ldflags = ' "-L%s" %s ' % (self.library_path, additional_ldflags) + ldflags
39 current_ld_library_path = env.get('LD_LIBRARY_PATH') 39 current_ld_library_path = env.get('LD_LIBRARY_PATH')
@@ -45,6 +45,3 @@ index 03c8e8e..34fbaff 100644
45 env['LD_LIBRARY_PATH'] = self.library_path 45 env['LD_LIBRARY_PATH'] = self.library_path
46 46
47 if ldflags: 47 if ldflags:
48--
492.15.1
50
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch b/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch
index b31026448c..e71905d26a 100644
--- a/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch
@@ -1,4 +1,4 @@
1From e1c6540f7984bd48e1e2d80d965fa82c70de3c20 Mon Sep 17 00:00:00 2001 1From d1634e56a2589ec62325011bf77d480a67123b52 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 17 Apr 2016 12:35:41 -0700 3Date: Sun, 17 Apr 2016 12:35:41 -0700
4Subject: [PATCH] WebKitMacros: Append to -I and not to -isystem 4Subject: [PATCH] WebKitMacros: Append to -I and not to -isystem
@@ -28,10 +28,10 @@ Upstream-Status: Pending
28 6 files changed, 8 insertions(+), 8 deletions(-) 28 6 files changed, 8 insertions(+), 8 deletions(-)
29 29
30diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt 30diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt
31index b3c7e0b..88446de 100644 31index 87153e35..cd0beed4 100644
32--- a/Source/JavaScriptCore/shell/CMakeLists.txt 32--- a/Source/JavaScriptCore/shell/CMakeLists.txt
33+++ b/Source/JavaScriptCore/shell/CMakeLists.txt 33+++ b/Source/JavaScriptCore/shell/CMakeLists.txt
34@@ -35,7 +35,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() 34@@ -36,7 +36,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
35 WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES}) 35 WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES})
36 WEBKIT_WRAP_SOURCELIST(${TESTAPI_SOURCES}) 36 WEBKIT_WRAP_SOURCELIST(${TESTAPI_SOURCES})
37 include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES} ${JavaScriptCore_PRIVATE_INCLUDE_DIRECTORIES}) 37 include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES} ${JavaScriptCore_PRIVATE_INCLUDE_DIRECTORIES})
@@ -41,10 +41,10 @@ index b3c7e0b..88446de 100644
41 target_link_libraries(jsc ${JSC_LIBRARIES}) 41 target_link_libraries(jsc ${JSC_LIBRARIES})
42 42
43diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake 43diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake
44index f7d8d70a..3c27b8bc 100644 44index e0dd9cd9..a2997f3e 100644
45--- a/Source/WebCore/PlatformGTK.cmake 45--- a/Source/WebCore/PlatformGTK.cmake
46+++ b/Source/WebCore/PlatformGTK.cmake 46+++ b/Source/WebCore/PlatformGTK.cmake
47@@ -157,7 +157,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2) 47@@ -164,7 +164,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
48 target_include_directories(WebCorePlatformGTK2 PRIVATE 48 target_include_directories(WebCorePlatformGTK2 PRIVATE
49 ${WebCore_INCLUDE_DIRECTORIES} 49 ${WebCore_INCLUDE_DIRECTORIES}
50 ) 50 )
@@ -53,7 +53,7 @@ index f7d8d70a..3c27b8bc 100644
53 ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} 53 ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
54 ${GTK2_INCLUDE_DIRS} 54 ${GTK2_INCLUDE_DIRS}
55 ${GDK2_INCLUDE_DIRS} 55 ${GDK2_INCLUDE_DIRS}
56@@ -183,7 +183,7 @@ add_dependencies(WebCorePlatformGTK WebCore) 56@@ -190,7 +190,7 @@ add_dependencies(WebCorePlatformGTK WebCore)
57 target_include_directories(WebCorePlatformGTK PRIVATE 57 target_include_directories(WebCorePlatformGTK PRIVATE
58 ${WebCore_INCLUDE_DIRECTORIES} 58 ${WebCore_INCLUDE_DIRECTORIES}
59 ) 59 )
@@ -62,7 +62,7 @@ index f7d8d70a..3c27b8bc 100644
62 ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} 62 ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
63 ${GTK_INCLUDE_DIRS} 63 ${GTK_INCLUDE_DIRS}
64 ${GDK_INCLUDE_DIRS} 64 ${GDK_INCLUDE_DIRS}
65@@ -199,7 +199,7 @@ include_directories( 65@@ -206,7 +206,7 @@ include_directories(
66 "${WEBCORE_DIR}/bindings/gobject/" 66 "${WEBCORE_DIR}/bindings/gobject/"
67 ) 67 )
68 68
@@ -72,10 +72,10 @@ index f7d8d70a..3c27b8bc 100644
72 ) 72 )
73 73
74diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake 74diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake
75index 8c6ebb5..772c243 100644 75index 693bbdfe..20e3802f 100644
76--- a/Source/WebKit/PlatformGTK.cmake 76--- a/Source/WebKit/PlatformGTK.cmake
77+++ b/Source/WebKit/PlatformGTK.cmake 77+++ b/Source/WebKit/PlatformGTK.cmake
78@@ -655,7 +655,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2) 78@@ -664,7 +664,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
79 target_include_directories(WebKitPluginProcess2 PRIVATE 79 target_include_directories(WebKitPluginProcess2 PRIVATE
80 ${WebKitCommonIncludeDirectories} 80 ${WebKitCommonIncludeDirectories}
81 ) 81 )
@@ -85,10 +85,10 @@ index 8c6ebb5..772c243 100644
85 ${GTK2_INCLUDE_DIRS} 85 ${GTK2_INCLUDE_DIRS}
86 ${GDK2_INCLUDE_DIRS} 86 ${GDK2_INCLUDE_DIRS}
87diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake 87diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake
88index a1e7e8f..ce24274 100644 88index 6d58d57e..976e2362 100644
89--- a/Source/cmake/WebKitMacros.cmake 89--- a/Source/cmake/WebKitMacros.cmake
90+++ b/Source/cmake/WebKitMacros.cmake 90+++ b/Source/cmake/WebKitMacros.cmake
91@@ -134,7 +134,7 @@ macro(WEBKIT_FRAMEWORK _target) 91@@ -152,7 +152,7 @@ macro(WEBKIT_FRAMEWORK _target)
92 ${${_target}_SOURCES} 92 ${${_target}_SOURCES}
93 ) 93 )
94 target_include_directories(${_target} PUBLIC "$<BUILD_INTERFACE:${${_target}_INCLUDE_DIRECTORIES}>") 94 target_include_directories(${_target} PUBLIC "$<BUILD_INTERFACE:${${_target}_INCLUDE_DIRECTORIES}>")
@@ -98,10 +98,10 @@ index a1e7e8f..ce24274 100644
98 target_link_libraries(${_target} ${${_target}_LIBRARIES}) 98 target_link_libraries(${_target} ${${_target}_LIBRARIES})
99 set_target_properties(${_target} PROPERTIES COMPILE_DEFINITIONS "BUILDING_${_target}") 99 set_target_properties(${_target} PROPERTIES COMPILE_DEFINITIONS "BUILDING_${_target}")
100diff --git a/Tools/MiniBrowser/gtk/CMakeLists.txt b/Tools/MiniBrowser/gtk/CMakeLists.txt 100diff --git a/Tools/MiniBrowser/gtk/CMakeLists.txt b/Tools/MiniBrowser/gtk/CMakeLists.txt
101index dc2b61e..0128dca 100644 101index a0d32059..f259ade2 100644
102--- a/Tools/MiniBrowser/gtk/CMakeLists.txt 102--- a/Tools/MiniBrowser/gtk/CMakeLists.txt
103+++ b/Tools/MiniBrowser/gtk/CMakeLists.txt 103+++ b/Tools/MiniBrowser/gtk/CMakeLists.txt
104@@ -57,7 +57,7 @@ endif () 104@@ -59,7 +59,7 @@ endif ()
105 add_definitions(-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6) 105 add_definitions(-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6)
106 106
107 include_directories(${MiniBrowser_INCLUDE_DIRECTORIES}) 107 include_directories(${MiniBrowser_INCLUDE_DIRECTORIES})
@@ -111,10 +111,10 @@ index dc2b61e..0128dca 100644
111 target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES}) 111 target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES})
112 112
113diff --git a/Tools/TestWebKitAPI/PlatformGTK.cmake b/Tools/TestWebKitAPI/PlatformGTK.cmake 113diff --git a/Tools/TestWebKitAPI/PlatformGTK.cmake b/Tools/TestWebKitAPI/PlatformGTK.cmake
114index 4aef695..a14b163 100644 114index 8dd0e146..d037fc35 100644
115--- a/Tools/TestWebKitAPI/PlatformGTK.cmake 115--- a/Tools/TestWebKitAPI/PlatformGTK.cmake
116+++ b/Tools/TestWebKitAPI/PlatformGTK.cmake 116+++ b/Tools/TestWebKitAPI/PlatformGTK.cmake
117@@ -20,7 +20,7 @@ include_directories( 117@@ -22,7 +22,7 @@ include_directories(
118 ${WEBKIT_DIR}/UIProcess/API/gtk 118 ${WEBKIT_DIR}/UIProcess/API/gtk
119 ) 119 )
120 120
@@ -122,4 +122,4 @@ index 4aef695..a14b163 100644
122+include_directories( 122+include_directories(
123 ${GDK3_INCLUDE_DIRS} 123 ${GDK3_INCLUDE_DIRS}
124 ${GLIB_INCLUDE_DIRS} 124 ${GLIB_INCLUDE_DIRS}
125 ${GTK3_INCLUDE_DIRS} 125 ${GSTREAMER_INCLUDE_DIRS}
diff --git a/meta/recipes-sato/webkit/webkitgtk/bad_optional_access.patch b/meta/recipes-sato/webkit/webkitgtk/bad_optional_access.patch
deleted file mode 100644
index 9d0d50b79e..0000000000
--- a/meta/recipes-sato/webkit/webkitgtk/bad_optional_access.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1unbreak build with libc++ 7
2
3based on
4https://svnweb.freebsd.org/ports/head/www/webkit2-gtk3/files/patch-Source_WTF_wtf_Optional.h?view=markup&pathrev=477812
5
6Fixes
7
8/usr/include/c++/v1/optional:171:29: error: redefinition of 'bad_optional_access'
9class _LIBCPP_EXCEPTION_ABI bad_optional_access
10 ^
11DerivedSources/ForwardingHeaders/wtf/Optional.h:295:7: note: previous definition is here
12class bad_optional_access : public std::logic_error {
13 ^
14
15Upstream-Status: Pending
16Signed-off-by: Khem Raj <raj.khem@gmail.com>
17--- a/Source/WTF/wtf/Optional.h
18+++ b/Source/WTF/wtf/Optional.h
19@@ -276,14 +276,14 @@ struct nullopt_t
20 };
21 constexpr nullopt_t nullopt{nullopt_t::init()};
22
23-
24+# if !defined(_LIBCPP_VERSION) || _LIBCPP_VERSION < 7000
25 // 20.5.8, class bad_optional_access
26 class bad_optional_access : public std::logic_error {
27 public:
28 explicit bad_optional_access(const std::string& what_arg) : std::logic_error{what_arg} {}
29 explicit bad_optional_access(const char* what_arg) : std::logic_error{what_arg} {}
30 };
31-
32+# endif // _LIBCPP_VERSION < 7000
33
34 template <class T>
35 union storage_t
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.22.7.bb b/meta/recipes-sato/webkit/webkitgtk_2.24.0.bb
index 301bf10cea..4a82dae9ef 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.22.7.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.24.0.bb
@@ -20,11 +20,10 @@ SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
20 file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \ 20 file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \
21 file://0001-Fix-build-with-musl.patch \ 21 file://0001-Fix-build-with-musl.patch \
22 file://detect-gstreamer-gl.patch \ 22 file://detect-gstreamer-gl.patch \
23 file://bad_optional_access.patch \
24 " 23 "
25 24
26SRC_URI[md5sum] = "47386c10a9c3975f933c85404f35ff3b" 25SRC_URI[md5sum] = "576d69c598b3e36c73441052d02466de"
27SRC_URI[sha256sum] = "4be6f7d605cd0a690fd26e8aa83b089a33ad9d419148eafcfb60580dd2af30ff" 26SRC_URI[sha256sum] = "2e4ad1503fe482ceb5a83cf70ac9cd42f37eb718555a4d6844fe4c59a9214407"
28 27
29inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc 28inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc
30 29
@@ -56,6 +55,7 @@ PACKAGECONFIG[libsecret] = "-DUSE_LIBSECRET=ON,-DUSE_LIBSECRET=OFF,libsecret"
56PACKAGECONFIG[libhyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,libhyphen" 55PACKAGECONFIG[libhyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,libhyphen"
57# Source is at https://github.com/google/woff2 56# Source is at https://github.com/google/woff2
58PACKAGECONFIG[woff2] = "-DUSE_WOFF2=ON,-DUSE_WOFF2=OFF,woff2" 57PACKAGECONFIG[woff2] = "-DUSE_WOFF2=ON,-DUSE_WOFF2=OFF,woff2"
58PACKAGECONFIG[openjpeg] = "-DUSE_OPENJPEG=ON,-DUSE_OPENJPEG=OFF,openjpeg"
59 59
60EXTRA_OECMAKE = " \ 60EXTRA_OECMAKE = " \
61 -DPORT=GTK \ 61 -DPORT=GTK \