summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJoe Slater <joe.slater@windriver.com>2020-08-10 15:05:20 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-08-11 20:35:39 +0100
commit75a5e8ad0541d47fb4437276c74a676b32c0106d (patch)
tree565c23e2b71ff8e42fe29035e6b70dbe88b8666b /meta
parent56fd64447c98f1f6985fc623be94c7a92d4f18aa (diff)
downloadpoky-75a5e8ad0541d47fb4437276c74a676b32c0106d.tar.gz
gcr: make sure gcr-oids.h is generated
Backport, without modification, a patch from mainline after gcr-3-36 branch created. (From OE-Core rev: b281dcb199552247b6f0d0b03d0e64af9683ff3f) Signed-off-by: Joe Slater <joe.slater@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-gnome/gcr/gcr/0001-meson-Make-sure-gcr-oids.h-is-built.patch36
-rw-r--r--meta/recipes-gnome/gcr/gcr_3.36.0.bb2
2 files changed, 38 insertions, 0 deletions
diff --git a/meta/recipes-gnome/gcr/gcr/0001-meson-Make-sure-gcr-oids.h-is-built.patch b/meta/recipes-gnome/gcr/gcr/0001-meson-Make-sure-gcr-oids.h-is-built.patch
new file mode 100644
index 0000000000..3c8902d05e
--- /dev/null
+++ b/meta/recipes-gnome/gcr/gcr/0001-meson-Make-sure-gcr-oids.h-is-built.patch
@@ -0,0 +1,36 @@
1From 9fca6ae0aa7355c27d0922c561b9fbe18dde5b3d Mon Sep 17 00:00:00 2001
2From: Niels De Graef <nielsdegraef@gmail.com>
3Date: Fri, 19 Jun 2020 22:37:31 +0200
4Subject: [PATCH 1/1] meson: Make sure gcr-oids.h is built
5
6Fixes https://gitlab.gnome.org/GNOME/gcr/-/issues/48
7---
8 gcr/meson.build | 5 ++++-
9 1 file changed, 4 insertions(+), 1 deletion(-)
10
11--- end of original header ---
12
13Upstream-Status: backport [https://github.com/GNOME/gcr.git]
14
15Signed-off-by: Joe Slater <joe.slater@windriver.com>
16
17---
18diff --git a/gcr/meson.build b/gcr/meson.build
19index 199452f..06c3a63 100644
20--- a/gcr/meson.build
21+++ b/gcr/meson.build
22@@ -178,7 +178,10 @@ endif
23 gcr_base_dep = declare_dependency(
24 link_with: gcr_base_lib,
25 include_directories: include_directories('..'),
26- sources: gcr_enums_gen[1], # Make sure gcr-enum-types-base.h can be included
27+ sources: [
28+ gcr_enums_gen[1],
29+ gcr_oids[1],
30+ ],
31 )
32
33 if get_option('introspection')
34--
352.7.4
36
diff --git a/meta/recipes-gnome/gcr/gcr_3.36.0.bb b/meta/recipes-gnome/gcr/gcr_3.36.0.bb
index d5a88dfb35..ff455a68ec 100644
--- a/meta/recipes-gnome/gcr/gcr_3.36.0.bb
+++ b/meta/recipes-gnome/gcr/gcr_3.36.0.bb
@@ -18,6 +18,8 @@ inherit gnomebase gtk-icon-cache gtk-doc features_check upstream-version-is-even
18REQUIRED_DISTRO_FEATURES = "x11" 18REQUIRED_DISTRO_FEATURES = "x11"
19 19
20SRC_URI += " file://0001-meson.build-correctly-set-internal-vapi-dependencies.patch" 20SRC_URI += " file://0001-meson.build-correctly-set-internal-vapi-dependencies.patch"
21SRC_URI += " file://0001-meson-Make-sure-gcr-oids.h-is-built.patch"
22
21SRC_URI[archive.md5sum] = "adc65563b6b458507b9a578a8b68fb61" 23SRC_URI[archive.md5sum] = "adc65563b6b458507b9a578a8b68fb61"
22SRC_URI[archive.sha256sum] = "aaf9bed017a2263c6145c89a1a84178f9f40f238426463e4ae486694ef5f6601" 24SRC_URI[archive.sha256sum] = "aaf9bed017a2263c6145c89a1a84178f9f40f238426463e4ae486694ef5f6601"
23 25