From ea99070f6916a6e6a2cde1880142e7f2fa37fd1d Mon Sep 17 00:00:00 2001 From: Andrew Sun Date: Sun, 8 Sep 2019 22:43:11 -0400 Subject: [PATCH] libsecret: update to 0.19.1 --- mingw-w64-libsecret/0001-port-to.mingw.patch | 32 +++++++++++--------- mingw-w64-libsecret/PKGBUILD | 10 +++--- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/mingw-w64-libsecret/0001-port-to.mingw.patch b/mingw-w64-libsecret/0001-port-to.mingw.patch index 90716daf0d..2128bb4d28 100644 --- a/mingw-w64-libsecret/0001-port-to.mingw.patch +++ b/mingw-w64-libsecret/0001-port-to.mingw.patch @@ -1,7 +1,7 @@ -diff -Naur libsecret-0.18.8.orig/configure.ac libsecret-0.18.8/configure.ac ---- libsecret-0.18.8.orig/configure.ac 2019-03-15 19:53:46.981452300 -0400 -+++ libsecret-0.18.8/configure.ac 2019-03-15 19:55:33.446851200 -0400 -@@ -86,7 +86,7 @@ +diff -Naur libsecret-0.19.1.orig/configure.ac libsecret-0.19.1/configure.ac +--- libsecret-0.19.1.orig/configure.ac 2019-09-08 22:13:01.644668900 -0400 ++++ libsecret-0.19.1/configure.ac 2019-09-08 22:14:13.969779900 -0400 +@@ -96,7 +96,7 @@ PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQ gio-2.0 @@ -10,9 +10,9 @@ diff -Naur libsecret-0.18.8.orig/configure.ac libsecret-0.18.8/configure.ac LIBS="$LIBS $GLIB_LIBS" CFLAGS="$CFLAGS $GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=$GLIB_MIN -DGLIB_VERSION_MAX_ALLOWED=$GLIB_MAX" -diff -Naur libsecret-0.18.8.orig/egg/egg-secure-memory.c libsecret-0.18.8/egg/egg-secure-memory.c ---- libsecret-0.18.8.orig/egg/egg-secure-memory.c 2019-03-15 19:53:47.153322600 -0400 -+++ libsecret-0.18.8/egg/egg-secure-memory.c 2019-03-15 19:59:14.495134500 -0400 +diff -Naur libsecret-0.19.1.orig/egg/egg-secure-memory.c libsecret-0.19.1/egg/egg-secure-memory.c +--- libsecret-0.19.1.orig/egg/egg-secure-memory.c 2019-09-08 22:13:01.660294400 -0400 ++++ libsecret-0.19.1/egg/egg-secure-memory.c 2019-09-08 22:18:08.797436800 -0400 @@ -31,7 +31,11 @@ #include "egg-secure-memory.h" @@ -244,9 +244,9 @@ diff -Naur libsecret-0.18.8.orig/egg/egg-secure-memory.c libsecret-0.18.8/egg/eg /* ----------------------------------------------------------------------------- * POOL META DATA ALLOCATION * -diff -Naur libsecret-0.18.8.orig/libsecret/mock-service.c libsecret-0.18.8/libsecret/mock-service.c ---- libsecret-0.18.8.orig/libsecret/mock-service.c 2019-03-15 19:53:46.997074600 -0400 -+++ libsecret-0.18.8/libsecret/mock-service.c 2019-03-15 20:32:19.458150400 -0400 +diff -Naur libsecret-0.19.1.orig/libsecret/mock-service.c libsecret-0.19.1/libsecret/mock-service.c +--- libsecret-0.19.1.orig/libsecret/mock-service.c 2019-09-08 22:13:01.722864500 -0400 ++++ libsecret-0.19.1/libsecret/mock-service.c 2019-09-08 22:20:09.668492100 -0400 @@ -22,6 +22,9 @@ #include #include @@ -274,10 +274,10 @@ diff -Naur libsecret-0.18.8.orig/libsecret/mock-service.c libsecret-0.18.8/libse g_spawn_close_pid (pid); pid = 0; -diff -Naur libsecret-0.18.8.orig/tool/secret-tool.c libsecret-0.18.8/tool/secret-tool.c ---- libsecret-0.18.8.orig/tool/secret-tool.c 2019-03-15 19:53:47.153322600 -0400 -+++ libsecret-0.18.8/tool/secret-tool.c 2019-03-15 20:18:35.903311300 -0400 -@@ -20,12 +20,15 @@ +diff -Naur libsecret-0.19.1.orig/tool/secret-tool.c libsecret-0.19.1/tool/secret-tool.c +--- libsecret-0.19.1.orig/tool/secret-tool.c 2019-09-08 22:13:01.660294400 -0400 ++++ libsecret-0.19.1/tool/secret-tool.c 2019-09-08 22:23:56.154326600 -0400 +@@ -20,12 +20,17 @@ #include "libsecret/secret-value.h" #include @@ -288,12 +288,14 @@ diff -Naur libsecret-0.18.8.orig/tool/secret-tool.c libsecret-0.18.8/tool/secret #include #include #include ++#ifdef _WIN32 +#include +#include ++#endif #define SECRET_ALIAS_PREFIX "/org/freedesktop/secrets/aliases/" -@@ -269,6 +272,39 @@ +@@ -262,6 +267,39 @@ (GDestroyNotify)secret_password_free); } diff --git a/mingw-w64-libsecret/PKGBUILD b/mingw-w64-libsecret/PKGBUILD index 5332c6ca18..fbd5cd2d14 100644 --- a/mingw-w64-libsecret/PKGBUILD +++ b/mingw-w64-libsecret/PKGBUILD @@ -3,7 +3,7 @@ _realname=libsecret pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=0.18.8 +pkgver=0.19.1 pkgrel=1 pkgdesc="Library for storing and retrieving passwords and other secrets (mingw-w64)" arch=('any') @@ -14,14 +14,13 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-gobject-introspection" "${MINGW_PACKAGE_PREFIX}-vala" "${MINGW_PACKAGE_PREFIX}-gtk-doc") -depends=(${MINGW_PACKAGE_PREFIX}-gcc-libs - ${MINGW_PACKAGE_PREFIX}-glib2 +depends=(${MINGW_PACKAGE_PREFIX}-glib2 ${MINGW_PACKAGE_PREFIX}-libgcrypt) options=('!libtool' 'strip') source=("https://download.gnome.org/sources/${_realname}/${pkgver%.*}/${_realname}-${pkgver}.tar.xz" "0001-port-to.mingw.patch") -sha256sums=('3bfa889d260e0dbabcf5b9967f2aae12edcd2ddc9adc365de7a5cc840c311d15' - 'a167c3a5a738c1d8c667b73dec2c46493e35f20af42d6dc7391357b44b8b008c') +sha256sums=('8583e10179456ae2c83075d95455f156dc08db6278b32bf4bd61819335a30e3a' + '28bf8c3e22f10746177e7128e8293d2d0934f80daef37cf0e648492a07636bf8') prepare() { cd "${srcdir}/${_realname}-${pkgver}" @@ -33,7 +32,6 @@ build() { [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}" mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}" export MSYS2_ARG_CONV_EXCL="-//OASIS//DTD" - CFLAGS+=" -DHAVE_MLOCK" # https://gitlab.gnome.org/GNOME/libsecret/issues/23 ../${_realname}-${pkgver}/configure \ --prefix=${MINGW_PREFIX} \ --build=${MINGW_CHOST} \