[arch-commits] Commit in libsecret/trunk (PKGBUILD fix-test.diff)

[Jan Steffens]

    Date: Saturday, October 10, 2020 @ 20:45:55
  Author: heftig
Revision: 397937

0.20.4-1

Added:
  libsecret/trunk/fix-test.diff
Modified:
  libsecret/trunk/PKGBUILD

---------------+
 PKGBUILD      |   17 ++++++++++++-----
 fix-test.diff |   12 ++++++++++++
 2 files changed, 24 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-10-10 20:21:29 UTC (rev 397936)
+++ PKGBUILD	2020-10-10 20:45:55 UTC (rev 397937)
@@ -1,7 +1,8 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=libsecret
-pkgver=0.20.3
+pkgver=0.20.4
 pkgrel=1
 pkgdesc="Library for storing and retrieving passwords and other secrets"
 url="https://wiki.gnome.org/Projects/Libsecret"
@@ -12,9 +13,11 @@
 makedepends=(docbook-xsl gobject-introspection vala git gtk-doc meson valgrind)
 optdepends=('org.freedesktop.secrets: secret storage backend')
 provides=(libsecret-1.so)
-_commit=fb456a3853a080996f044496b11f3001af4a2659  # tags/0.20.3^0
-source=("git+https://gitlab.gnome.org/GNOME/libsecret.git#commit=$_commit")
-sha256sums=('SKIP')
+_commit=3fe635e64efd4b8dbc9ec3548b0bc8034c7665c4  # tags/0.20.4^0
+source=("git+https://gitlab.gnome.org/GNOME/libsecret.git#commit=$_commit"
+        fix-test.diff)
+sha256sums=('SKIP'
+            '760e40ffcd3383149d62f803a900b3af1a838fb084a8403e45d0764696dd2ffe')
 
 pkgver() {
   cd $pkgname
@@ -23,11 +26,15 @@
 
 prepare() {
   cd $pkgname
+
+  # Fix compiliation of test-vala-unstable
+  # https://gitlab.gnome.org/GNOME/libsecret/-/issues/54
+  git apply -3 ../fix-test.diff
 }
 
 build() {
   arch-meson $pkgname build
-  ninja -C build
+  meson compile -C build
 }
 
 check() {

Added: fix-test.diff
===================================================================
--- fix-test.diff	                        (rev 0)
+++ fix-test.diff	2020-10-10 20:45:55 UTC (rev 397937)
@@ -0,0 +1,12 @@
+diff --git i/libsecret/meson.build w/libsecret/meson.build
+index 0c448b9..c0138d2 100644
+--- i/libsecret/meson.build
++++ w/libsecret/meson.build
+@@ -185,6 +185,7 @@ pkg.generate(description: 'GObject bindings for Secret Service API (Unstable)',
+ test_cflags = [
+   libsecret_cflags,
+   '-DSRCDIR="@0@"'.format(meson.source_root()),
++  '-DSECRET_WITH_UNSTABLE',
+ ]
+ 
+ mock_service_lib = library('mock-service',