diff options
author | Alexander Kanavin <alex@linutronix.de> | 2024-05-02 12:32:52 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-05-13 16:28:35 +0100 |
commit | 393ff343014ef819f7b74bc189e6d59b32e3f8be (patch) | |
tree | 4e2ccece39ec00a32199b80ec43d3a6e74d8d992 /meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch | |
parent | 521a3f727c983ddfb877c3dfe653f70ce912413e (diff) | |
download | poky-393ff343014ef819f7b74bc189e6d59b32e3f8be.tar.gz |
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>
Diffstat (limited to 'meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch')
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch deleted file mode 100644 index 0e3a62af6a..0000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | From 8ae2e9c2a04e089306693a021149dc6b7d1bd679 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Fri, 12 Jun 2015 17:08:46 +0300 | ||
4 | Subject: [PATCH] Remove the warning about deprecated paths in schemas | ||
5 | |||
6 | Some schemas in gsettings-desktop-schemas (such as proxy and locale) | ||
7 | are still using deprecated paths, as of 3.16.1. This causes warning | ||
8 | messages, and meta/lib/oe/rootfs.py complaints about them. | ||
9 | |||
10 | Upstream-Status: Inappropriate | ||
11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
12 | --- | ||
13 | gio/glib-compile-schemas.c | 13 ------------- | ||
14 | 1 file changed, 13 deletions(-) | ||
15 | |||
16 | diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c | ||
17 | index 04ef404..e791ce2 100644 | ||
18 | --- a/gio/glib-compile-schemas.c | ||
19 | +++ b/gio/glib-compile-schemas.c | ||
20 | @@ -1232,19 +1232,6 @@ parse_state_start_schema (ParseState *state, | ||
21 | return; | ||
22 | } | ||
23 | |||
24 | - if (path && (g_str_has_prefix (path, "/apps/") || | ||
25 | - g_str_has_prefix (path, "/desktop/") || | ||
26 | - g_str_has_prefix (path, "/system/"))) | ||
27 | - { | ||
28 | - gchar *message = NULL; | ||
29 | - message = g_strdup_printf (_("Warning: Schema “%s” has path “%s”. " | ||
30 | - "Paths starting with " | ||
31 | - "“/apps/”, “/desktop/” or “/system/” are deprecated."), | ||
32 | - id, path); | ||
33 | - g_printerr ("%s\n", message); | ||
34 | - g_free (message); | ||
35 | - } | ||
36 | - | ||
37 | state->schema_state = schema_state_new (path, gettext_domain, | ||
38 | extends, extends_name, list_of); | ||
39 | |||