summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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.32.1.bb (renamed from meta/recipes-gnome/libdazzle/libdazzle_3.30.2.bb)5
2 files changed, 2 insertions, 29 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
deleted file mode 100644
index c959d43972..0000000000
--- a/meta/recipes-gnome/libdazzle/libdazzle/0001-Add-a-define-so-that-gir-compilation-succeeds.patch
+++ /dev/null
@@ -1,26 +0,0 @@
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.32.1.bb
index c112857f2c..dac59f86b3 100644
--- a/meta/recipes-gnome/libdazzle/libdazzle_3.30.2.bb
+++ b/meta/recipes-gnome/libdazzle/libdazzle_3.32.1.bb
@@ -7,9 +7,8 @@ inherit gnomebase upstream-version-is-even vala distro_features_check gobject-in
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] = "5f6455ebc47e86f63b9579997137f391"
11SRC_URI[archive.md5sum] = "24e2e1b914a34f5b8868a9507d1f3c4c" 11SRC_URI[archive.sha256sum] = "238da19fdcc3ae9bb0c2d781d099fb8c6ec70c4dd3dffad80d230344ecc3f972"
12SRC_URI[archive.sha256sum] = "78770eae9fa15ac5acb9c733d29459330b2540affbf72933119e36dbd90b36d5"
13 12
14GIR_MESON_OPTION = 'with_introspection' 13GIR_MESON_OPTION = 'with_introspection'
15 14