diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2023-01-04 12:04:37 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-01-06 12:03:47 +0000 |
commit | 82ed25ab1af6272d0dab419964c69d56ee7f2d00 (patch) | |
tree | 8c875445a84f54d576218becf8ee34f353abb3cd /meta/recipes-gnome/gtk+/gtk+3/0001-meson.build-build-introspection-according-to-option-.patch | |
parent | 5ef4b23d946afdace910d166521d0b3abf19d671 (diff) | |
download | poky-82ed25ab1af6272d0dab419964c69d56ee7f2d00.tar.gz |
gtk+3: update 3.24.35 -> 3.24.36
Drop autotools-specific chunks in opengl.patch.
Drop add-missing-meson.build.patch (.35 tarball issue)
Drop buildpaths.patch (backport)
(From OE-Core rev: cd3cc911ea565a740b377fcc53cab1b754971d8b)
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-gnome/gtk+/gtk+3/0001-meson.build-build-introspection-according-to-option-.patch')
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+3/0001-meson.build-build-introspection-according-to-option-.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+3/0001-meson.build-build-introspection-according-to-option-.patch b/meta/recipes-gnome/gtk+/gtk+3/0001-meson.build-build-introspection-according-to-option-.patch new file mode 100644 index 0000000000..11effd421f --- /dev/null +++ b/meta/recipes-gnome/gtk+/gtk+3/0001-meson.build-build-introspection-according-to-option-.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From 6e533d5598ef875f30b84d931aae11b768465869 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Mon, 2 Jan 2023 15:00:02 +0100 | ||
4 | Subject: [PATCH] meson.build: build introspection according to option only | ||
5 | |||
6 | The way the check is written, if the build is native, then the | ||
7 | introspection option has no effect. | ||
8 | |||
9 | Particularly yocto project does want to disable introspection in | ||
10 | native builds and enable it in cross builds (both via the option), | ||
11 | and without this patch the former is not possible. | ||
12 | |||
13 | Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/5382] | ||
14 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
15 | --- | ||
16 | meson.build | 2 +- | ||
17 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/meson.build b/meson.build | ||
20 | index bfc33af0f6..94ffaa7769 100644 | ||
21 | --- a/meson.build | ||
22 | +++ b/meson.build | ||
23 | @@ -854,7 +854,7 @@ endif | ||
24 | |||
25 | # Introspection | ||
26 | gir = find_program('g-ir-scanner', required : get_option('introspection')) | ||
27 | -build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection')) | ||
28 | +build_gir = gir.found() and get_option('introspection') | ||
29 | |||
30 | subdir('gdk') | ||
31 | subdir('gtk') | ||
32 | -- | ||
33 | 2.30.2 | ||
34 | |||