From eaf77bc81e789d2261aadc5048425408c9fc5e70 Mon Sep 17 00:00:00 2001
From: Tim Biermann <tbier@posteo.de>
Date: Sat, 20 Aug 2022 19:13:02 +0200
Subject: [PATCH] gcr: 3.40.0 -> 3.41.1

---
 gcr/.footprint                          |  1 +
 gcr/.signature                          |  9 ++--
 gcr/Pkgfile                             | 11 ++---
 gcr/fix-meson-invalid-kw-argument.patch | 61 -------------------------
 4 files changed, 10 insertions(+), 72 deletions(-)
 delete mode 100644 gcr/fix-meson-invalid-kw-argument.patch

diff --git a/gcr/.footprint b/gcr/.footprint
index 02f30d90e..03bcc68f6 100644
--- a/gcr/.footprint
+++ b/gcr/.footprint
@@ -73,6 +73,7 @@ drwxr-xr-x	root/root	usr/include/gcr-3/ui/
 -rw-r--r--	root/root	usr/include/gcr-3/ui/gcr-viewer.h
 drwxr-xr-x	root/root	usr/lib/
 -rwxr-xr-x	root/root	usr/lib/gcr-prompter
+-rwxr-xr-x	root/root	usr/lib/gcr-ssh-agent
 -rwxr-xr-x	root/root	usr/lib/gcr-ssh-askpass
 drwxr-xr-x	root/root	usr/lib/girepository-1.0/
 -rw-r--r--	root/root	usr/lib/girepository-1.0/Gck-1.typelib
diff --git a/gcr/.signature b/gcr/.signature
index 838b72af6..16d39d7d6 100644
--- a/gcr/.signature
+++ b/gcr/.signature
@@ -1,6 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF353SN81xTpq9FUk9S337WRB0v846aTmcOi1uiWIhOMGZ1wNvuIomlKi9uP262kYCoxZz7cQXG/Sqr4yJWtSVpws=
-SHA256 (Pkgfile) = c31ca43edb780a80725c25f8bc9b4a761d21e0b01e7ee1c6cbcce9391bcec969
-SHA256 (.footprint) = b04d74c567e09f65d3a53dc094e083fa9b428632457a644e9019bdffe8a3fa27
-SHA256 (gcr-3.40.0.tar.bz2) = 659a49bac1c713a743894845c82ef53ccc7326dcce1879b1af0ab502ec10e7ab
-SHA256 (fix-meson-invalid-kw-argument.patch) = 7f0d47b09170f988b226600c46241dcbd5bf3349f5ac6415a0030e401612a675
+RWSagIOpLGJF3zkizN2Jl7OB0BT5cfoda5eBI3X8hGW/3MrYtJlX8DysHc31hplhC01M86ES/4M9eo5JS1MGga1NVeSZr503GAM=
+SHA256 (Pkgfile) = 6c82dda18308493e9da0dde69fc4dfd2c5f760e89b1b889138c04b81dce2dc74
+SHA256 (.footprint) = 6748094a2f6a716a08e0bcc67bdfac5a148caae7042c645f12f0bbccee3b3448
+SHA256 (gcr-3.41.1.tar.xz) = bb7128a3c2febbfee9c03b90d77d498d0ceb237b0789802d60185c71c4bea24f
diff --git a/gcr/Pkgfile b/gcr/Pkgfile
index a681e5636..732756e3a 100644
--- a/gcr/Pkgfile
+++ b/gcr/Pkgfile
@@ -1,21 +1,20 @@
 # Description: Libraries for cryptographic UIs and accessing PKCS#11 modules.
 # URL: https://developer.gnome.org/gcr/
 # Maintainer: Danny Rawlins, crux at romster dot me
-# Depends on: gnupg gtk3 p11-kit vala xorg-libxcomposite xorg-libxcursor xorg-libxinerama
+# Depends on: gnupg gtk3 libsecret p11-kit vala xorg-libxcomposite xorg-libxcursor xorg-libxinerama
 
 name=gcr
-version=3.40.0
+version=3.41.1
 release=1
-source=(https://gitlab.gnome.org/GNOME/gcr/-/archive/$version/gcr-$version.tar.bz2
-	fix-meson-invalid-kw-argument.patch)
+source=(https://download.gnome.org/sources/$name/${version:0:4}/$name-$version.tar.xz)
 
 build() {
-	patch -Np1 -d $name-$version -i $SRC/fix-meson-invalid-kw-argument.patch
-
 	meson setup build $name-$version \
 		--prefix=/usr \
 		--libexecdir=/usr/lib \
 		--buildtype=plain \
+		--wrap-mode nodownload \
+		-D b_lto=false \
 		-D b_pie=true \
 		-D gtk_doc=false
 
diff --git a/gcr/fix-meson-invalid-kw-argument.patch b/gcr/fix-meson-invalid-kw-argument.patch
deleted file mode 100644
index 9c097deeb..000000000
--- a/gcr/fix-meson-invalid-kw-argument.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Patch-Source: https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/81
-
-From b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8 Mon Sep 17 00:00:00 2001
-From: Jakub Jirutka <jakub@jirutka.cz>
-Date: Wed, 12 Jan 2022 00:24:20 +0100
-Subject: [PATCH] meson: Fix unknown kw argument in gnome.generate_gir
-
-This argument has been removed in Meson 0.61.0:
-
-    gck/meson.build:130:2: ERROR: gnome.generate_gir got unknown keyword arguments "packages"
-
-https://github.com/mesonbuild/meson/commit/f8fc5cb860465718fe7c79a1bf1fe00659f138de:
-
-> The packages argument to gnome.generate_gir was allowed, but never did anything, so stop passing it.
-
-Fixes #89
----
- gck/meson.build | 1 -
- gcr/meson.build | 1 -
- ui/meson.build  | 1 -
- 3 files changed, 3 deletions(-)
-
-diff --git a/gck/meson.build b/gck/meson.build
-index 756b486..a21a1e9 100644
---- a/gck/meson.build
-+++ b/gck/meson.build
-@@ -131,7 +131,6 @@ if get_option('introspection')
-     sources: gck_gir_sources,
-     namespace: 'Gck',
-     nsversion: '@0@'.format(gck_major_version),
--    packages: gck_deps,
-     export_packages: 'gck-@0@'.format(gck_major_version),
-     includes: [ 'GObject-2.0', 'Gio-2.0' ],
-     header: 'gck/gck.h',
-diff --git a/gcr/meson.build b/gcr/meson.build
-index 2233a44..c83641b 100644
---- a/gcr/meson.build
-+++ b/gcr/meson.build
-@@ -190,7 +190,6 @@ if get_option('introspection')
-     sources: [ gcr_base_public_sources, gcr_base_headers ],
-     namespace: 'Gcr',
-     nsversion: '@0@'.format(gcr_major_version),
--    packages: gcr_base_deps,
-     export_packages: 'gcr-base-@0@'.format(gcr_major_version),
-     includes: [
-       'GObject-2.0',
-diff --git a/ui/meson.build b/ui/meson.build
-index e656ea2..32ee057 100644
---- a/ui/meson.build
-+++ b/ui/meson.build
-@@ -152,7 +152,6 @@ if get_option('introspection')
-     export_packages: 'gcr-ui-@0@'.format(gcr_major_version),
-     identifier_prefix: 'Gcr',
-     symbol_prefix: 'gcr',
--    packages: gcr_ui_deps,
-     includes: [
-       'GObject-2.0',
-       'Gio-2.0',
--- 
-GitLab
-