From 2106f02bae984e97bc151fe47de0a792b84919a7 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Sun, 27 Feb 2022 11:01:04 +0100
Subject: [PATCH] package/libsecret: bump to version 0.20.5

- Switch to meson-package
- Add bash-completion and tpm2-tss optional dependencies

https://gitlab.gnome.org/GNOME/libsecret/-/tags/0.20.5

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/libsecret/libsecret.hash |  4 ++--
 package/libsecret/libsecret.mk   | 36 +++++++++++++++++++++-----------
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/package/libsecret/libsecret.hash b/package/libsecret/libsecret.hash
index 792ec838e3..4eb3d9b95c 100644
--- a/package/libsecret/libsecret.hash
+++ b/package/libsecret/libsecret.hash
@@ -1,5 +1,5 @@
-# From https://download.gnome.org/sources/libsecret/0.20/libsecret-0.20.4.sha256sum
-sha256  325a4c54db320c406711bf2b55e5cb5b6c29823426aa82596a907595abb39d28  libsecret-0.20.4.tar.xz
+# From https://download.gnome.org/sources/libsecret/0.20/libsecret-0.20.5.sha256sum
+sha256  3fb3ce340fcd7db54d87c893e69bfc2b1f6e4d4b279065ffe66dac9f0fd12b4d  libsecret-0.20.5.tar.xz
 
 # Hash for license file:
 sha256  a1a33180d02960ab1c5de36cf20b1a2f0fe9888d83826ad263da5db52f1b183b  COPYING
diff --git a/package/libsecret/libsecret.mk b/package/libsecret/libsecret.mk
index 4d14c231d7..82fe38ac1a 100644
--- a/package/libsecret/libsecret.mk
+++ b/package/libsecret/libsecret.mk
@@ -5,33 +5,45 @@
 ################################################################################
 
 LIBSECRET_VERSION_MAJOR = 0.20
-LIBSECRET_VERSION = $(LIBSECRET_VERSION_MAJOR).4
+LIBSECRET_VERSION = $(LIBSECRET_VERSION_MAJOR).5
 LIBSECRET_SITE = http://ftp.gnome.org/pub/GNOME/sources/libsecret/$(LIBSECRET_VERSION_MAJOR)
 LIBSECRET_SOURCE = libsecret-$(LIBSECRET_VERSION).tar.xz
 LIBSECRET_INSTALL_STAGING = YES
 LIBSECRET_DEPENDENCIES = libglib2 $(TARGET_NLS_DEPENDENCIES)
-LIBSECRET_CONF_ENV = LIBS=$(TARGET_NLS_LIBS)
+LIBSECRET_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)
 LIBSECRET_CONF_OPTS = \
-	--disable-manpages \
-	--disable-strict \
-	--disable-coverage \
-	--enable-vala=no
+	-Dgtk_doc=false \
+	-Dmanpage=false \
+	-Dvapi=false
 LIBSECRET_LICENSE = LGPL-2.1+
 LIBSECRET_LICENSE_FILES = COPYING
 
+ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y)
+LIBSECRET_CONF_OPTS += -Dbash_completion=enabled
+LIBSECRET_DEPENDENCIES += bash-completion
+else
+LIBSECRET_CONF_OPTS += -Dbash_completion=disabled
+endif
+
 ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
-LIBSECRET_CONF_OPTS += --enable-introspection=yes
+LIBSECRET_CONF_OPTS += -Dintrospection=true
 LIBSECRET_DEPENDENCIES += gobject-introspection
 else
-LIBSECRET_CONF_OPTS += --enable-introspection=no
+LIBSECRET_CONF_OPTS += -Dintrospection=false
 endif
 
 ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
 LIBSECRET_DEPENDENCIES += libgcrypt
-LIBSECRET_CONF_OPTS += --enable-gcrypt \
-	--with-libgcrypt-prefix=$(STAGING_DIR)/usr
+LIBSECRET_CONF_OPTS += -Dgcrypt=true
 else
-LIBSECRET_CONF_OPTS += --disable-gcrypt
+LIBSECRET_CONF_OPTS += -Dgcrypt=false
 endif
 
-$(eval $(autotools-package))
+ifeq ($(BR2_PACKAGE_TPM2_TSS),y)
+LIBSECRET_CONF_OPTS += -Dtpm2=true
+LIBSECRET_DEPENDENCIES += tpm2-tss
+else
+LIBSECRET_CONF_OPTS += -Dtpm2=false
+endif
+
+$(eval $(meson-package))