]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core.git/commit
glib/gobject-introspection: update 2.78.4 -> 2.80.0, 1.78.1 -> 1.80.0
authorAlexander Kanavin <alex@linutronix.de>
Thu, 2 May 2024 10:32:52 +0000 (12:32 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 13 May 2024 15:28:33 +0000 (16:28 +0100)
commit57c307536f67dcfb5d4a5488ca1e77a943ba1368
treecf43616c40dff8b96f005034a4e773b0a4eb33b0
parent4041d91b63ff2315657499e22c74ec90adbf9e19
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.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
28 files changed:
meta/conf/distro/include/maintainers.inc
meta/recipes-core/glib-2.0/files/0001-Do-not-write-bindir-into-pkg-config-files.patch [moved from meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch with 68% similarity]
meta/recipes-core/glib-2.0/files/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch [moved from meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch with 92% similarity]
meta/recipes-core/glib-2.0/files/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch [moved from meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch with 84% similarity]
meta/recipes-core/glib-2.0/files/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch [moved from meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch with 95% similarity]
meta/recipes-core/glib-2.0/files/0001-Set-host_machine-correctly-when-building-with-mingw3.patch [moved from meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch with 80% similarity]
meta/recipes-core/glib-2.0/files/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch [moved from meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch with 92% similarity]
meta/recipes-core/glib-2.0/files/0001-girepository-introspection-correctly-install-.gir-fi.patch [new file with mode: 0644]
meta/recipes-core/glib-2.0/files/0001-meson-Run-atomics-test-on-clang-as-well.patch [moved from meta/recipes-core/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch with 88% similarity]
meta/recipes-core/glib-2.0/files/0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch [moved from meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch with 84% similarity]
meta/recipes-core/glib-2.0/files/0010-Do-not-hardcode-python-path-into-various-tools.patch [moved from meta/recipes-core/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch with 93% similarity]
meta/recipes-core/glib-2.0/files/meson.cross.d/common [moved from meta/recipes-core/glib-2.0/glib-2.0/meson.cross.d/common with 100% similarity]
meta/recipes-core/glib-2.0/files/meson.cross.d/common-glibc [moved from meta/recipes-core/glib-2.0/glib-2.0/meson.cross.d/common-glibc with 100% similarity]
meta/recipes-core/glib-2.0/files/meson.cross.d/common-linux [moved from meta/recipes-core/glib-2.0/glib-2.0/meson.cross.d/common-linux with 100% similarity]
meta/recipes-core/glib-2.0/files/meson.cross.d/common-mingw [moved from meta/recipes-core/glib-2.0/glib-2.0/meson.cross.d/common-mingw with 100% similarity]
meta/recipes-core/glib-2.0/files/meson.cross.d/common-musl [moved from meta/recipes-core/glib-2.0/glib-2.0/meson.cross.d/common-musl with 100% similarity]
meta/recipes-core/glib-2.0/files/relocate-modules.patch [moved from meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch with 86% similarity]
meta/recipes-core/glib-2.0/files/run-ptest [moved from meta/recipes-core/glib-2.0/glib-2.0/run-ptest with 100% similarity]
meta/recipes-core/glib-2.0/files/skip-timeout.patch [moved from meta/recipes-core/glib-2.0/glib-2.0/skip-timeout.patch with 90% similarity]
meta/recipes-core/glib-2.0/glib-2.0-initial_2.80.0.bb [new file with mode: 0644]
meta/recipes-core/glib-2.0/glib-2.0/0001-Switch-from-the-deprecated-distutils-module-to-the-p.patch [deleted file]
meta/recipes-core/glib-2.0/glib-2.0/fix-regex.patch [deleted file]
meta/recipes-core/glib-2.0/glib-2.0/memory-monitor.patch [deleted file]
meta/recipes-core/glib-2.0/glib-2.0_2.78.4.bb [deleted file]
meta/recipes-core/glib-2.0/glib-2.0_2.80.0.bb [new file with mode: 0644]
meta/recipes-core/glib-2.0/glib.inc
meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch
meta/recipes-gnome/gobject-introspection/gobject-introspection_1.80.1.bb [moved from meta/recipes-gnome/gobject-introspection/gobject-introspection_1.78.1.bb with 96% similarity]