aboutsummaryrefslogtreecommitdiffstats
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:32 +0100
commitb281dcb199552247b6f0d0b03d0e64af9683ff3f (patch)
tree5518bcb493089036cec21fe5747c899a8ec8ba09
parent892a8fb85a986a65e9ebef368ddab15068fb6d92 (diff)
downloadopenembedded-core-contrib-b281dcb199552247b6f0d0b03d0e64af9683ff3f.tar.gz
openembedded-core-contrib-b281dcb199552247b6f0d0b03d0e64af9683ff3f.tar.bz2
openembedded-core-contrib-b281dcb199552247b6f0d0b03d0e64af9683ff3f.zip
gcr: make sure gcr-oids.h is generated
Backport, without modification, a patch from mainline after gcr-3-36 branch created. Signed-off-by: Joe Slater <joe.slater@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 00000000000..3c8902d05e9
--- /dev/null
+++ b/meta/recipes-gnome/gcr/gcr/0001-meson-Make-sure-gcr-oids.h-is-built.patch
@@ -0,0 +1,36 @@
+From 9fca6ae0aa7355c27d0922c561b9fbe18dde5b3d Mon Sep 17 00:00:00 2001
+From: Niels De Graef <nielsdegraef@gmail.com>
+Date: Fri, 19 Jun 2020 22:37:31 +0200
+Subject: [PATCH 1/1] meson: Make sure gcr-oids.h is built
+
+Fixes https://gitlab.gnome.org/GNOME/gcr/-/issues/48
+---
+ gcr/meson.build | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- end of original header ---
+
+Upstream-Status: backport [https://github.com/GNOME/gcr.git]
+
+Signed-off-by: Joe Slater <joe.slater@windriver.com>
+
+---
+diff --git a/gcr/meson.build b/gcr/meson.build
+index 199452f..06c3a63 100644
+--- a/gcr/meson.build
++++ b/gcr/meson.build
+@@ -178,7 +178,10 @@ endif
+ gcr_base_dep = declare_dependency(
+ link_with: gcr_base_lib,
+ include_directories: include_directories('..'),
+- sources: gcr_enums_gen[1], # Make sure gcr-enum-types-base.h can be included
++ sources: [
++ gcr_enums_gen[1],
++ gcr_oids[1],
++ ],
+ )
+
+ if get_option('introspection')
+--
+2.7.4
+
diff --git a/meta/recipes-gnome/gcr/gcr_3.36.0.bb b/meta/recipes-gnome/gcr/gcr_3.36.0.bb
index d5a88dfb355..ff455a68ec0 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
REQUIRED_DISTRO_FEATURES = "x11"
SRC_URI += " file://0001-meson.build-correctly-set-internal-vapi-dependencies.patch"
+SRC_URI += " file://0001-meson-Make-sure-gcr-oids.h-is-built.patch"
+
SRC_URI[archive.md5sum] = "adc65563b6b458507b9a578a8b68fb61"
SRC_URI[archive.sha256sum] = "aaf9bed017a2263c6145c89a1a84178f9f40f238426463e4ae486694ef5f6601"