summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch
diff options
context:
space:
mode:
authorAlexander Kanavin <alex@linutronix.de>2024-05-02 12:32:52 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-05-13 16:28:35 +0100
commit393ff343014ef819f7b74bc189e6d59b32e3f8be (patch)
tree4e2ccece39ec00a32199b80ec43d3a6e74d8d992 /meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch
parent521a3f727c983ddfb877c3dfe653f70ce912413e (diff)
downloadpoky-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-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch')
-rw-r--r--meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch11
1 files changed, 5 insertions, 6 deletions
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch
index c9e1afffd0..510bc426d1 100644
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch
@@ -1,4 +1,4 @@
1From aeb5532f8be42d42f4e8725ca42e239b36983a4d Mon Sep 17 00:00:00 2001 1From 4e1aa0ddbc43403ff24f644b4c4912b737290c41 Mon Sep 17 00:00:00 2001
2From: Sascha Silbe <x-yo17@se-silbe.de> 2From: Sascha Silbe <x-yo17@se-silbe.de>
3Date: Fri, 8 Jun 2018 13:55:10 +0200 3Date: Fri, 8 Jun 2018 13:55:10 +0200
4Subject: [PATCH] Relocate the repository directory for native builds 4Subject: [PATCH] Relocate the repository directory for native builds
@@ -14,14 +14,13 @@ cache or sstate mirror).
14 14
15Upstream-Status: Inappropriate 15Upstream-Status: Inappropriate
16Signed-off-by: Sascha Silbe <x-yo17@se-silbe.de> 16Signed-off-by: Sascha Silbe <x-yo17@se-silbe.de>
17
18--- 17---
19 girepository/girepository.c | 15 +++++++++++++-- 18 girepository/girepository.c | 15 +++++++++++++--
20 girepository/meson.build | 2 +- 19 girepository/meson.build | 2 +-
21 2 files changed, 14 insertions(+), 3 deletions(-) 20 2 files changed, 14 insertions(+), 3 deletions(-)
22 21
23diff --git a/girepository/girepository.c b/girepository/girepository.c 22diff --git a/girepository/girepository.c b/girepository/girepository.c
24index a0754f4..2d456f9 100644 23index 12eaf36..876382c 100644
25--- a/girepository/girepository.c 24--- a/girepository/girepository.c
26+++ b/girepository/girepository.c 25+++ b/girepository/girepository.c
27@@ -21,6 +21,8 @@ 26@@ -21,6 +21,8 @@
@@ -42,7 +41,7 @@ index a0754f4..2d456f9 100644
42 /** 41 /**
43 * SECTION:girepository 42 * SECTION:girepository
44 * @short_description: GObject Introspection repository manager 43 * @short_description: GObject Introspection repository manager
45@@ -215,9 +219,16 @@ init_globals (void) 44@@ -222,9 +226,16 @@ init_globals (void)
46 g_free (custom_dirs); 45 g_free (custom_dirs);
47 } 46 }
48 47
@@ -62,10 +61,10 @@ index a0754f4..2d456f9 100644
62 typelib_search_path = g_slist_prepend (typelib_search_path, typelib_dir); 61 typelib_search_path = g_slist_prepend (typelib_search_path, typelib_dir);
63 62
64diff --git a/girepository/meson.build b/girepository/meson.build 63diff --git a/girepository/meson.build b/girepository/meson.build
65index 786749a..15cf2a9 100644 64index 5ced59e..a580d9b 100644
66--- a/girepository/meson.build 65--- a/girepository/meson.build
67+++ b/girepository/meson.build 66+++ b/girepository/meson.build
68@@ -45,7 +45,7 @@ girepo_internals_lib = static_library('girepository-internals', 67@@ -47,7 +47,7 @@ girepo_internals_lib = static_library('girepository-internals',
69 ], 68 ],
70 c_args: gi_hidden_visibility_cflags + custom_c_args, 69 c_args: gi_hidden_visibility_cflags + custom_c_args,
71 include_directories : configinc, 70 include_directories : configinc,