summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2018-12-18 17:29:56 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-01-03 12:35:53 +0000
commitd46f566a7e0fe0e15d218fbe3b8f8bbf12b53ed7 (patch)
treef9181c3535a70c7efd2917126d41542849290b24 /meta/recipes-gnome
parent980f3d6bdf8db8bde389cd65e446969acee73202 (diff)
downloadpoky-d46f566a7e0fe0e15d218fbe3b8f8bbf12b53ed7.tar.gz
libdazzle: fix a build issue with meson 0.49.0
(From OE-Core rev: 7629e643ddec315e2312fdffcb730db69b9ee49a) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r--meta/recipes-gnome/libdazzle/libdazzle/0001-Add-a-define-so-that-gir-compilation-succeeds.patch26
-rw-r--r--meta/recipes-gnome/libdazzle/libdazzle_3.30.2.bb1
2 files changed, 27 insertions, 0 deletions
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 @@
1From 546d53c3515e8a488a204763437d1fa0917097e5 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 11 Dec 2018 12:39:30 +0100
4Subject: [PATCH] Add a define so that gir compilation succeeds
5
6For some reason meson 0.49.0 does not anymore pass global arguments to gir compiler.
7
8Upstream-Status: Pending
9Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
10---
11 src/meson.build | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/src/meson.build b/src/meson.build
15index 6ff8a6a..f0b2887 100644
16--- a/src/meson.build
17+++ b/src/meson.build
18@@ -132,7 +132,7 @@ if get_option('with_introspection')
19 install_dir_gir: girdir,
20 install_dir_typelib: typelibdir,
21 export_packages: libdazzle_package,
22- extra_args: [ '--c-include=dazzle.h', '--quiet' ],
23+ extra_args: [ '--c-include=dazzle.h', '--quiet', '-DDAZZLE_COMPILATION' ],
24 )
25
26 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
7 7
8DEPENDS = "glib-2.0-native glib-2.0 gtk+3" 8DEPENDS = "glib-2.0-native glib-2.0 gtk+3"
9 9
10SRC_URI += " file://0001-Add-a-define-so-that-gir-compilation-succeeds.patch"
10SRC_URI[archive.md5sum] = "24e2e1b914a34f5b8868a9507d1f3c4c" 11SRC_URI[archive.md5sum] = "24e2e1b914a34f5b8868a9507d1f3c4c"
11SRC_URI[archive.sha256sum] = "78770eae9fa15ac5acb9c733d29459330b2540affbf72933119e36dbd90b36d5" 12SRC_URI[archive.sha256sum] = "78770eae9fa15ac5acb9c733d29459330b2540affbf72933119e36dbd90b36d5"
12 13