[OE-core] [PATCH 2/2] libsecret: upgrade 0.20.1 -> 0.20.2 / port to meson

[Andreas Müller]

>From [1]:

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.2.news

Signed-off-by: Andreas Müller <schnitzeltony at gmail.com>
---
 ...an-subdir-only-if-manpage-is-enabled.patch | 30 +++++++++++++++++++
 ...ibsecret_0.20.1.bb => libsecret_0.20.2.bb} | 20 ++++++++-----
 2 files changed, 42 insertions(+), 8 deletions(-)
 create mode 100644 meta/recipes-gnome/libsecret/libsecret/0001-docs-Add-man-subdir-only-if-manpage-is-enabled.patch
 rename meta/recipes-gnome/libsecret/{libsecret_0.20.1.bb => libsecret_0.20.2.bb} (59%)

diff --git a/meta/recipes-gnome/libsecret/libsecret/0001-docs-Add-man-subdir-only-if-manpage-is-enabled.patch b/meta/recipes-gnome/libsecret/libsecret/0001-docs-Add-man-subdir-only-if-manpage-is-enabled.patch
new file mode 100644
index 0000000000..f434e6ae01
--- /dev/null
+++ b/meta/recipes-gnome/libsecret/libsecret/0001-docs-Add-man-subdir-only-if-manpage-is-enabled.patch
@@ -0,0 +1,30 @@
+From a2037bfcf14a0b5b81f5160b69b5ff94a6096584 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony at gmail.com>
+Date: Thu, 19 Mar 2020 01:42:22 +0100
+Subject: [PATCH] docs: Add man subdir only if manpage is enabled
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/libsecret/-/merge_requests/51]
+
+Signed-off-by: Andreas Müller <schnitzeltony at gmail.com>
+---
+ docs/meson.build | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/docs/meson.build b/docs/meson.build
+index cc8d964..aa7cfbc 100644
+--- a/docs/meson.build
++++ b/docs/meson.build
+@@ -1,4 +1,6 @@
+-subdir('man')
++if with_manpage
++  subdir('man')
++endif
+ if with_gtkdoc
+   subdir('reference/libsecret')
+ endif
+-- 
+2.21.1
+
diff --git a/meta/recipes-gnome/libsecret/libsecret_0.20.1.bb b/meta/recipes-gnome/libsecret/libsecret_0.20.2.bb
similarity index 59%
rename from meta/recipes-gnome/libsecret/libsecret_0.20.1.bb
rename to meta/recipes-gnome/libsecret/libsecret_0.20.2.bb
index 72511af02d..0effd492fd 100644
--- a/meta/recipes-gnome/libsecret/libsecret_0.20.1.bb
+++ b/meta/recipes-gnome/libsecret/libsecret_0.20.2.bb
@@ -7,21 +7,25 @@ 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] = "f24f82e49d360ff742901d6c387e2bc9"
+SRC_URI[archive.sha256sum] = "81e9143833785cdcf96c1da5d0357a8bcf0cd2b0119f15aa0cae775d1f19ffc3"
+SRC_URI += "file://0001-docs-Add-man-subdir-only-if-manpage-is-enabled.patch"
+
+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