1
0
mirror of https://git.yoctoproject.org/poky synced 2026-06-03 01:40:07 +00:00

glib/gobject-introspection: update 2.78.4 -> 2.80.0, 1.78.1 -> 1.80.0

With these versions, which need to be updated in lockstep, upstream has
relocated glib introspection data from g-i tree to glib tree and made
its generation a part of the overall glib build. This creates a circular
dependency, where g-i tools are linked with glib, but glib needs the tools
to build its g-i data. (I don't know why the two source trees
couldn't be simply merged into one, or g-i data for glib couldn't be generated
inside g-i build against sysroot glib).

Upstream is suggesting building glib twice, first without building g-i data,
then building g-i and linking it with that version, then building
the final glib, and that's what is being done here (via the new
glib-initial recipe, which is sysroot-only, and is not pulled in
via indirect dependencies either).

Other glib changes:
0001-Do-not-write-bindir-into-pkg-config-files.patch restores
writing bindir variable into glib.pc file (meson only writes
it out if other variables depend on it, and this custom patch
removes that dependency).

0001-girepository-introspection-correctly-install-.gir-fi.patch
ensures correct installation of .gir into something else
than $datadir (useful in multilib).

Merge previous glib .bb into .inc, so that glib and glib-initial
recipes could be cleanly separated with no duplication.

Convert from gtk-doc to gi-docgen, and manpages from xmlto to
docutils.

(From OE-Core rev: 57c307536f67dcfb5d4a5488ca1e77a943ba1368)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2024-05-02 12:32:52 +02:00
committed by Richard Purdie
parent 521a3f727c
commit 393ff34301
28 changed files with 219 additions and 568 deletions
@@ -0,0 +1,29 @@
From 682d8a616ca111c0e45c8a9cb02e992e63c69586 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@arm.com>
Date: Thu, 28 Mar 2024 16:27:09 +0000
Subject: [PATCH] Skip /timeout/rounding test
This test is sensitive to load because it expects certain timeout operations
to succeed in specific time periods. Whilst these timeouts are fairly large,
they're still exceeded inside a qemu on a loaded system.
https://bugzilla.yoctoproject.org/show_bug.cgi?id=14464
Upstream-Status: Inappropriate [OE-specific]
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
glib/tests/timeout.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/glib/tests/timeout.c b/glib/tests/timeout.c
index 1ae3f3a..85a715b 100644
--- a/glib/tests/timeout.c
+++ b/glib/tests/timeout.c
@@ -214,7 +214,6 @@ main (int argc, char *argv[])
g_test_add_func ("/timeout/seconds-once", test_seconds_once);
g_test_add_func ("/timeout/weeks-overflow", test_weeks_overflow);
g_test_add_func ("/timeout/far-future-ready-time", test_far_future_ready_time);
- g_test_add_func ("/timeout/rounding", test_rounding);
return g_test_run ();
}