summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-gir-add-a-dependency-for-g-ir-compiler-for-building-.patch33
-rw-r--r--meta/recipes-gnome/gobject-introspection/gobject-introspection_1.64.1.bb1
2 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-gir-add-a-dependency-for-g-ir-compiler-for-building-.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-gir-add-a-dependency-for-g-ir-compiler-for-building-.patch
new file mode 100644
index 0000000000..adb357b5ec
--- /dev/null
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-gir-add-a-dependency-for-g-ir-compiler-for-building-.patch
@@ -0,0 +1,33 @@
1From 56ba5656258b82dbc069ab3a61e597c931a16a83 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 17 Jun 2020 11:43:16 +0200
4Subject: [PATCH] gir: add a dependency for g-ir-compiler for building .girs
5
6meson inserts the dependency if the compiler is used directly, but
7fails to do so if the compiler is run through a wrapper. This leads
8to build race errors between building the compiler and using it.
9
10Fix provided by Quentin Schulz <quentin.schulz@streamunlimited.com>
11
12Upstream-Status: Accepted [https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/228]
13Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
14---
15 gir/meson.build | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/gir/meson.build b/gir/meson.build
19index b37fdb81..557e5517 100644
20--- a/gir/meson.build
21+++ b/gir/meson.build
22@@ -448,7 +448,7 @@ foreach gir : gir_files
23 typelibs += custom_target('generate-typelib-@0@'.format(gir).underscorify(),
24 input: gir,
25 output: '@BASENAME@.typelib',
26- depends: [gobject_gir, ],
27+ depends: [gobject_gir, gircompiler, ],
28 command: gircompiler_command,
29 install: true,
30 install_dir: typelibdir,
31--
322.27.0
33
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.64.1.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.64.1.bb
index 9dfb55e055..7eefdd3e27 100644
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.64.1.bb
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.64.1.bb
@@ -15,6 +15,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c434e8128a68bedd59b80b2ac1eb1c4a \
15 15
16SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-${PV}.tar.xz \ 16SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-${PV}.tar.xz \
17 file://0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch \ 17 file://0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch \
18 file://0001-gir-add-a-dependency-for-g-ir-compiler-for-building-.patch \
18 " 19 "
19 20
20SRC_URI[md5sum] = "3419dfd086efcf83768e0579ab6abd2b" 21SRC_URI[md5sum] = "3419dfd086efcf83768e0579ab6abd2b"