From 0d5f86e021fe25cec258e3b8bb87cc45c8631cf7 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Sun, 3 May 2020 18:25:59 +0200 Subject: [PATCH] gcr: update to 3.36.0 Convert to meson build. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../gcr/{gcr_3.34.0.bb => gcr_3.36.0.bb} | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) rename meta/recipes-gnome/gcr/{gcr_3.34.0.bb => gcr_3.36.0.bb} (75%) diff --git a/meta/recipes-gnome/gcr/gcr_3.34.0.bb b/meta/recipes-gnome/gcr/gcr_3.36.0.bb similarity index 75% rename from meta/recipes-gnome/gcr/gcr_3.34.0.bb rename to meta/recipes-gnome/gcr/gcr_3.36.0.bb index 9853b3f416..4fe3b2fff3 100644 --- a/meta/recipes-gnome/gcr/gcr_3.34.0.bb +++ b/meta/recipes-gnome/gcr/gcr_3.36.0.bb @@ -11,12 +11,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605" DEPENDS = "gtk+3 p11-kit glib-2.0 libgcrypt \ ${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'libxslt-native', '', d)}" +GNOMEBASEBUILDCLASS = "meson" +GTKDOC_MESON_OPTION = "gtk_doc" inherit gnomebase gtk-icon-cache gtk-doc features_check upstream-version-is-even vala gobject-introspection gettext mime mime-xdg # depends on gtk+3, but also x11 through gtk+-x11 REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[archive.md5sum] = "4af28919fb1dd36d93603e8230283b6f" -SRC_URI[archive.sha256sum] = "29df50974a90987af694c0fb8926a6b366e68cacd8abd813817cfe1eb5d54524" +SRC_URI[archive.md5sum] = "adc65563b6b458507b9a578a8b68fb61" +SRC_URI[archive.sha256sum] = "aaf9bed017a2263c6145c89a1a84178f9f40f238426463e4ae486694ef5f6601" FILES_${PN} += " \ ${datadir}/dbus-1 \ @@ -27,9 +29,3 @@ FILES_${PN} += " \ ARM_INSTRUCTION_SET_armv4 = "arm" ARM_INSTRUCTION_SET_armv5 = "arm" ARM_INSTRUCTION_SET_armv6 = "arm" - -# These files may be out of date or missing our fixes -# libgcrypt.m4 in particular is calling into libgcrypt-config -do_configure_prepend() { - rm -f ${S}/build/m4/* -} -- 2.40.1