diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2020-05-03 18:25:59 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-05-05 13:19:54 +0100 |
commit | 7ad8d67b1d75e7afefc7914ceb74f9cc2733f5c7 (patch) | |
tree | 5b67edadf1acd5c694e29b032c6c480fe2d76f29 /meta/recipes-gnome | |
parent | 08b9f9fe50f1b8271a623a15bf14283e66354263 (diff) | |
download | poky-7ad8d67b1d75e7afefc7914ceb74f9cc2733f5c7.tar.gz |
gcr: update to 3.36.0
Convert to meson build.
(From OE-Core rev: 0d5f86e021fe25cec258e3b8bb87cc45c8631cf7)
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/gcr/gcr_3.36.0.bb (renamed from meta/recipes-gnome/gcr/gcr_3.34.0.bb) | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/meta/recipes-gnome/gcr/gcr_3.34.0.bb b/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" | |||
11 | DEPENDS = "gtk+3 p11-kit glib-2.0 libgcrypt \ | 11 | DEPENDS = "gtk+3 p11-kit glib-2.0 libgcrypt \ |
12 | ${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'libxslt-native', '', d)}" | 12 | ${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'libxslt-native', '', d)}" |
13 | 13 | ||
14 | GNOMEBASEBUILDCLASS = "meson" | ||
15 | GTKDOC_MESON_OPTION = "gtk_doc" | ||
14 | inherit gnomebase gtk-icon-cache gtk-doc features_check upstream-version-is-even vala gobject-introspection gettext mime mime-xdg | 16 | inherit gnomebase gtk-icon-cache gtk-doc features_check upstream-version-is-even vala gobject-introspection gettext mime mime-xdg |
15 | # depends on gtk+3, but also x11 through gtk+-x11 | 17 | # depends on gtk+3, but also x11 through gtk+-x11 |
16 | REQUIRED_DISTRO_FEATURES = "x11" | 18 | REQUIRED_DISTRO_FEATURES = "x11" |
17 | 19 | ||
18 | SRC_URI[archive.md5sum] = "4af28919fb1dd36d93603e8230283b6f" | 20 | SRC_URI[archive.md5sum] = "adc65563b6b458507b9a578a8b68fb61" |
19 | SRC_URI[archive.sha256sum] = "29df50974a90987af694c0fb8926a6b366e68cacd8abd813817cfe1eb5d54524" | 21 | SRC_URI[archive.sha256sum] = "aaf9bed017a2263c6145c89a1a84178f9f40f238426463e4ae486694ef5f6601" |
20 | 22 | ||
21 | FILES_${PN} += " \ | 23 | FILES_${PN} += " \ |
22 | ${datadir}/dbus-1 \ | 24 | ${datadir}/dbus-1 \ |
@@ -27,9 +29,3 @@ FILES_${PN} += " \ | |||
27 | ARM_INSTRUCTION_SET_armv4 = "arm" | 29 | ARM_INSTRUCTION_SET_armv4 = "arm" |
28 | ARM_INSTRUCTION_SET_armv5 = "arm" | 30 | ARM_INSTRUCTION_SET_armv5 = "arm" |
29 | ARM_INSTRUCTION_SET_armv6 = "arm" | 31 | ARM_INSTRUCTION_SET_armv6 = "arm" |
30 | |||
31 | # These files may be out of date or missing our fixes | ||
32 | # libgcrypt.m4 in particular is calling into libgcrypt-config | ||
33 | do_configure_prepend() { | ||
34 | rm -f ${S}/build/m4/* | ||
35 | } | ||