diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-11-20 14:31:18 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-11-27 23:54:50 +0000 |
commit | 80dc1462079ced1e34d039a7c4c8a9cf0e40e9e7 (patch) | |
tree | 1f7d5ed932e9df3f2fc5f5bd4bfad526d986d12a /meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch | |
parent | 6e75972a1f0cadfc09721d853b2cb1135078627c (diff) | |
download | poky-80dc1462079ced1e34d039a7c4c8a9cf0e40e9e7.tar.gz |
webkitgtk: update 2.36.7 -> 2.38.2
Upstream has rewritten gobject introspection support,
so the two related patches are ported to that:
0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch
0001-When-building-introspection-files-do-not-quote-CFLAG.patch
The latter patch is also promoted from Inappropriate to Pending
gtk-doc has been replaced with gi-docgen, accordingly
0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch is removed.
Drop
fix-gstreamer-include-paths.patch
(backport)
0001-Fix-build-without-opengl-or-es.patch
(upstream fixed the issue; follow the link in the patch for details)
(From OE-Core rev: ac06af29503d2d3e0e43ef69d1d1580ce301bdfb)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch')
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch | 39 |
1 files changed, 15 insertions, 24 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 @@ | |||
1 | From e0bf97eecfa601e08b9578f00b1000890284241a Mon Sep 17 00:00:00 2001 | 1 | From 10cfdcc905915d8814c609008a069102f2bc7e39 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Tue, 27 Oct 2015 16:02:19 +0200 | 3 | Date: Tue, 27 Oct 2015 16:02:19 +0200 |
4 | Subject: [PATCH] FindGObjectIntrospection.cmake: prefix variables obtained | 4 | Subject: [PATCH] FindGObjectIntrospection.cmake: prefix variables obtained |
@@ -9,30 +9,21 @@ reasons why this is not approproiate for upstream submission. | |||
9 | 9 | ||
10 | Upstream-Status: Inappropriate [oe-core specific] | 10 | Upstream-Status: Inappropriate [oe-core specific] |
11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 11 | Signed-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 | ||
17 | diff --git a/Source/cmake/FindGObjectIntrospection.cmake b/Source/cmake/FindGObjectIntrospection.cmake | 16 | diff --git a/Source/cmake/FindGI.cmake b/Source/cmake/FindGI.cmake |
18 | index be96814a..ae67b593 100644 | 17 | index 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) | ||