From 7629e643ddec315e2312fdffcb730db69b9ee49a Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 18 Dec 2018 17:29:56 +0100 Subject: libdazzle: fix a build issue with meson 0.49.0 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...a-define-so-that-gir-compilation-succeeds.patch | 26 ++++++++++++++++++++++ meta/recipes-gnome/libdazzle/libdazzle_3.30.2.bb | 1 + 2 files changed, 27 insertions(+) create mode 100644 meta/recipes-gnome/libdazzle/libdazzle/0001-Add-a-define-so-that-gir-compilation-succeeds.patch diff --git a/meta/recipes-gnome/libdazzle/libdazzle/0001-Add-a-define-so-that-gir-compilation-succeeds.patch b/meta/recipes-gnome/libdazzle/libdazzle/0001-Add-a-define-so-that-gir-compilation-succeeds.patch new file mode 100644 index 0000000000..c959d43972 --- /dev/null +++ b/meta/recipes-gnome/libdazzle/libdazzle/0001-Add-a-define-so-that-gir-compilation-succeeds.patch @@ -0,0 +1,26 @@ +From 546d53c3515e8a488a204763437d1fa0917097e5 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Tue, 11 Dec 2018 12:39:30 +0100 +Subject: [PATCH] Add a define so that gir compilation succeeds + +For some reason meson 0.49.0 does not anymore pass global arguments to gir compiler. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin +--- + src/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/meson.build b/src/meson.build +index 6ff8a6a..f0b2887 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -132,7 +132,7 @@ if get_option('with_introspection') + install_dir_gir: girdir, + install_dir_typelib: typelibdir, + export_packages: libdazzle_package, +- extra_args: [ '--c-include=dazzle.h', '--quiet' ], ++ extra_args: [ '--c-include=dazzle.h', '--quiet', '-DDAZZLE_COMPILATION' ], + ) + + if get_option('with_vapi') diff --git a/meta/recipes-gnome/libdazzle/libdazzle_3.30.2.bb b/meta/recipes-gnome/libdazzle/libdazzle_3.30.2.bb index 029adddb9e..5441c10f99 100644 --- a/meta/recipes-gnome/libdazzle/libdazzle_3.30.2.bb +++ b/meta/recipes-gnome/libdazzle/libdazzle_3.30.2.bb @@ -7,6 +7,7 @@ inherit gnomebase upstream-version-is-even vala gobject-introspection DEPENDS = "glib-2.0-native glib-2.0 gtk+3" +SRC_URI += " file://0001-Add-a-define-so-that-gir-compilation-succeeds.patch" SRC_URI[archive.md5sum] = "24e2e1b914a34f5b8868a9507d1f3c4c" SRC_URI[archive.sha256sum] = "78770eae9fa15ac5acb9c733d29459330b2540affbf72933119e36dbd90b36d5" -- cgit 1.2.3-korg