summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/webkit
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-sato/webkit')
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch39
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-without-opengl-or-es.patch133
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch47
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-do-not-quote-CFLAG.patch67
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/fix-gstreamer-include-paths.patch51
-rw-r--r--meta/recipes-sato/webkit/webkitgtk_2.38.2.bb (renamed from meta/recipes-sato/webkit/webkitgtk_2.36.7.bb)9
6 files changed, 40 insertions, 306 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch b/meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch
index 2379924cc9..8ae39f14e1 100644
--- a/meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch
@@ -1,4 +1,4 @@
1From e0bf97eecfa601e08b9578f00b1000890284241a Mon Sep 17 00:00:00 2001 1From 10cfdcc905915d8814c609008a069102f2bc7e39 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 27 Oct 2015 16:02:19 +0200 3Date: Tue, 27 Oct 2015 16:02:19 +0200
4Subject: [PATCH] FindGObjectIntrospection.cmake: prefix variables obtained 4Subject: [PATCH] FindGObjectIntrospection.cmake: prefix variables obtained
@@ -9,30 +9,21 @@ reasons why this is not approproiate for upstream submission.
9 9
10Upstream-Status: Inappropriate [oe-core specific] 10Upstream-Status: Inappropriate [oe-core specific]
11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12
13--- 12---
14 Source/cmake/FindGObjectIntrospection.cmake | 4 +++- 13 Source/cmake/FindGI.cmake | 3 +++
15 1 file changed, 3 insertions(+), 1 deletion(-) 14 1 file changed, 3 insertions(+)
16 15
17diff --git a/Source/cmake/FindGObjectIntrospection.cmake b/Source/cmake/FindGObjectIntrospection.cmake 16diff --git a/Source/cmake/FindGI.cmake b/Source/cmake/FindGI.cmake
18index be96814a..ae67b593 100644 17index af039cbb..b3e810cd 100644
19--- a/Source/cmake/FindGObjectIntrospection.cmake 18--- a/Source/cmake/FindGI.cmake
20+++ b/Source/cmake/FindGObjectIntrospection.cmake 19+++ b/Source/cmake/FindGI.cmake
21@@ -16,7 +16,6 @@ 20@@ -72,6 +72,9 @@ if (PKG_CONFIG_FOUND)
22 # Redistribution and use is allowed according to the terms of the BSD license. 21 endif ()
22 endif ()
23 23
24+set(_GI_SCANNER_EXE "$ENV{PKG_CONFIG_SYSROOT_DIR}${_GI_SCANNER_EXE}")
25+set(_GI_COMPILER_EXE "$ENV{PKG_CONFIG_SYSROOT_DIR}${_GI_COMPILER_EXE}")
26+
27 find_program(GI_SCANNER_EXE NAMES ${_GI_SCANNER_EXE} g-ir-scanner)
28 find_program(GI_COMPILER_EXE NAMES ${_GI_COMPILER_EXE} g-ir-compiler)
24 29
25-
26 find_package(PkgConfig QUIET)
27 if (PKG_CONFIG_FOUND)
28 if (PACKAGE_FIND_VERSION_COUNT GREATER 0)
29@@ -30,6 +29,9 @@ if (PKG_CONFIG_FOUND)
30 pkg_get_variable(INTROSPECTION_GENERATE gobject-introspection-1.0 g_ir_generate)
31 pkg_get_variable(INTROSPECTION_GIRDIR gobject-introspection-1.0 girdir)
32 pkg_get_variable(INTROSPECTION_TYPELIBDIR gobject-introspection-1.0 typelibdir)
33+ set(INTROSPECTION_SCANNER "$ENV{PKG_CONFIG_SYSROOT_DIR}${INTROSPECTION_SCANNER}")
34+ set(INTROSPECTION_COMPILER "$ENV{PKG_CONFIG_SYSROOT_DIR}${INTROSPECTION_COMPILER}")
35+ set(INTROSPECTION_GENERATE "$ENV{PKG_CONFIG_SYSROOT_DIR}${INTROSPECTION_GENERATE}")
36 set(INTROSPECTION_VERSION "${_pc_gir_VERSION}")
37 if (${INTROSPECTION_VERSION} VERSION_GREATER_EQUAL "1.59.1")
38 set(INTROSPECTION_HAVE_SOURCES_TOP_DIRS YES)
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-without-opengl-or-es.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-without-opengl-or-es.patch
deleted file mode 100644
index 09256951f4..0000000000
--- a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-without-opengl-or-es.patch
+++ /dev/null
@@ -1,133 +0,0 @@
1From 646e347c173dbb9782492ac7cb4f54b65533ba90 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sun, 17 Oct 2021 20:49:21 +0000
4Subject: [PATCH] Fix build without opengl-or-es
5
6* fix build failure when opengl-or-es is disabled:
7 In file included from /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/webkitgtk/2.34.0-r0/webkitgtk-2.34.0/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp:30,
8 from /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/webkitgtk/2.34.0-r0/build/DerivedSources/WebKit/unified-sources/UnifiedSource-54928a2b-36.cpp:1:
9 /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/webkitgtk/2.34.0-r0/webkitgtk-2.34.0/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h:41:10: fatal error: WebCore/CoordinatedGraphicsLayer.h: No such file or directory
10 41 | #include <WebCore/CoordinatedGraphicsLayer.h>
11 | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
12 compilation terminated.
13
14* the CoordinatedGraphicsLayer.h header installation is controled by
15 USE_COORDINATED_GRAPHICS in webkitgtk-2.34.0/Source/WebCore/platform/TextureMapper.cmake
16 but in Source/cmake/OptionsGTK.cmake USE_COORDINATED_GRAPHICS was enabled only inside
17 if (USE_OPENGL_OR_ES)
18
19Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=232934]
20---
21 .../DrawingAreaProxyCoordinatedGraphics.cpp | 2 +-
22 .../DrawingAreaProxyCoordinatedGraphics.h | 2 +-
23 .../CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp | 2 +-
24 .../CoordinatedGraphics/DrawingAreaCoordinatedGraphics.h | 2 +-
25 .../WebPage/CoordinatedGraphics/LayerTreeHost.cpp | 4 ++--
26 .../WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h | 6 +++---
27 6 files changed, 9 insertions(+), 9 deletions(-)
28
29diff --git a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp
30index 038d9ee2..5e828a10 100644
31--- a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp
32+++ b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp
33@@ -152,7 +152,7 @@ void DrawingAreaProxyCoordinatedGraphics::setBackingStoreIsDiscardable(bool isBa
34 #endif
35 }
36
37-#if PLATFORM(GTK)
38+#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS)
39 void DrawingAreaProxyCoordinatedGraphics::adjustTransientZoom(double scale, FloatPoint origin)
40 {
41 send(Messages::DrawingArea::AdjustTransientZoom(scale, origin));
42diff --git a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.h b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.h
43index b23a45ff..cd263402 100644
44--- a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.h
45+++ b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.h
46@@ -57,7 +57,7 @@ private:
47 void waitForBackingStoreUpdateOnNextPaint() override;
48 void setBackingStoreIsDiscardable(bool) override;
49
50-#if PLATFORM(GTK)
51+#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS)
52 void adjustTransientZoom(double scale, WebCore::FloatPoint origin) override;
53 void commitTransientZoom(double scale, WebCore::FloatPoint origin) override;
54 #endif
55diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp
56index 33ac2e1d..42375784 100644
57--- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp
58+++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp
59@@ -486,7 +486,7 @@ void DrawingAreaCoordinatedGraphics::didUpdate()
60 displayTimerFired();
61 }
62
63-#if PLATFORM(GTK)
64+#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS)
65 void DrawingAreaCoordinatedGraphics::adjustTransientZoom(double scale, FloatPoint origin)
66 {
67 if (!m_transientZoom) {
68diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.h b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.h
69index d8dc6df7..c8322364 100644
70--- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.h
71+++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.h
72@@ -84,7 +84,7 @@ private:
73 void updateBackingStoreState(uint64_t backingStoreStateID, bool respondImmediately, float deviceScaleFactor, const WebCore::IntSize&, const WebCore::IntSize& scrollOffset) override;
74 void didUpdate() override;
75
76-#if PLATFORM(GTK)
77+#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS)
78 void adjustTransientZoom(double scale, WebCore::FloatPoint origin) override;
79 void commitTransientZoom(double scale, WebCore::FloatPoint origin) override;
80 #endif
81diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp
82index f3304d10..ca0476ff 100644
83--- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp
84+++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp
85@@ -156,7 +156,7 @@ void LayerTreeHost::layerFlushTimerFired()
86
87 bool didSync = m_coordinator.flushPendingLayerChanges(flags);
88
89-#if PLATFORM(GTK)
90+#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS)
91 // If we have an active transient zoom, we want the zoom to win over any changes
92 // that WebCore makes to the relevant layers, so re-apply our changes after flushing.
93 if (m_transientZoom)
94@@ -453,7 +453,7 @@ void LayerTreeHost::renderNextFrame(bool forceRepaint)
95 }
96 }
97
98-#if PLATFORM(GTK)
99+#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS)
100 FloatPoint LayerTreeHost::constrainTransientZoomOrigin(double scale, FloatPoint origin) const
101 {
102 FrameView& frameView = *m_webPage.mainFrameView();
103diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h
104index 4f727e41..b070266e 100644
105--- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h
106+++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h
107@@ -37,7 +37,7 @@
108 #include <wtf/Forward.h>
109 #include <wtf/OptionSet.h>
110 #include <wtf/RunLoop.h>
111-#if PLATFORM(GTK)
112+#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS)
113 #include <WebCore/CoordinatedGraphicsLayer.h>
114 #endif
115
116@@ -100,7 +100,7 @@ public:
117
118 WebCore::PlatformDisplayID displayID() const { return m_displayID; }
119
120-#if PLATFORM(GTK)
121+#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS)
122 void adjustTransientZoom(double, WebCore::FloatPoint);
123 void commitTransientZoom(double, WebCore::FloatPoint);
124 #endif
125@@ -213,7 +213,7 @@ private:
126 #endif // USE(COORDINATED_GRAPHICS)
127 WebCore::PlatformDisplayID m_displayID;
128
129-#if PLATFORM(GTK)
130+#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS)
131 bool m_transientZoom { false };
132 double m_transientZoomScale { 1 };
133 WebCore::FloatPoint m_transientZoomOrigin;
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
deleted file mode 100644
index 866e9d9d09..0000000000
--- a/meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch
+++ /dev/null
@@ -1,47 +0,0 @@
1From 1c7e7a385387d7febf633bbb6d2b99ece523e719 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---
15 Source/cmake/GtkDoc.cmake | 2 +-
16 Tools/gtkdoc/gtkdoc.py | 4 ++--
17 2 files changed, 3 insertions(+), 3 deletions(-)
18
19diff --git a/Source/cmake/GtkDoc.cmake b/Source/cmake/GtkDoc.cmake
20index 18e86448..102c873a 100644
21--- a/Source/cmake/GtkDoc.cmake
22+++ b/Source/cmake/GtkDoc.cmake
23@@ -4,7 +4,7 @@ macro(ADD_GTKDOC_GENERATOR _stamp_name _extra_args)
24 add_custom_command(
25 OUTPUT "${CMAKE_BINARY_DIR}/${_stamp_name}"
26 DEPENDS ${DocumentationDependencies}
27- COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" "CFLAGS=${CMAKE_C_FLAGS} -Wno-unused-parameter" "LDFLAGS=${CMAKE_EXE_LINKER_FLAGS}" ${PYTHON_EXECUTABLE} ${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" ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/Tools/gtkdoc/generate-gtkdoc ${_extra_args}
29 COMMAND touch ${_stamp_name}
30 WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
31 VERBATIM
32diff --git a/Tools/gtkdoc/gtkdoc.py b/Tools/gtkdoc/gtkdoc.py
33index 054cafa1..416de7d1 100644
34--- a/Tools/gtkdoc/gtkdoc.py
35+++ b/Tools/gtkdoc/gtkdoc.py
36@@ -320,9 +320,9 @@ class GTKDoc(object):
37 additional_ldflags = '%s %s' % (additional_ldflags, arg)
38 ldflags = ' "-L%s" %s ' % (self.library_path, additional_ldflags) + ldflags
39 current_ld_library_path = env.get('LD_LIBRARY_PATH')
40- if current_ld_library_path:
41+ if current_ld_library_path and 'RUN' not in env:
42 env['LD_LIBRARY_PATH'] = '%s:%s' % (self.library_path, current_ld_library_path)
43- else:
44+ elif 'RUN' not in env:
45 env['LD_LIBRARY_PATH'] = self.library_path
46
47 if ldflags:
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-do-not-quote-CFLAG.patch b/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-do-not-quote-CFLAG.patch
index 3d02be9894..4ef0dbfe2f 100644
--- a/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-do-not-quote-CFLAG.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-do-not-quote-CFLAG.patch
@@ -1,9 +1,9 @@
1From 01f5ab0edf3dd8f76d37fd36c2dcd3108be33a7b Mon Sep 17 00:00:00 2001 1From 89ac299e0d9436f1effaa07711458d616574cc8f Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de> 2From: Alexander Kanavin <alex@linutronix.de>
3Date: Mon, 4 Apr 2022 21:20:05 +0200 3Date: Mon, 4 Apr 2022 21:20:05 +0200
4Subject: [PATCH] When building introspection files, do not quote CFLAGS. 4Subject: [PATCH] Propagate CFLAGS to introspection targets
5 5
6This does not seem to be propagated to the compiler correctly: 6Otherwise, important things do not get passed to the compiler in cross compiling with a sysroot scenario:
7 7
8In file included from /srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot-native/usr/lib/x86_64-poky-linux/gcc/x86_64-poky-linux/11.2.0/include-fixed/syslimits.h:7, 8In file included from /srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot-native/usr/lib/x86_64-poky-linux/gcc/x86_64-poky-linux/11.2.0/include-fixed/syslimits.h:7,
9 from /srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot-native/usr/lib/x86_64-poky-linux/gcc/x86_64-poky-linux/11.2.0/include-fixed/limits.h:34, 9 from /srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot-native/usr/lib/x86_64-poky-linux/gcc/x86_64-poky-linux/11.2.0/include-fixed/limits.h:34,
@@ -31,48 +31,25 @@ Traceback (most recent call last):
31 raise DistutilsExecError( 31 raise DistutilsExecError(
32distutils.errors.DistutilsExecError: command '/srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot-native/usr/bin/x86_64-poky-linux/x86_64-poky-linux-gcc' failed with exit code 1 32distutils.errors.DistutilsExecError: command '/srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot-native/usr/bin/x86_64-poky-linux/x86_64-poky-linux-gcc' failed with exit code 1
33 33
34Upstream-Status: Inappropriate [upstream has rewritten the whole thing as of https://github.com/WebKit/WebKit/commit/b0ae032850bb6b2672051bab8032fc9f9ef5eb97] 34Upstream-Status: Pending
35Signed-off-by: Alexander Kanavin <alex@linutronix.de> 35Signed-off-by: Alexander Kanavin <alex@linutronix.de>
36---
37 Source/JavaScriptCore/PlatformGTK.cmake | 2 +-
38 Source/WebKit/PlatformGTK.cmake | 4 ++--
39 2 files changed, 3 insertions(+), 3 deletions(-)
40 36
41diff --git a/Source/JavaScriptCore/PlatformGTK.cmake b/Source/JavaScriptCore/PlatformGTK.cmake
42index 1c3c8fb7..efd18807 100644
43--- a/Source/JavaScriptCore/PlatformGTK.cmake
44+++ b/Source/JavaScriptCore/PlatformGTK.cmake
45@@ -71,7 +71,7 @@ if (ENABLE_INTROSPECTION)
46 add_custom_command(
47 OUTPUT ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
48 DEPENDS JavaScriptCore
49- COMMAND CC=${CMAKE_C_COMPILER} CFLAGS="-Wno-deprecated-declarations ${CMAKE_C_FLAGS}" LDFLAGS=
50+ COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS=
51 ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
52 ${INTROSPECTION_SCANNER}
53 --quiet
54diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake
55index 48d1820d..ded05035 100644
56--- a/Source/WebKit/PlatformGTK.cmake
57+++ b/Source/WebKit/PlatformGTK.cmake
58@@ -675,7 +675,7 @@ if (ENABLE_INTROSPECTION)
59 add_custom_target(WebKit2-${WEBKITGTK_API_VERSION}-gir
60 DEPENDS WebKit
61 DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
62- COMMAND CC=${CMAKE_C_COMPILER} CFLAGS="-Wno-deprecated-declarations ${CMAKE_C_FLAGS}" LDFLAGS=
63+ COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS=
64 ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
65 ${INTROSPECTION_SCANNER}
66 --quiet
67@@ -721,7 +721,7 @@ if (ENABLE_INTROSPECTION)
68 OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
69 DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
70 DEPENDS WebKit2-${WEBKITGTK_API_VERSION}-gir
71- COMMAND CC=${CMAKE_C_COMPILER} CFLAGS="-Wno-deprecated-declarations ${CMAKE_C_FLAGS}"
72+ COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS}
73 LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}"
74 ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
75 ${INTROSPECTION_SCANNER}
76--
772.30.2
78 37
38Signed-off-by: Alexander Kanavin <alex@linutronix.de>
39---
40 Source/cmake/FindGI.cmake | 2 +-
41 1 file changed, 1 insertion(+), 1 deletion(-)
42
43diff --git a/Source/cmake/FindGI.cmake b/Source/cmake/FindGI.cmake
44index b3e810cd..e22a75f7 100644
45--- a/Source/cmake/FindGI.cmake
46+++ b/Source/cmake/FindGI.cmake
47@@ -340,7 +340,7 @@ function(GI_INTROSPECT namespace nsversion header)
48 DEPENDS ${gir_deps} ${gir_srcs}
49 VERBATIM
50 COMMAND_EXPAND_LISTS
51- COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}"
52+ COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" "CFLAGS=${CMAKE_C_FLAGS}"
53 "${GI_SCANNER_EXE}" --quiet --warn-all --warn-error --no-libtool
54 "--output=${gir_path}"
55 "--library=$<TARGET_FILE_BASE_NAME:${opt_TARGET}>"
diff --git a/meta/recipes-sato/webkit/webkitgtk/fix-gstreamer-include-paths.patch b/meta/recipes-sato/webkit/webkitgtk/fix-gstreamer-include-paths.patch
deleted file mode 100644
index 2c6be87902..0000000000
--- a/meta/recipes-sato/webkit/webkitgtk/fix-gstreamer-include-paths.patch
+++ /dev/null
@@ -1,51 +0,0 @@
1From 25efd1478b48b5406fdab3b7b9c1f7e0ef95a7ed Mon Sep 17 00:00:00 2001
2From: Pablo Saavedra <psaavedra@igalia.com>
3Date: Mon, 27 Jun 2022 16:56:04 -0700
4Subject: [PATCH] Fix include gstreamer path on cross compiler toolchains
5 https://bugs.webkit.org/show_bug.cgi?id=241483
6
7Reviewed by Adrian Perez de Castro.
8
9Set the include paths for the gstreamer components to the full path
10using the find_path(). This function relies in CMAKE_FIND_ROOT_PATH to
11find the right place where the includes they are. This fixes possible
12warnings/errors on cross toolchains using -Wpoison-system-directories
13and -Werror=poison-system-directories.
14
15* Source/cmake/FindGStreamer.cmake:
16
17Canonical link: https://commits.webkit.org/251895@main
18
19Upstream-Status: Backport [2.37.1 https://github.com/WebKit/WebKit/commit/25efd1478b48b5406fdab3b7b9c1f7e0ef95a7ed]
20---
21 Source/cmake/FindGStreamer.cmake | 14 +++++++++++---
22 1 file changed, 11 insertions(+), 3 deletions(-)
23
24diff --git a/Source/cmake/FindGStreamer.cmake b/Source/cmake/FindGStreamer.cmake
25index 3216f6974b53..b65a11f30871 100644
26--- a/Source/cmake/FindGStreamer.cmake
27+++ b/Source/cmake/FindGStreamer.cmake
28@@ -75,12 +75,20 @@ macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _library)
29 # ${includedir}/gstreamer-1.0 which remains correct. The issue here is that
30 # we don't rely on the `Cflags`, cmake fails to generate a proper
31 # `.._INCLUDE_DIRS` variable in this case. So we need to do it here...
32+
33+ # Populate the list initially from the _INCLUDE_DIRS result variable.
34+ set(${_component_prefix}_INCLUDE_DIRS ${PC_${_component_prefix}_INCLUDE_DIRS})
35+
36 set(_include_dir "${PC_${_component_prefix}_INCLUDEDIR}")
37 string(REGEX MATCH "(.*)/gstreamer-1.0" _dummy "${_include_dir}")
38+
39 if ("${CMAKE_MATCH_1}" STREQUAL "")
40- set(${_component_prefix}_INCLUDE_DIRS "${_include_dir}/gstreamer-1.0;${PC_${_component_prefix}_INCLUDE_DIRS}")
41- else ()
42- set(${_component_prefix}_INCLUDE_DIRS "${PC_${_component_prefix}_INCLUDE_DIRS}")
43+ find_path(${_component_prefix}_RESOLVED_INCLUDEDIR NAMES "${_include_dir}/gstreamer-1.0")
44+ # Only add the resolved path from `_INCLUDEDIR` if found.
45+ if (${_component_prefix}_RESOLVED_INCLUDEDIR)
46+ list(APPEND ${_component_prefix}_INCLUDE_DIRS
47+ "${${_component_prefix}_RESOLVED_INCLUDEDIR}")
48+ endif ()
49 endif ()
50
51 find_library(${_component_prefix}_LIBRARIES
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.36.7.bb b/meta/recipes-sato/webkit/webkitgtk_2.38.2.bb
index f3e1adee70..616416f6dc 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.36.7.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.38.2.bb
@@ -11,16 +11,13 @@ LIC_FILES_CHKSUM = "file://Source/JavaScriptCore/COPYING.LIB;md5=d0c6d6397a5d842
11 11
12SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ 12SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
13 file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \ 13 file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \
14 file://0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch \
15 file://0001-Fix-build-without-opengl-or-es.patch \
16 file://reproducibility.patch \ 14 file://reproducibility.patch \
17 file://0001-When-building-introspection-files-do-not-quote-CFLAG.patch \ 15 file://0001-When-building-introspection-files-do-not-quote-CFLAG.patch \
18 file://fix-gstreamer-include-paths.patch \
19 file://0d3344e17d258106617b0e6d783d073b188a2548.patch \ 16 file://0d3344e17d258106617b0e6d783d073b188a2548.patch \
20 " 17 "
21SRC_URI[sha256sum] = "0c260cf2b32f0481d017670dfed1b61e554967cd067195606c9f9eb5fe731743" 18SRC_URI[sha256sum] = "f3eb82899651f583b4d99cacd16af784a1a7710fce9e7b6807bd6ccde909fe3e"
22 19
23inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc 20inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen
24 21
25ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" 22ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
26REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'opengl', '', d)}" 23REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'opengl', '', d)}"
@@ -84,7 +81,7 @@ setup_python_link() {
84EXTRA_OECMAKE = " \ 81EXTRA_OECMAKE = " \
85 -DPORT=GTK \ 82 -DPORT=GTK \
86 ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_INTROSPECTION=ON', '-DENABLE_INTROSPECTION=OFF', d)} \ 83 ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_INTROSPECTION=ON', '-DENABLE_INTROSPECTION=OFF', d)} \
87 ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '-DENABLE_GTKDOC=ON', '-DENABLE_GTKDOC=OFF', d)} \ 84 ${@bb.utils.contains('GIDOCGEN_ENABLED', 'True', '-DENABLE_DOCUMENTATION=ON', '-DENABLE_DOCUMENTATION=OFF', d)} \
88 -DENABLE_MINIBROWSER=ON \ 85 -DENABLE_MINIBROWSER=ON \
89 -DPYTHON_EXECUTABLE=`which python3` \ 86 -DPYTHON_EXECUTABLE=`which python3` \
90 -DENABLE_BUBBLEWRAP_SANDBOX=OFF \ 87 -DENABLE_BUBBLEWRAP_SANDBOX=OFF \
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-02-28 22:20:43 +0000