From 801538a3495cfc8d7d3264e470336ee5df5f1048 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 2 May 2023 15:33:56 +0100 Subject: gtk+3: upgrade 3.24.36 -> 3.24.37 Drop merged introspection patch. (From OE-Core rev: 8ac81784ce414057039bc16417a8b2dd8f58497d) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- ...-build-introspection-according-to-option-.patch | 34 ---------------------- meta/recipes-gnome/gtk+/gtk+3_3.24.36.bb | 16 ---------- meta/recipes-gnome/gtk+/gtk+3_3.24.37.bb | 15 ++++++++++ 3 files changed, 15 insertions(+), 50 deletions(-) delete mode 100644 meta/recipes-gnome/gtk+/gtk+3/0001-meson.build-build-introspection-according-to-option-.patch delete mode 100644 meta/recipes-gnome/gtk+/gtk+3_3.24.36.bb create mode 100644 meta/recipes-gnome/gtk+/gtk+3_3.24.37.bb (limited to 'meta/recipes-gnome') 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 @@ -From 6e533d5598ef875f30b84d931aae11b768465869 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Mon, 2 Jan 2023 15:00:02 +0100 -Subject: [PATCH] meson.build: build introspection according to option only - -The way the check is written, if the build is native, then the -introspection option has no effect. - -Particularly yocto project does want to disable introspection in -native builds and enable it in cross builds (both via the option), -and without this patch the former is not possible. - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/5382] -Signed-off-by: Alexander Kanavin ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index bfc33af0f6..94ffaa7769 100644 ---- a/meson.build -+++ b/meson.build -@@ -854,7 +854,7 @@ endif - - # Introspection - gir = find_program('g-ir-scanner', required : get_option('introspection')) --build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection')) -+build_gir = gir.found() and get_option('introspection') - - subdir('gdk') - subdir('gtk') --- -2.30.2 - diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.24.36.bb b/meta/recipes-gnome/gtk+/gtk+3_3.24.36.bb deleted file mode 100644 index 41c189d7f1..0000000000 --- a/meta/recipes-gnome/gtk+/gtk+3_3.24.36.bb +++ /dev/null @@ -1,16 +0,0 @@ -require gtk+3.inc - -MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" - -SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \ - file://opengl.patch \ - file://0001-meson.build-build-introspection-according-to-option-.patch \ - " -SRC_URI[sha256sum] = "27a6ef157743350c807ffea59baa1d70226dbede82a5e953ffd58ea6059fe691" - -S = "${WORKDIR}/gtk+-${PV}" - -LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ - file://gtk/gtk.h;endline=25;md5=1d8dc0fccdbfa26287a271dce88af737 \ - file://gdk/gdk.h;endline=25;md5=c920ce39dc88c6f06d3e7c50e08086f2 \ - file://tests/testgtk.c;endline=25;md5=cb732daee1d82af7a2bf953cf3cf26f1" diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.24.37.bb b/meta/recipes-gnome/gtk+/gtk+3_3.24.37.bb new file mode 100644 index 0000000000..1f01cf549c --- /dev/null +++ b/meta/recipes-gnome/gtk+/gtk+3_3.24.37.bb @@ -0,0 +1,15 @@ +require gtk+3.inc + +MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" + +SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \ + file://opengl.patch \ + " +SRC_URI[sha256sum] = "6745f0b4c053794151fd0f0e2474b077cccff5f83e9dd1bf3d39fe9fe5fb7f57" + +S = "${WORKDIR}/gtk+-${PV}" + +LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ + file://gtk/gtk.h;endline=25;md5=1d8dc0fccdbfa26287a271dce88af737 \ + file://gdk/gdk.h;endline=25;md5=c920ce39dc88c6f06d3e7c50e08086f2 \ + file://tests/testgtk.c;endline=25;md5=cb732daee1d82af7a2bf953cf3cf26f1" -- cgit v1.2.3-54-g00ecf