[PATCH 2/2] libsecret: upgrade 0.20.1 -> 0.20.3 / port to meson

Andreas M?ller
2020-04-30T21:42:38Z

From [1]:

0.20.3
* secret-file-backend: Fix use-after-free in flatpak [!52]
* docs: Add man subdir only if manpage is enabled [!51]

From [2]:

0.20.2
* secret-file-collection: force little-endian in GVariant [!49, #42]
* Prefer g_info() over g_message() [!48, #40]
* meson: Don't specify shared_library() [!47]
* docs: Make sure to set install: true [!46]

[1] http://ftp.gnome.org/pub/gnome/sources/libsecret/0.20/libsecret-0.20.3.news
[2] http://ftp.gnome.org/pub/gnome/sources/libsecret/0.20/libsecret-0.20.2.news

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
...ibsecret_0.20.1.bb => libsecret_0.20.3.bb} | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
rename meta/recipes-gnome/libsecret/{libsecret_0.20.1.bb => libsecret_0.20.3.bb} (63%)

diff --git a/meta/recipes-gnome/libsecret/libsecret_0.20.1.bb b/meta/recipes-gnome/libsecret/libsecret_0.20.3.bb
similarity index 63%
rename from meta/recipes-gnome/libsecret/libsecret_0.20.1.bb
rename to meta/recipes-gnome/libsecret/libsecret_0.20.3.bb
index 72511af02d..d3a0c2ff54 100644
--- a/meta/recipes-gnome/libsecret/libsecret_0.20.1.bb
+++ b/meta/recipes-gnome/libsecret/libsecret_0.20.3.bb
@@ -7,21 +7,24 @@ LICENSE = "LGPLv2.1"
BUGTRACKER = "https://gitlab.gnome.org/GNOME/libsecret/issues"
LIC_FILES_CHKSUM = "file://COPYING;md5=23c2a5e0106b99d75238986559bb5fc6"

+GNOMEBASEBUILDCLASS = "meson"
+
inherit gnomebase gtk-doc vala gobject-introspection manpages

DEPENDS += "glib-2.0 libgcrypt gettext-native"

-PACKAGECONFIG[manpages] = "--enable-manpages, --disable-manpages, libxslt-native xmlto-native"
+SRC_URI[archive.md5sum] = "47c3fdfeb111a87b509ad271e4a6f496"
+SRC_URI[archive.sha256sum] = "4fcb3c56f8ac4ab9c75b66901fb0104ec7f22aa9a012315a14c0d6dffa5290e4"
+
+GTKDOC_MESON_OPTION = 'gtk_doc'

-SRC_URI[archive.md5sum] = "d2dd660a8d502099317bc8af9f30302e"
-SRC_URI[archive.sha256sum] = "57f73e94ec6263a17a077fb809cf8cf424637a897a7f15b4eec42ce4aef52447"
+# gobject-introspection is mandatory and cannot be configured
+REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
+UNKNOWN_CONFIGURE_WHITELIST_append = " introspection"
+
+PACKAGECONFIG[manpages] = "-Dmanpage=true,-Dmanpage=false,libxslt-native xmlto-native"

# http://errors.yoctoproject.org/Errors/Details/20228/
ARM_INSTRUCTION_SET_armv4 = "arm"
ARM_INSTRUCTION_SET_armv5 = "arm"
ARM_INSTRUCTION_SET_armv6 = "arm"
-
-# vapigen.m4 bundled with the tarball does not yet have our cross-compilation fixes
-do_configure_prepend() {
- rm -f ${S}/build/m4/vapigen.m4
-}
--
2.21.1