glib/gobject-introspection: update 2.78.4 -> 2.80.0, 1.78.1 -> 1.80.0
PATCH v2 1/1 glib/gobject-introspection: update 2.78.4 -> 2.80.0, 1.78.1 -> 1.80.0
From: Alexander Kanavin <[email protected]>
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.
---
meta/conf/distro/include/maintainers.inc | 1 +
...t-write-bindir-into-pkg-config-files.patch | 31 +-
...0001-Fix-DATADIRNAME-on-uclibc-Linux.patch | 2 +-
...-gio-querymodules-as-libexec_PROGRAM.patch | 6 +-
...ng-about-deprecated-paths-in-schemas.patch | 2 +-
...-correctly-when-building-with-mingw3.patch | 20 +-
...ces.c-comment-out-a-build-host-only-.patch | 4 +-
...rospection-correctly-install-.gir-fi.patch | 88 +++++
...on-Run-atomics-test-on-clang-as-well.patch | 6 +-
...ot-enable-pidfd-features-on-native-g.patch | 6 +-
...dcode-python-path-into-various-tools.patch | 4 +-
.../{glib-2.0 => files}/meson.cross.d/common | 0
.../meson.cross.d/common-glibc | 0
.../meson.cross.d/common-linux | 0
.../meson.cross.d/common-mingw | 0
.../meson.cross.d/common-musl | 0
.../relocate-modules.patch | 8 +-
.../glib-2.0/{glib-2.0 => files}/run-ptest | 0
.../{glib-2.0 => files}/skip-timeout.patch | 7 +-
.../glib-2.0/glib-2.0-initial_2.80.0.bb | 5 +
...deprecated-distutils-module-to-the-p.patch | 34 --
.../glib-2.0/glib-2.0/fix-regex.patch | 54 ---
.../glib-2.0/glib-2.0/memory-monitor.patch | 361 ------------------
meta/recipes-core/glib-2.0/glib-2.0_2.78.4.bb | 57 ---
meta/recipes-core/glib-2.0/glib-2.0_2.80.0.bb | 1 +
meta/recipes-core/glib-2.0/glib.inc | 71 +++-
...pository-directory-for-native-builds.patch | 11 +-
...8.1.bb => gobject-introspection_1.80.1.bb} | 8 +-
28 files changed, 219 insertions(+), 568 deletions(-)
rename meta/recipes-core/glib-2.0/{glib-2.0 => files}/0001-Do-not-write-bindir-into-pkg-config-files.patch (68%)
rename meta/recipes-core/glib-2.0/{glib-2.0 => files}/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch (92%)
rename meta/recipes-core/glib-2.0/{glib-2.0 => files}/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch (84%)
rename meta/recipes-core/glib-2.0/{glib-2.0 => files}/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch (95%)
rename meta/recipes-core/glib-2.0/{glib-2.0 => files}/0001-Set-host_machine-correctly-when-building-with-mingw3.patch (80%)
rename meta/recipes-core/glib-2.0/{glib-2.0 => files}/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch (92%)
create mode 100644 meta/recipes-core/glib-2.0/files/0001-girepository-introspection-correctly-install-.gir-fi.patch
rename meta/recipes-core/glib-2.0/{glib-2.0 => files}/0001-meson-Run-atomics-test-on-clang-as-well.patch (88%)
rename meta/recipes-core/glib-2.0/{glib-2.0 => files}/0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch (84%)
rename meta/recipes-core/glib-2.0/{glib-2.0 => files}/0010-Do-not-hardcode-python-path-into-various-tools.patch (93%)
rename meta/recipes-core/glib-2.0/{glib-2.0 => files}/meson.cross.d/common (100%)
rename meta/recipes-core/glib-2.0/{glib-2.0 => files}/meson.cross.d/common-glibc (100%)
rename meta/recipes-core/glib-2.0/{glib-2.0 => files}/meson.cross.d/common-linux (100%)
rename meta/recipes-core/glib-2.0/{glib-2.0 => files}/meson.cross.d/common-mingw (100%)
rename meta/recipes-core/glib-2.0/{glib-2.0 => files}/meson.cross.d/common-musl (100%)
rename meta/recipes-core/glib-2.0/{glib-2.0 => files}/relocate-modules.patch (86%)
rename meta/recipes-core/glib-2.0/{glib-2.0 => files}/run-ptest (100%)
rename meta/recipes-core/glib-2.0/{glib-2.0 => files}/skip-timeout.patch (90%)
create mode 100644 meta/recipes-core/glib-2.0/glib-2.0-initial_2.80.0.bb
delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-Switch-from-the-deprecated-distutils-module-to-the-p.patch
delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/fix-regex.patch
delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/memory-monitor.patch
delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.78.4.bb
create mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.80.0.bb
rename meta/recipes-gnome/gobject-introspection/{gobject-introspection_1.78.1.bb => gobject-introspection_1.80.1.bb} (96%)meta/conf/distro/include/maintainers.inc +1 -0
@@ -205,6 +205,7 @@ RECIPE_MAINTAINER:pn-gi-docgen = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER:pn-git = "Robert Yang <[email protected]>" RECIPE_MAINTAINER:pn-glew = "Anuj Mittal <[email protected]>" RECIPE_MAINTAINER:pn-glib-2.0 = "Anuj Mittal <[email protected]>" +RECIPE_MAINTAINER:pn-glib-2.0-initial = "Anuj Mittal <[email protected]>" RECIPE_MAINTAINER:pn-glib-networking = "Anuj Mittal <[email protected]>" RECIPE_MAINTAINER:pn-glibc = "Khem Raj <[email protected]>" RECIPE_MAINTAINER:pn-glibc-locale = "Khem Raj <[email protected]>"
meta/recipes-core/glib-2.0/files/0001-Do-not-write-bindir-into-pkg-config-files.patch renamed from meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch +18 -13
@@ -1,26 +1,30 @@ -From e7077aa23bfcd31a8e72e39dc93ce4f854678376 Mon Sep 17 00:00:00 2001 +From 0561dcbf0918631d8106c3f6c2d8e92a5ec4b887 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Fri, 15 Feb 2019 11:17:27 +0100 -Subject: [PATCH] Do not write $bindir into pkg-config files +Subject: [PATCH] Do not prefix executables with $bindir in pkg-config files -This would otherwise break when using the files to build other target +This would otherwise break when using the executables to build other target components (we need to rely on PATH containing the paths to utilities, rather than use target paths). Upstream-Status: Inappropriate [upstream wants the paths in .pc files] Signed-off-by: Alexander Kanavin <[email protected]> --- - gio/meson.build | 16 ++++++++-------- - glib/meson.build | 6 +++--- - 2 files changed, 11 insertions(+), 11 deletions(-) + gio/meson.build | 17 +++++++++-------- + glib/meson.build | 7 ++++--- + 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/gio/meson.build b/gio/meson.build -index 5f91586..1a95f4f 100644 +index 77cba7b..25d709e 100644 --- a/gio/meson.build +++ b/gio/meson.build -@@ -884,14 +884,14 @@ pkg.generate(libgio, +@@ -883,17 +883,18 @@ libgio_dep = declare_dependency(link_with : libgio, + pkg.generate(libgio, + requires : ['glib-2.0', 'gobject-2.0'], + variables : [ ++ 'bindir=' + '${prefix}' / get_option('bindir'), + 'schemasdir=' + '${datadir}' / schemas_subdir, 'dtdsdir=' + '${datadir}' / dtds_subdir, - 'bindir=' + '${prefix}' / get_option('bindir'), 'giomoduledir=' + pkgconfig_giomodulesdir, - 'gio=' + '${bindir}' / 'gio', - 'gio_querymodules=' + pkgconfig_multiarch_bindir / 'gio-querymodules',
@@ -42,16 +46,17 @@ index 5f91586..1a95f4f 100644 version : glib_version, install_dir : glib_pkgconfigreldir, diff --git a/glib/meson.build b/glib/meson.build -index c26a35e..1d8ca6b 100644 +index d2efeba..5f5841d 100644 --- a/glib/meson.build +++ b/glib/meson.build -@@ -447,9 +447,9 @@ pkg.generate(libglib, +@@ -447,9 +447,10 @@ pkg.generate(libglib, + subdirs : ['glib-2.0'], + extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags, variables : [ - 'bindir=' + '${prefix}' / get_option('bindir'), - 'datadir=' + '${prefix}' / get_option('datadir'), - 'glib_genmarshal=' + '${bindir}' / 'glib-genmarshal', - 'gobject_query=' + '${bindir}' / 'gobject-query', - 'glib_mkenums=' + '${bindir}' / 'glib-mkenums', ++ 'bindir=' + '${prefix}' / get_option('bindir'), + 'glib_genmarshal=glib-genmarshal', + 'gobject_query=gobject-query', + 'glib_mkenums=glib-mkenums',
meta/recipes-core/glib-2.0/files/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch renamed from meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch +1 -1
@@ -1,4 +1,4 @@ -From 9a5d4bf65b658d744d610ee27ecd2ae65b14b158 Mon Sep 17 00:00:00 2001 +From ccb25e8c0bab54eac8ba0e9d7083ce81461ab72a Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Sat, 15 Mar 2014 22:42:29 -0700 Subject: [PATCH] Fix DATADIRNAME on uclibc/Linux
meta/recipes-core/glib-2.0/files/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch renamed from meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch +3 -3
@@ -1,4 +1,4 @@ -From 4933aef791857a5aac650b60af800778658b875b Mon Sep 17 00:00:00 2001 +From caab40411d8520dae77a4b7933ebaffbb00559fe Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen <[email protected]> Date: Tue, 22 Mar 2016 15:14:58 +0200 Subject: [PATCH] Install gio-querymodules as libexec_PROGRAM
@@ -13,10 +13,10 @@ Upstream-Status: Inappropriate [OE specific] 1 file changed, 1 insertion(+) diff --git a/gio/meson.build b/gio/meson.build -index f9fdf6e..5f91586 100644 +index 59c2b0f..77cba7b 100644 --- a/gio/meson.build +++ b/gio/meson.build -@@ -1005,6 +1005,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu +@@ -1007,6 +1007,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu c_args : gio_c_args, # intl.lib is not compatible with SAFESEH link_args : noseh_link_args,
meta/recipes-core/glib-2.0/files/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch renamed from meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch +1 -1
@@ -1,4 +1,4 @@ -From 8ae2e9c2a04e089306693a021149dc6b7d1bd679 Mon Sep 17 00:00:00 2001 +From 65c036b1ede453e89893076f4ece21c946505096 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Fri, 12 Jun 2015 17:08:46 +0300 Subject: [PATCH] Remove the warning about deprecated paths in schemas
meta/recipes-core/glib-2.0/files/0001-Set-host_machine-correctly-when-building-with-mingw3.patch renamed from meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch +10 -10
@@ -1,4 +1,4 @@ -From c0733f7a91dfe13152abc60c5a3064456b3e9d63 Mon Sep 17 00:00:00 2001 +From 01810df82fae752428d3756c85edb2eb7bbf3c15 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Wed, 13 Feb 2019 15:32:05 +0100 Subject: [PATCH] Set host_machine correctly when building with mingw32
@@ -12,7 +12,7 @@ Signed-off-by: Alexander Kanavin <[email protected]> 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/gio/tests/meson.build b/gio/tests/meson.build -index 4ef3343..e498e7e 100644 +index 232ecca..563298b 100644 --- a/gio/tests/meson.build +++ b/gio/tests/meson.build @@ -29,7 +29,7 @@ endif
@@ -24,16 +24,16 @@ index 4ef3343..e498e7e 100644 common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library ('secur32')] endif -@@ -230,7 +230,7 @@ if have_dbus_daemon +@@ -244,7 +244,7 @@ if have_dbus_daemon endif # Test programs buildable on UNIX only -if host_machine.system() != 'windows' +if host_system != 'windows' gio_tests += { - 'file' : {}, - 'gdbus-peer-object-manager' : {}, -@@ -562,7 +562,7 @@ if host_machine.system() != 'windows' + 'file' : { + # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/3148 +@@ -593,7 +593,7 @@ if host_machine.system() != 'windows' endif # unix # Test programs buildable on Windows only
@@ -42,7 +42,7 @@ index 4ef3343..e498e7e 100644 gio_tests += {'win32-streams' : {}} endif -@@ -632,7 +632,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl' +@@ -663,7 +663,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl' } endif
@@ -52,10 +52,10 @@ index 4ef3343..e498e7e 100644 'gdbus-example-unix-fd-client' : { 'install' : false, diff --git a/glib/tests/meson.build b/glib/tests/meson.build -index d80c86e..5329cda 100644 +index f6efc59..83eb5a5 100644 --- a/glib/tests/meson.build +++ b/glib/tests/meson.build -@@ -216,7 +216,7 @@ if glib_conf.has('HAVE_EVENTFD') +@@ -226,7 +226,7 @@ if glib_conf.has('HAVE_EVENTFD') } endif
@@ -65,7 +65,7 @@ index d80c86e..5329cda 100644 glib_tests += { 'gpoll' : { diff --git a/meson.build b/meson.build -index 813c9b7..6ee775e 100644 +index 7534542..2560686 100644 --- a/meson.build +++ b/meson.build @@ -54,6 +54,9 @@ else
meta/recipes-core/glib-2.0/files/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch renamed from meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch +2 -2
@@ -1,4 +1,4 @@ -From 878e51f82100c698236fda0e069e14ea9249350c Mon Sep 17 00:00:00 2001 +From e8b4f53b567339aad90b585673d55a5c6176535a Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Wed, 8 Jan 2020 18:22:46 +0100 Subject: [PATCH] gio/tests/resources.c: comment out a build host-only test
@@ -13,7 +13,7 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gio/tests/resources.c b/gio/tests/resources.c -index f567914..b21b616 100644 +index f7dc039..f708876 100644 --- a/gio/tests/resources.c +++ b/gio/tests/resources.c @@ -1068,7 +1068,7 @@ main (int argc,
meta/recipes-core/glib-2.0/files/0001-girepository-introspection-correctly-install-.gir-fi.patch new file +88 -0
88 lines not on this page · raw message
meta/recipes-core/glib-2.0/files/0001-meson-Run-atomics-test-on-clang-as-well.patch renamed from meta/recipes-core/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch +3 -3
@@ -1,4 +1,4 @@ -From b4b523160ef550a53705fcc45ac6e10d086ce491 Mon Sep 17 00:00:00 2001 +From 3dc2e741e18ccb740e98eb4e808ff83153b70e83 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Sat, 12 Oct 2019 17:46:26 -0700 Subject: [PATCH] meson: Run atomics test on clang as well
@@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index 6ee775e..8bc5fa7 100644 +index 2560686..5c46d0b 100644 --- a/meson.build +++ b/meson.build -@@ -1938,7 +1938,7 @@ atomicdefine = ''' +@@ -2024,7 +2024,7 @@ atomicdefine = ''' # We know that we can always use real ("lock free") atomic operations with MSVC if cc.get_id() == 'msvc' or cc.get_id() == 'clang-cl' or cc.links(atomictest, name : 'atomic ops') have_atomic_lock_free = true
meta/recipes-core/glib-2.0/files/0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch renamed from meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch +3 -3
@@ -1,4 +1,4 @@ -From 294f3e6e9a0a9f4733e85ed6810d1b743055370b Mon Sep 17 00:00:00 2001 +From 59525eedfbbfe4a16fdd0b340bc3f2479431c7d5 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Sat, 16 Sep 2023 22:28:27 +0200 Subject: [PATCH] meson.build: do not enable pidfd features on native glib
@@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index 8bc5fa7..df1fa60 100644 +index 5c46d0b..222c1a1 100644 --- a/meson.build +++ b/meson.build -@@ -981,7 +981,8 @@ if cc.links('''#include <sys/syscall.h> +@@ -1022,7 +1022,8 @@ if cc.links('''#include <sys/syscall.h> waitid (P_PIDFD, 0, &child_info, WEXITED | WNOHANG); return 0; }''', name : 'pidfd_open(2) system call')
meta/recipes-core/glib-2.0/files/0010-Do-not-hardcode-python-path-into-various-tools.patch renamed from meta/recipes-core/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch +2 -2
@@ -1,4 +1,4 @@ -From 50636758c73e5e61212a8f801c6c602b8aab5ba7 Mon Sep 17 00:00:00 2001 +From e6784ba43af83e22556921786c8f15e4cd246298 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Tue, 3 Oct 2017 10:45:55 +0300 Subject: [PATCH] Do not hardcode python path into various tools
@@ -32,7 +32,7 @@ index aa5af43..56e8e2e 100755 # pylint: disable=too-many-lines, missing-docstring, invalid-name diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in -index 353e53a..8ed6c39 100755 +index e10b910..4b619f8 100755 --- a/gobject/glib-mkenums.in +++ b/gobject/glib-mkenums.in @@ -1,4 +1,4 @@
meta/recipes-core/glib-2.0/files/meson.cross.d/common renamed from meta/recipes-core/glib-2.0/glib-2.0/meson.cross.d/common +0 -0
meta/recipes-core/glib-2.0/files/meson.cross.d/common-glibc renamed from meta/recipes-core/glib-2.0/glib-2.0/meson.cross.d/common-glibc +0 -0
meta/recipes-core/glib-2.0/files/meson.cross.d/common-linux renamed from meta/recipes-core/glib-2.0/glib-2.0/meson.cross.d/common-linux +0 -0
meta/recipes-core/glib-2.0/files/meson.cross.d/common-mingw renamed from meta/recipes-core/glib-2.0/glib-2.0/meson.cross.d/common-mingw +0 -0
meta/recipes-core/glib-2.0/files/meson.cross.d/common-musl renamed from meta/recipes-core/glib-2.0/glib-2.0/meson.cross.d/common-musl +0 -0
meta/recipes-core/glib-2.0/files/relocate-modules.patch renamed from meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch +4 -4
@@ -1,4 +1,4 @@ -From f40e89b3852df37959606ee13b1a14ade81fa886 Mon Sep 17 00:00:00 2001 +From 47ea2576a13d5bc86692b4ba8cb4a8f2fd38c6ca Mon Sep 17 00:00:00 2001 From: Ross Burton <[email protected]> Date: Fri, 11 Mar 2016 15:35:55 +0000 Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds
@@ -18,10 +18,10 @@ Signed-off-by: Jussi Kukkonen <[email protected]> 1 file changed, 7 deletions(-) diff --git a/gio/giomodule.c b/gio/giomodule.c -index 17fabe6..8021208 100644 +index 1e14955..3c09bb5 100644 --- a/gio/giomodule.c +++ b/gio/giomodule.c -@@ -1271,11 +1271,6 @@ get_gio_module_dir (void) +@@ -1259,11 +1259,6 @@ get_gio_module_dir (void) g_free (install_dir); #else module_dir = g_strdup (GIO_MODULE_DIR);
@@ -33,7 +33,7 @@ index 17fabe6..8021208 100644 #include <dlfcn.h> { g_autofree gchar *path = NULL; -@@ -1294,8 +1289,6 @@ get_gio_module_dir (void) +@@ -1282,8 +1277,6 @@ get_gio_module_dir (void) } } }
meta/recipes-core/glib-2.0/files/run-ptest renamed from meta/recipes-core/glib-2.0/glib-2.0/run-ptest +0 -0
meta/recipes-core/glib-2.0/files/skip-timeout.patch renamed from meta/recipes-core/glib-2.0/glib-2.0/skip-timeout.patch +2 -5
@@ -1,4 +1,4 @@ -From bb11d1a4ae77d93ec0743e54077cf0f990243fa6 Mon Sep 17 00:00:00 2001 +From 682d8a616ca111c0e45c8a9cb02e992e63c69586 Mon Sep 17 00:00:00 2001 From: Ross Burton <[email protected]> Date: Thu, 28 Mar 2024 16:27:09 +0000 Subject: [PATCH] Skip /timeout/rounding test
@@ -16,7 +16,7 @@ Signed-off-by: Ross Burton <[email protected]> 1 file changed, 1 deletion(-) diff --git a/glib/tests/timeout.c b/glib/tests/timeout.c -index 1ae3f3a34..85a715b0f 100644 +index 1ae3f3a..85a715b 100644 --- a/glib/tests/timeout.c +++ b/glib/tests/timeout.c @@ -214,7 +214,6 @@ main (int argc, char *argv[])
@@ -27,6 +27,3 @@ index 1ae3f3a34..85a715b0f 100644 return g_test_run (); } --- -2.34.1 -
meta/recipes-core/glib-2.0/glib-2.0-initial_2.80.0.bb new file +5 -0
@@ -0,0 +1,5 @@ +require glib.inc +PACKAGES = "" +PACKAGECONFIG = "" + +
meta/recipes-core/glib-2.0/glib-2.0/0001-Switch-from-the-deprecated-distutils-module-to-the-p.patch deleted +0 -34
@@ -1,34 +0,0 @@ -From a8eb944a10353403241608a084787f6efcbb2eb7 Mon Sep 17 00:00:00 2001 -From: Jordan Williams <[email protected]> -Date: Fri, 1 Dec 2023 09:53:50 -0600 -Subject: [PATCH] Switch from the deprecated distutils module to the packaging - module - -The distutils module was removed in Python 3.12. - -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/commit/6ef967a0f930ce37a8c9b5aff969693b34714291] - -Signed-off-by: Martin Jansa <[email protected]> ---- - gio/gdbus-2.0/codegen/utils.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gio/gdbus-2.0/codegen/utils.py b/gio/gdbus-2.0/codegen/utils.py -index 0204610..08f1ba9 100644 ---- a/gio/gdbus-2.0/codegen/utils.py -+++ b/gio/gdbus-2.0/codegen/utils.py -@@ -19,7 +19,7 @@ - # - # Author: David Zeuthen <[email protected]> - --import distutils.version -+import packaging.version - import os - import sys - -@@ -166,4 +166,4 @@ def version_cmp_key(key): - v = str(key[0]) - else: - v = "0" -- return (distutils.version.LooseVersion(v), key[1]) -+ return (packaging.version.Version(v), key[1])
meta/recipes-core/glib-2.0/glib-2.0/fix-regex.patch deleted +0 -54
54 lines not on this page · raw message
meta/recipes-core/glib-2.0/glib-2.0/memory-monitor.patch deleted +0 -361
361 lines not on this page · raw message
meta/recipes-core/glib-2.0/glib-2.0_2.78.4.bb deleted +0 -57
57 lines not on this page · raw message
meta/recipes-core/glib-2.0/glib-2.0_2.80.0.bb new file +1 -0
@@ -0,0 +1 @@ +require glib.inc
meta/recipes-core/glib-2.0/glib.inc +65 -6
103 lines not on this page · raw message
meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch +5 -6
@@ -1,4 +1,4 @@ -From aeb5532f8be42d42f4e8725ca42e239b36983a4d Mon Sep 17 00:00:00 2001 +From 4e1aa0ddbc43403ff24f644b4c4912b737290c41 Mon Sep 17 00:00:00 2001 From: Sascha Silbe <[email protected]> Date: Fri, 8 Jun 2018 13:55:10 +0200 Subject: [PATCH] Relocate the repository directory for native builds
@@ -14,14 +14,13 @@ cache or sstate mirror). Upstream-Status: Inappropriate Signed-off-by: Sascha Silbe <[email protected]> - --- girepository/girepository.c | 15 +++++++++++++-- girepository/meson.build | 2 +- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/girepository/girepository.c b/girepository/girepository.c -index a0754f4..2d456f9 100644 +index 12eaf36..876382c 100644 --- a/girepository/girepository.c +++ b/girepository/girepository.c @@ -21,6 +21,8 @@
@@ -42,7 +41,7 @@ index a0754f4..2d456f9 100644 /** * SECTION:girepository * @short_description: GObject Introspection repository manager -@@ -215,9 +219,16 @@ init_globals (void) +@@ -222,9 +226,16 @@ init_globals (void) g_free (custom_dirs); }
@@ -62,10 +61,10 @@ index a0754f4..2d456f9 100644 typelib_search_path = g_slist_prepend (typelib_search_path, typelib_dir); diff --git a/girepository/meson.build b/girepository/meson.build -index 786749a..15cf2a9 100644 +index 5ced59e..a580d9b 100644 --- a/girepository/meson.build +++ b/girepository/meson.build -@@ -45,7 +45,7 @@ girepo_internals_lib = static_library('girepository-internals', +@@ -47,7 +47,7 @@ girepo_internals_lib = static_library('girepository-internals', ], c_args: gi_hidden_visibility_cflags + custom_c_args, include_directories : configinc,
meta/recipes-gnome/gobject-introspection/gobject-introspection_1.80.1.bb renamed from meta/recipes-gnome/gobject-introspection/gobject-introspection_1.78.1.bb +5 -3
@@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c434e8128a68bedd59b80b2ac1eb1c4a \ SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-${PV}.tar.xz \ " -SRC_URI[sha256sum] = "bd7babd99af7258e76819e45ba4a6bc399608fe762d83fde3cac033c50841bb4" +SRC_URI[sha256sum] = "a1df7c424e15bda1ab639c00e9051b9adf5cea1a9e512f8a603b53cd199bc6d8" SRC_URI:append:class-native = " file://0001-Relocate-the-repository-directory-for-native-builds.patch"
@@ -26,7 +26,9 @@ GTKDOC_MESON_OPTION = "gtk_doc" MULTILIB_SCRIPTS = "${PN}:${bindir}/g-ir-annotation-tool ${PN}:${bindir}/g-ir-scanner" -DEPENDS += " libffi zlib glib-2.0 python3 flex-native bison-native" +DEPENDS += " libffi zlib python3 flex-native bison-native" +DEPENDS:append:class-native = " glib-2.0" +DEPENDS:append:class-target = " glib-2.0-initial" # target build needs qemu to run temporary introspection binaries created # on the fly by g-ir-scanner and a native version of itself to run
@@ -189,6 +191,6 @@ FILES:${PN}-dbg += "${libdir}/gobject-introspection/giscanner/.debug/" FILES:${PN}-staticdev += "${libdir}/gobject-introspection/giscanner/*.a" # setuptools can be removed when upstream removes all uses of distutils -RDEPENDS:${PN} = "python3-pickle python3-xml python3-setuptools" +RDEPENDS:${PN} = "python3-pickle python3-xml python3-setuptools glib-2.0" BBCLASSEXTEND = "native"
Signature · 1 line
2.39.2
Quoted 4 lines · Alexander Kanavin
-PACKAGECONFIG[manpages] = "-Dman=true, -Dman=false, libxslt-native xmlto-native"
+PACKAGECONFIG[manpages] = "-Dman=true, -Dman=false, python3- docutils-native"
man option has been deprecated and man-pages should be used instead with enabled|disabled values.
https://gitlab.gnome.org/GNOME/glib/-/commit/031e65808d443f16ce3c492dfe72f24725ca1bd1
Thanks,
Anuj
Hi Alex,
Thanks for digging into this!
packages/cortexa57-poky-linux/glib-2.0/glib-2.0-utils: FILELIST: added "/usr/bin/gi-compile-repository /usr/bin/gi-inspect-typelib /usr/bin/gi-decompile-typelib” packages/cortexa57-poky-linux/glib-2.0/glib-2.0-utils: PKGSIZE changed from 770935 to 1105901 (+43%)
Any image that uses GSettings pulls in this package for the gsettings tools. Should these normally built-time utilities be moved to glib-2.0-codegen instead?
Ross
Quoted 4 lines · Ross Burton
packages/cortexa57-poky-linux/glib-2.0/glib-2.0-utils: FILELIST: added "
/usr/bin/gi-compile-repository/usr/bin/gi-inspect-typelib/usr/bin/gi-decompile-typelib” packages/cortexa57-poky-linux/glib-2.0/glib-2.0-utils: PKGSIZE changed from 770935 to 1105901 (+43%)Any image that uses GSettings pulls in this package for the gsettings tools. Should these normally built-time utilities be moved to glib-2.0-codegen instead?
glib-2.0-codegen is meant specifically for that utility. If we need to trim down space usage, I'd rather put gsettings stuff in its own package, but it's not clear what is actually needed for it:
alex@Zen2:/srv/storage/alex/yocto/build-64-alt/tmp/work/core2-64-poky-linux/glib-2.0/2.80.0$ find packages-split/glib-2.0-utils/usr/bin/ packages-split/glib-2.0-utils/usr/bin/ packages-split/glib-2.0-utils/usr/bin/gtester packages-split/glib-2.0-utils/usr/bin/gobject-query packages-split/glib-2.0-utils/usr/bin/gio packages-split/glib-2.0-utils/usr/bin/gresource packages-split/glib-2.0-utils/usr/bin/glib-compile-schemas packages-split/glib-2.0-utils/usr/bin/glib-compile-resources packages-split/glib-2.0-utils/usr/bin/gsettings packages-split/glib-2.0-utils/usr/bin/gdbus packages-split/glib-2.0-utils/usr/bin/gapplication packages-split/glib-2.0-utils/usr/bin/gi-compile-repository packages-split/glib-2.0-utils/usr/bin/gi-decompile-typelib packages-split/glib-2.0-utils/usr/bin/gi-inspect-typelib packages-split/glib-2.0-utils/usr/bin/glib-gettextize packages-split/glib-2.0-utils/usr/bin/glib-genmarshal packages-split/glib-2.0-utils/usr/bin/glib-mkenums packages-split/glib-2.0-utils/usr/bin/gtester-report
Alex
Quoted 22 lines · Alexander Kanavin
Quoted 4 lines · Ross Burton
packages/cortexa57-poky-linux/glib-2.0/glib-2.0-utils: FILELIST: added "
/usr/bin/gi-compile-repository/usr/bin/gi-inspect-typelib/usr/bin/gi-decompile-typelib” packages/cortexa57-poky-linux/glib-2.0/glib-2.0-utils: PKGSIZE changed from 770935 to 1105901 (+43%)Any image that uses GSettings pulls in this package for the gsettings tools. Should these normally built-time utilities be moved to glib-2.0-codegen instead?
glib-2.0-codegen is meant specifically for that utility. If we need to trim down space usage, I'd rather put gsettings stuff in its own package, but it's not clear what is actually needed for it:
alex@Zen2:/srv/storage/alex/yocto/build-64-alt/tmp/work/core2-64-poky-linux/glib-2.0/2.80.0$ find packages-split/glib-2.0-utils/usr/bin/ packages-split/glib-2.0-utils/usr/bin/ packages-split/glib-2.0-utils/usr/bin/gtester packages-split/glib-2.0-utils/usr/bin/gobject-query packages-split/glib-2.0-utils/usr/bin/gio packages-split/glib-2.0-utils/usr/bin/gresource packages-split/glib-2.0-utils/usr/bin/glib-compile-schemas packages-split/glib-2.0-utils/usr/bin/glib-compile-resources packages-split/glib-2.0-utils/usr/bin/gsettings packages-split/glib-2.0-utils/usr/bin/gdbus
Quoted 8 lines
packages-split/glib-2.0-utils/usr/bin/gapplication packages-split/glib-2.0-utils/usr/bin/gi-compile-repository packages-split/glib-2.0-utils/usr/bin/gi-decompile-typelib packages-split/glib-2.0-utils/usr/bin/gi-inspect-typelib packages-split/glib-2.0-utils/usr/bin/glib-gettextize packages-split/glib-2.0-utils/usr/bin/glib-genmarshal packages-split/glib-2.0-utils/usr/bin/glib-mkenums packages-split/glib-2.0-utils/usr/bin/gtester-report
Maybe we need to split this into general purpose utilities and development tools: gsettings should be in -utils but gi-* glib-* gtester-* should be in -dev as they’ll only be used when building code that uses glib.
Ross
meta/recipes-core/glib-2.0/files/0001-girepository-introspection-correctly-install-.gir-fi.patch line 7
Quoted 12 lines · Alexander Kanavin via lists.openembedded.org
+++
b/meta/recipes-core/glib-2.0/files/0001-girepository-introspection-correctly-install-.gir-fi.patchmeta/recipes-core/glib-2.0/files/0001-girepository-introspection-correctly-install-.gir-fi.patch new file +7
-0@@ -0,0 +1,88 @@ +From 4e6be5d15e5d2f8e494d22a3d49b623064f9c1a5 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Tue, 23 Apr 2024 11:24:34 +0200 +Subject: [PATCH] girepository/introspection: correctly install .gir files into + custom locations provided via meson option + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4020]
If you send a v3, this can be Backport. :)
meta/recipes-core/glib-2.0/glib.inc PACKAGES += "${PN}-codegen ${PN}-utils" · line 48
Quoted 1 line
meta/recipes-core/glib-2.0/glib.inc +1
-0+EXTRA_OEMESON:append:class-target = " ${@'-Dgir_dir_prefix=${libdir}' if d.getVar('MULTILIBS') else ''}"
Why does this need to be conditional?
Review
Quoted 3 lines
# setuptools can be removed when upstream removes all uses of distutils(quoted diff) +1
-1-RDEPENDS:${PN} = "python3-pickle python3-xml python3-setuptools" +RDEPENDS:${PN} = "python3-pickle python3-xml python3-setuptools glib-2.0”
Is setuptools still needed? If so, might be worth calling out what the exact user is because a simple grep doesn’t find any users.
Ross
Quoted 1 line · Ross Burton
If you send a v3, this can be Backport. :)
I'm leaning towards addressing the review comments with followup patches. None is a critical fix needed for update itself. You ok with that?
Quoted 3 lines
Quoted 1 line
+EXTRA_OEMESON:append:class-target = " ${@'-Dgir_dir_prefix=${libdir}' if
d.getVar('MULTILIBS')else ''}"Why does this need to be conditional?
This is a direct copy-paste from g-i recipe. g-i (before) and glib (now) install gir files into /usr/share by default which doesn't work for multilib because they differ between 32 and 64 bit targets, and package manager errors out.
Quoted 5 lines
Review
Quoted 3 lines
# setuptools can be removed when upstream removes all uses of distutils(quoted diff) +1
-1-RDEPENDS:${PN} = "python3-pickle python3-xml python3-setuptools" +RDEPENDS:${PN} = "python3-pickle python3-xml python3-setuptools glib-2.0”Is setuptools still needed? If so, might be worth calling out what the exact user is because a simple grep doesn’t find any users.
Indeed, neither distutils nor setuptools are anywhere in 2.80.0 tree.
Alex
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 7 lines · Alexander Kanavin via lists.openembedded.org
Quoted 5 lines
Review
Quoted 3 lines
# setuptools can be removed when upstream removes all uses of distutils(quoted diff) +1
-1-RDEPENDS:${PN} = "python3-pickle python3-xml python3-setuptools" +RDEPENDS:${PN} = "python3-pickle python3-xml python3-setuptools glib-2.0”Is setuptools still needed? If so, might be worth calling out what the exact user is because a simple grep doesn’t find any users.
Indeed, neither distutils nor setuptools are anywhere in 2.80.0 tree.
This is in g-i recipe, not in glib. And that still has plenty of references to distutils as of 1.80.1.
Alex
meta/recipes-core/glib-2.0/glib.inc PACKAGES += "${PN}-codegen ${PN}-utils" · line 31
Quoted 5 lines · Alexander Kanavin via lists.openembedded.org
meta/recipes-core/glib-2.0/glib.inc +1
-1-GTKDOC_MESON_OPTION = "gtk_doc" +inherit meson gettext gi-docgen pkgconfig ptest-gnome upstream-version-is-even bash-completion gio-module-cache manpages gobject-introspection-data
You’ll want to set GIDOCGEN_MESON_OPTION = “documentation”, the default of ‘gtk_doc’ is deprecated.
Also, and I know it’s a pain, but splitting the “rearrange inc/bb” changes into a separate commit would make this easier to review.
Ross
2024. 05. 02. 12:32 keltezéssel, Alexander Kanavin via lists.openembedded.org írta:
Quoted 29 lines
...
meta/recipes-gnome/gobject-introspection/gobject-introspection_1.80.1.bb renamed from meta/recipes-gnome/gobject-introspection/gobject-introspection_1.78.1.bb +4
-2@@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c434e8128a68bedd59b80b2ac1eb1c4a \ SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-${PV}.tar.xz \ " -SRC_URI[sha256sum] = "bd7babd99af7258e76819e45ba4a6bc399608fe762d83fde3cac033c50841bb4" +SRC_URI[sha256sum] = "a1df7c424e15bda1ab639c00e9051b9adf5cea1a9e512f8a603b53cd199bc6d8" SRC_URI:append:class-native = " file://0001-Relocate-the-repository-directory-for-native-builds.patch"@@ -26,7 +26,9 @@ GTKDOC_MESON_OPTION = "gtk_doc" MULTILIB_SCRIPTS = "${PN}:${bindir}/g-ir-annotation-tool ${PN}:${bindir}/g-ir-scanner" -DEPENDS += " libffi zlib glib-2.0 python3 flex-native bison-native" +DEPENDS += " libffi zlib python3 flex-native bison-native" +DEPENDS:append:class-native = " glib-2.0" +DEPENDS:append:class-target = " glib-2.0-initial" # target build needs qemu to run temporary introspection binaries created # on the fly by g-ir-scanner and a native version of itself to run
meta/recipes-gnome/gobject-introspection/gobject-introspection_1.80.1.bb FILES:${PN}-dbg += "${libdir}/gobject-introspection/giscanner/.debug/" · line 196
Quoted 7 lines
meta/recipes-gnome/gobject-introspection/gobject-introspection_1.80.1.bb renamed from meta/recipes-gnome/gobject-introspection/gobject-introspection_1.78.1.bb +1
-1@@ -189,6 +191,6 @@ FILES:${PN}-dbg += "${libdir}/gobject-introspection/giscanner/.debug/" FILES:${PN}-staticdev += "${libdir}/gobject-introspection/giscanner/*.a" # setuptools can be removed when upstream removes all uses of distutils -RDEPENDS:${PN} = "python3-pickle python3-xml python3-setuptools" +RDEPENDS:${PN} = "python3-pickle python3-xml python3-setuptools glib-2.0" BBCLASSEXTEND = "native"
This needs to be BBCLASSEXTEND = "native nativesdk" to match glib.inc. An image build may contain this dependency chain now: nativesdk-glib-2.0 -> nativesdk-gobject-introspection -> nativesdk-glib-2.0-initial
Quoted 5 lines · Böszörményi Zoltán
Quoted 1 line
BBCLASSEXTEND = "native"
This needs to be BBCLASSEXTEND = "native nativesdk" to match glib.inc. An image build may contain this dependency chain now: nativesdk-glib-2.0 -> nativesdk-gobject-introspection -> nativesdk-glib-2.0-initial
That chain happens only when gobject-introspection-data is in distro features, and that is only present for target builds, not native or nativesdk.
Alex
Quoted 5 lines · Alexander Kanavin via lists.openembedded.org
Quoted 2 lines · Böszörményi Zoltán
Quoted 1 line
BBCLASSEXTEND = "native"
Quoted 7 lines
Quoted 3 lines
This needs to be BBCLASSEXTEND = "native nativesdk" to match glib.inc. An image build may contain this dependency chain now: nativesdk-glib-2.0 -> nativesdk-gobject-introspection -> nativesdk-glib-2.0-initial
That chain happens only when gobject-introspection-data is in distro features, and that is only present for target builds, not native or nativesdk.
There is a long-standing goal for G-I to work in both native and nativesdk, so I’m curious if this is the sole blocker for nativesdk to work.
Ross
Quoted 5 lines · Ross Burton
Quoted 3 lines
That chain happens only when gobject-introspection-data is in distro features, and that is only present for target builds, not native or nativesdk.
There is a long-standing goal for G-I to work in both native and nativesdk, so I’m curious if this is the sole blocker for nativesdk to work.
I don't know. You first need to specifically add gobject-introspection-data to nativesdk distro features, and then all kinds of things are likely going to break, even if BBCLASSEXTEND is set correctly everywhere. This is very much out of scope for this version update.
Alex