Drop merged introspection patch. Signed-off-by: Ross Burton <[email protected]> --- ...d-introspection-according-to-option-.patch | 34 ------------------- .../{gtk+3_3.24.36.bb => gtk+3_3.24.37.bb} | 3 +- 2 files changed, 1 insertion(+), 36 deletions(-) delete mode 100644 meta/recipes-gnome/gtk+/gtk+3/0001-meson.build-build-introspection-according-to-option-.patch rename meta/recipes-gnome/gtk+/{gtk+3_3.24.36.bb => gtk+3_3.24.37.bb} (76%)
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 11effd421fd..00000000000 --- 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 <[email protected]> -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 <[email protected]> ---- - 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.37.bb similarity index 76% rename from meta/recipes-gnome/gtk+/gtk+3_3.24.36.bb rename to meta/recipes-gnome/gtk+/gtk+3_3.24.37.bb index 41c189d7f1d..1f01cf549c5 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)}" 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" +SRC_URI[sha256sum] = "6745f0b4c053794151fd0f0e2474b077cccff5f83e9dd1bf3d39fe9fe5fb7f57" S = "${WORKDIR}/gtk+-${PV}" -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#180734): https://lists.openembedded.org/g/openembedded-core/message/180734 Mute This Topic: https://lists.openembedded.org/mt/98639996/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
