mirror of
https://git.yoctoproject.org/poky
synced 2026-01-29 21:08:42 +01:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
e222579ba7
commit
801538a349
@@ -1,34 +0,0 @@
|
||||
From 6e533d5598ef875f30b84d931aae11b768465869 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex@linutronix.de>
|
||||
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 <alex@linutronix.de>
|
||||
---
|
||||
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
|
||||
|
||||
@@ -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}"
|
||||
|
||||
Reference in New Issue
Block a user