diff options
author | Ross Burton <ross.burton@arm.com> | 2023-05-02 15:33:56 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-05-03 11:50:09 +0100 |
commit | 801538a3495cfc8d7d3264e470336ee5df5f1048 (patch) | |
tree | 75d38ab883545fd97a957c3a4c7631b6f22b5116 /meta | |
parent | e222579ba7ce49bc3b50a09a164c5635ce14c4b2 (diff) | |
download | poky-801538a3495cfc8d7d3264e470336ee5df5f1048.tar.gz |
gtk+3: upgrade 3.24.36 -> 3.24.37
Drop merged introspection patch.
(From OE-Core rev: 8ac81784ce414057039bc16417a8b2dd8f58497d)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+3/0001-meson.build-build-introspection-according-to-option-.patch | 34 | ||||
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+3_3.24.37.bb (renamed from meta/recipes-gnome/gtk+/gtk+3_3.24.36.bb) | 3 |
2 files changed, 1 insertions, 36 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 deleted file mode 100644 index 11effd421f..0000000000 --- a/meta/recipes-gnome/gtk+/gtk+3/0001-meson.build-build-introspection-according-to-option-.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
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 | |||
diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.24.36.bb b/meta/recipes-gnome/gtk+/gtk+3_3.24.37.bb index 41c189d7f1..1f01cf549c 100644 --- a/meta/recipes-gnome/gtk+/gtk+3_3.24.36.bb +++ b/meta/recipes-gnome/gtk+/gtk+3_3.24.37.bb | |||
@@ -4,9 +4,8 @@ MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" | |||
4 | 4 | ||
5 | SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \ | 5 | SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \ |
6 | file://opengl.patch \ | 6 | file://opengl.patch \ |
7 | file://0001-meson.build-build-introspection-according-to-option-.patch \ | ||
8 | " | 7 | " |
9 | SRC_URI[sha256sum] = "27a6ef157743350c807ffea59baa1d70226dbede82a5e953ffd58ea6059fe691" | 8 | SRC_URI[sha256sum] = "6745f0b4c053794151fd0f0e2474b077cccff5f83e9dd1bf3d39fe9fe5fb7f57" |
10 | 9 | ||
11 | S = "${WORKDIR}/gtk+-${PV}" | 10 | S = "${WORKDIR}/gtk+-${PV}" |
12 | 11 | ||