summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-04-15 12:54:42 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-04-16 11:05:50 +0100
commita5440d4288e09d3e429b48e1a5ee4a5f4631de6c (patch)
tree1871b61c7fa24e3d5051f249d2d7483fb8f5f622
parent628e1935431207cbb8ef3e44637f9ad462eea133 (diff)
downloadopenembedded-core-contrib-a5440d4288e09d3e429b48e1a5ee4a5f4631de6c.tar.gz
libdazzle: update to 3.32.1
Remove a patch as the problem was fixed upstream. Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 c959d43972f..00000000000
--- a/meta/recipes-gnome/libdazzle/libdazzle/0001-Add-a-define-so-that-gir-compilation-succeeds.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 546d53c3515e8a488a204763437d1fa0917097e5 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-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 <alex.kanavin@gmail.com>
----
- 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.32.1.bb
index c112857f2c8..dac59f86b31 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
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"
+SRC_URI[archive.md5sum] = "5f6455ebc47e86f63b9579997137f391"
+SRC_URI[archive.sha256sum] = "238da19fdcc3ae9bb0c2d781d099fb8c6ec70c4dd3dffad80d230344ecc3f972"
GIR_MESON_OPTION = 'with_introspection'