gcr: 3.41.1 -> 4.0.0

3 files changed, 60 insertions, 161 deletions

diff --git a/gcr/.footprint b/gcr/.footprint
index 03bcc68f6..48c8e5e2b 100644
--- a/gcr/.footprint
+++ b/gcr/.footprint
@@ -4,165 +4,64 @@ drwxr-xr-x	root/root	etc/security/limits.d/
 -rw-r--r--	root/root	etc/security/limits.d/10-gcr.conf
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
--rwxr-xr-x	root/root	usr/bin/gcr-viewer
+-rwxr-xr-x	root/root	usr/bin/gcr-viewer-gtk4
 drwxr-xr-x	root/root	usr/include/
-drwxr-xr-x	root/root	usr/include/gck-1/
-drwxr-xr-x	root/root	usr/include/gck-1/gck/
--rw-r--r--	root/root	usr/include/gck-1/gck/gck-deprecated.h
--rw-r--r--	root/root	usr/include/gck-1/gck/gck-enum-types.h
--rw-r--r--	root/root	usr/include/gck-1/gck/gck-version.h
--rw-r--r--	root/root	usr/include/gck-1/gck/gck.h
--rw-r--r--	root/root	usr/include/gck-1/gck/pkcs11.h
--rw-r--r--	root/root	usr/include/gck-1/gck/pkcs11n.h
--rw-r--r--	root/root	usr/include/gck-1/gck/pkcs11x.h
-drwxr-xr-x	root/root	usr/include/gcr-3/
-drwxr-xr-x	root/root	usr/include/gcr-3/gcr/
--rw-r--r--	root/root	usr/include/gcr-3/gcr/gcr-base.h
--rw-r--r--	root/root	usr/include/gcr-3/gcr/gcr-certificate-chain.h
--rw-r--r--	root/root	usr/include/gcr-3/gcr/gcr-certificate-request.h
--rw-r--r--	root/root	usr/include/gcr-3/gcr/gcr-certificate.h
--rw-r--r--	root/root	usr/include/gcr-3/gcr/gcr-collection.h
--rw-r--r--	root/root	usr/include/gcr-3/gcr/gcr-column.h
--rw-r--r--	root/root	usr/include/gcr-3/gcr/gcr-comparable.h
--rw-r--r--	root/root	usr/include/gcr-3/gcr/gcr-deprecated-base.h
--rw-r--r--	root/root	usr/include/gcr-3/gcr/gcr-enum-types-base.h
--rw-r--r--	root/root	usr/include/gcr-3/gcr/gcr-filter-collection.h
--rw-r--r--	root/root	usr/include/gcr-3/gcr/gcr-fingerprint.h
--rw-r--r--	root/root	usr/include/gcr-3/gcr/gcr-icons.h
--rw-r--r--	root/root	usr/include/gcr-3/gcr/gcr-import-interaction.h
--rw-r--r--	root/root	usr/include/gcr-3/gcr/gcr-importer.h
--rw-r--r--	root/root	usr/include/gcr-3/gcr/gcr-library.h
--rw-r--r--	root/root	usr/include/gcr-3/gcr/gcr-mock-prompter.h
--rw-r--r--	root/root	usr/include/gcr-3/gcr/gcr-parser.h
--rw-r--r--	root/root	usr/include/gcr-3/gcr/gcr-pkcs11-certificate.h
--rw-r--r--	root/root	usr/include/gcr-3/gcr/gcr-prompt.h
--rw-r--r--	root/root	usr/include/gcr-3/gcr/gcr-secret-exchange.h
--rw-r--r--	root/root	usr/include/gcr-3/gcr/gcr-secure-memory.h
--rw-r--r--	root/root	usr/include/gcr-3/gcr/gcr-simple-certificate.h
--rw-r--r--	root/root	usr/include/gcr-3/gcr/gcr-simple-collection.h
--rw-r--r--	root/root	usr/include/gcr-3/gcr/gcr-ssh-askpass.h
--rw-r--r--	root/root	usr/include/gcr-3/gcr/gcr-system-prompt.h
--rw-r--r--	root/root	usr/include/gcr-3/gcr/gcr-system-prompter.h
--rw-r--r--	root/root	usr/include/gcr-3/gcr/gcr-trust.h
--rw-r--r--	root/root	usr/include/gcr-3/gcr/gcr-types.h
--rw-r--r--	root/root	usr/include/gcr-3/gcr/gcr-union-collection.h
--rw-r--r--	root/root	usr/include/gcr-3/gcr/gcr-unlock-options.h
--rw-r--r--	root/root	usr/include/gcr-3/gcr/gcr-version.h
--rw-r--r--	root/root	usr/include/gcr-3/gcr/gcr.h
-drwxr-xr-x	root/root	usr/include/gcr-3/ui/
--rw-r--r--	root/root	usr/include/gcr-3/ui/gcr-certificate-basics-widget.h
--rw-r--r--	root/root	usr/include/gcr-3/ui/gcr-certificate-details-widget.h
--rw-r--r--	root/root	usr/include/gcr-3/ui/gcr-certificate-renderer.h
--rw-r--r--	root/root	usr/include/gcr-3/ui/gcr-certificate-widget.h
--rw-r--r--	root/root	usr/include/gcr-3/ui/gcr-collection-model.h
--rw-r--r--	root/root	usr/include/gcr-3/ui/gcr-combo-selector.h
--rw-r--r--	root/root	usr/include/gcr-3/ui/gcr-deprecated.h
--rw-r--r--	root/root	usr/include/gcr-3/ui/gcr-enum-types.h
--rw-r--r--	root/root	usr/include/gcr-3/ui/gcr-failure-renderer.h
--rw-r--r--	root/root	usr/include/gcr-3/ui/gcr-import-button.h
--rw-r--r--	root/root	usr/include/gcr-3/ui/gcr-key-renderer.h
--rw-r--r--	root/root	usr/include/gcr-3/ui/gcr-key-widget.h
--rw-r--r--	root/root	usr/include/gcr-3/ui/gcr-list-selector.h
--rw-r--r--	root/root	usr/include/gcr-3/ui/gcr-prompt-dialog.h
--rw-r--r--	root/root	usr/include/gcr-3/ui/gcr-renderer.h
--rw-r--r--	root/root	usr/include/gcr-3/ui/gcr-secure-entry-buffer.h
--rw-r--r--	root/root	usr/include/gcr-3/ui/gcr-tree-selector.h
--rw-r--r--	root/root	usr/include/gcr-3/ui/gcr-ui.h
--rw-r--r--	root/root	usr/include/gcr-3/ui/gcr-unlock-options-widget.h
--rw-r--r--	root/root	usr/include/gcr-3/ui/gcr-viewer-widget.h
--rw-r--r--	root/root	usr/include/gcr-3/ui/gcr-viewer.h
+drwxr-xr-x	root/root	usr/include/gck-2/
+drwxr-xr-x	root/root	usr/include/gck-2/gck/
+-rw-r--r--	root/root	usr/include/gck-2/gck/gck-enum-types.h
+-rw-r--r--	root/root	usr/include/gck-2/gck/gck-version.h
+-rw-r--r--	root/root	usr/include/gck-2/gck/gck.h
+-rw-r--r--	root/root	usr/include/gck-2/gck/pkcs11n.h
+-rw-r--r--	root/root	usr/include/gck-2/gck/pkcs11x.h
+drwxr-xr-x	root/root	usr/include/gcr-4/
+drwxr-xr-x	root/root	usr/include/gcr-4/gcr/
+-rw-r--r--	root/root	usr/include/gcr-4/gcr/gcr-certificate-chain.h
+-rw-r--r--	root/root	usr/include/gcr-4/gcr/gcr-certificate-field.h
+-rw-r--r--	root/root	usr/include/gcr-4/gcr/gcr-certificate-request.h
+-rw-r--r--	root/root	usr/include/gcr-4/gcr/gcr-certificate-section.h
+-rw-r--r--	root/root	usr/include/gcr-4/gcr/gcr-certificate.h
+-rw-r--r--	root/root	usr/include/gcr-4/gcr/gcr-enum-types.h
+-rw-r--r--	root/root	usr/include/gcr-4/gcr/gcr-fingerprint.h
+-rw-r--r--	root/root	usr/include/gcr-4/gcr/gcr-import-interaction.h
+-rw-r--r--	root/root	usr/include/gcr-4/gcr/gcr-importer.h
+-rw-r--r--	root/root	usr/include/gcr-4/gcr/gcr-library.h
+-rw-r--r--	root/root	usr/include/gcr-4/gcr/gcr-mock-prompter.h
+-rw-r--r--	root/root	usr/include/gcr-4/gcr/gcr-parser.h
+-rw-r--r--	root/root	usr/include/gcr-4/gcr/gcr-pkcs11-certificate.h
+-rw-r--r--	root/root	usr/include/gcr-4/gcr/gcr-prompt.h
+-rw-r--r--	root/root	usr/include/gcr-4/gcr/gcr-secret-exchange.h
+-rw-r--r--	root/root	usr/include/gcr-4/gcr/gcr-secure-memory.h
+-rw-r--r--	root/root	usr/include/gcr-4/gcr/gcr-simple-certificate.h
+-rw-r--r--	root/root	usr/include/gcr-4/gcr/gcr-ssh-askpass.h
+-rw-r--r--	root/root	usr/include/gcr-4/gcr/gcr-system-prompt.h
+-rw-r--r--	root/root	usr/include/gcr-4/gcr/gcr-system-prompter.h
+-rw-r--r--	root/root	usr/include/gcr-4/gcr/gcr-trust.h
+-rw-r--r--	root/root	usr/include/gcr-4/gcr/gcr-types.h
+-rw-r--r--	root/root	usr/include/gcr-4/gcr/gcr-unlock-options.h
+-rw-r--r--	root/root	usr/include/gcr-4/gcr/gcr-version.h
+-rw-r--r--	root/root	usr/include/gcr-4/gcr/gcr.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
+-rwxr-xr-x	root/root	usr/lib/gcr4-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
--rw-r--r--	root/root	usr/lib/girepository-1.0/Gcr-3.typelib
--rw-r--r--	root/root	usr/lib/girepository-1.0/GcrUi-3.typelib
-lrwxrwxrwx	root/root	usr/lib/libgck-1.so -> libgck-1.so.0
-lrwxrwxrwx	root/root	usr/lib/libgck-1.so.0 -> libgck-1.so.0.0.0
--rwxr-xr-x	root/root	usr/lib/libgck-1.so.0.0.0
-lrwxrwxrwx	root/root	usr/lib/libgcr-base-3.so -> libgcr-base-3.so.1
-lrwxrwxrwx	root/root	usr/lib/libgcr-base-3.so.1 -> libgcr-base-3.so.1.0.0
--rwxr-xr-x	root/root	usr/lib/libgcr-base-3.so.1.0.0
-lrwxrwxrwx	root/root	usr/lib/libgcr-ui-3.so -> libgcr-ui-3.so.1
-lrwxrwxrwx	root/root	usr/lib/libgcr-ui-3.so.1 -> libgcr-ui-3.so.1.0.0
--rwxr-xr-x	root/root	usr/lib/libgcr-ui-3.so.1.0.0
+-rw-r--r--	root/root	usr/lib/girepository-1.0/Gck-2.typelib
+-rw-r--r--	root/root	usr/lib/girepository-1.0/Gcr-4.typelib
+lrwxrwxrwx	root/root	usr/lib/libgck-2.so -> libgck-2.so.0.0.0
+lrwxrwxrwx	root/root	usr/lib/libgck-2.so.0.0.0 -> libgck-2.so.2.0.0
+-rwxr-xr-x	root/root	usr/lib/libgck-2.so.2.0.0
+lrwxrwxrwx	root/root	usr/lib/libgcr-4.so -> libgcr-4.so.0.0.0
+lrwxrwxrwx	root/root	usr/lib/libgcr-4.so.0.0.0 -> libgcr-4.so.4.0.0
+-rwxr-xr-x	root/root	usr/lib/libgcr-4.so.4.0.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
--rw-r--r--	root/root	usr/lib/pkgconfig/gck-1.pc
--rw-r--r--	root/root	usr/lib/pkgconfig/gcr-3.pc
--rw-r--r--	root/root	usr/lib/pkgconfig/gcr-base-3.pc
--rw-r--r--	root/root	usr/lib/pkgconfig/gcr-ui-3.pc
+-rw-r--r--	root/root	usr/lib/pkgconfig/gck-2.pc
+-rw-r--r--	root/root	usr/lib/pkgconfig/gcr-4.pc
 drwxr-xr-x	root/root	usr/share/
-drwxr-xr-x	root/root	usr/share/GConf/
-drwxr-xr-x	root/root	usr/share/GConf/gsettings/
--rw-r--r--	root/root	usr/share/GConf/gsettings/org.gnome.crypto.pgp.convert
--rw-r--r--	root/root	usr/share/GConf/gsettings/org.gnome.crypto.pgp_keyservers.convert
-drwxr-xr-x	root/root	usr/share/applications/
--rw-r--r--	root/root	usr/share/applications/gcr-prompter.desktop
--rw-r--r--	root/root	usr/share/applications/gcr-viewer.desktop
-drwxr-xr-x	root/root	usr/share/dbus-1/
-drwxr-xr-x	root/root	usr/share/dbus-1/services/
--rw-r--r--	root/root	usr/share/dbus-1/services/org.gnome.keyring.PrivatePrompter.service
--rw-r--r--	root/root	usr/share/dbus-1/services/org.gnome.keyring.SystemPrompter.service
 drwxr-xr-x	root/root	usr/share/gir-1.0/
--rw-r--r--	root/root	usr/share/gir-1.0/Gck-1.gir
--rw-r--r--	root/root	usr/share/gir-1.0/Gcr-3.gir
--rw-r--r--	root/root	usr/share/gir-1.0/GcrUi-3.gir
-drwxr-xr-x	root/root	usr/share/glib-2.0/
-drwxr-xr-x	root/root	usr/share/glib-2.0/schemas/
--rw-r--r--	root/root	usr/share/glib-2.0/schemas/org.gnome.crypto.pgp.gschema.xml
-drwxr-xr-x	root/root	usr/share/icons/
-drwxr-xr-x	root/root	usr/share/icons/hicolor/
-drwxr-xr-x	root/root	usr/share/icons/hicolor/16x16/
-drwxr-xr-x	root/root	usr/share/icons/hicolor/16x16/apps/
--rw-r--r--	root/root	usr/share/icons/hicolor/16x16/apps/gcr-gnupg.png
--rw-r--r--	root/root	usr/share/icons/hicolor/16x16/apps/gcr-key-pair.png
--rw-r--r--	root/root	usr/share/icons/hicolor/16x16/apps/gcr-key.png
--rw-r--r--	root/root	usr/share/icons/hicolor/16x16/apps/gcr-password.png
--rw-r--r--	root/root	usr/share/icons/hicolor/16x16/apps/gcr-smart-card.png
-drwxr-xr-x	root/root	usr/share/icons/hicolor/22x22/
-drwxr-xr-x	root/root	usr/share/icons/hicolor/22x22/apps/
--rw-r--r--	root/root	usr/share/icons/hicolor/22x22/apps/gcr-gnupg.png
--rw-r--r--	root/root	usr/share/icons/hicolor/22x22/apps/gcr-key-pair.png
--rw-r--r--	root/root	usr/share/icons/hicolor/22x22/apps/gcr-key.png
--rw-r--r--	root/root	usr/share/icons/hicolor/22x22/apps/gcr-password.png
--rw-r--r--	root/root	usr/share/icons/hicolor/22x22/apps/gcr-smart-card.png
-drwxr-xr-x	root/root	usr/share/icons/hicolor/24x24/
-drwxr-xr-x	root/root	usr/share/icons/hicolor/24x24/apps/
--rw-r--r--	root/root	usr/share/icons/hicolor/24x24/apps/gcr-gnupg.png
--rw-r--r--	root/root	usr/share/icons/hicolor/24x24/apps/gcr-key-pair.png
--rw-r--r--	root/root	usr/share/icons/hicolor/24x24/apps/gcr-key.png
--rw-r--r--	root/root	usr/share/icons/hicolor/24x24/apps/gcr-password.png
--rw-r--r--	root/root	usr/share/icons/hicolor/24x24/apps/gcr-smart-card.png
-drwxr-xr-x	root/root	usr/share/icons/hicolor/256x256/
-drwxr-xr-x	root/root	usr/share/icons/hicolor/256x256/apps/
--rw-r--r--	root/root	usr/share/icons/hicolor/256x256/apps/gcr-gnupg.png
--rw-r--r--	root/root	usr/share/icons/hicolor/256x256/apps/gcr-password.png
--rw-r--r--	root/root	usr/share/icons/hicolor/256x256/apps/gcr-smart-card.png
-drwxr-xr-x	root/root	usr/share/icons/hicolor/32x32/
-drwxr-xr-x	root/root	usr/share/icons/hicolor/32x32/apps/
--rw-r--r--	root/root	usr/share/icons/hicolor/32x32/apps/gcr-gnupg.png
--rw-r--r--	root/root	usr/share/icons/hicolor/32x32/apps/gcr-key-pair.png
--rw-r--r--	root/root	usr/share/icons/hicolor/32x32/apps/gcr-key.png
--rw-r--r--	root/root	usr/share/icons/hicolor/32x32/apps/gcr-password.png
--rw-r--r--	root/root	usr/share/icons/hicolor/32x32/apps/gcr-smart-card.png
-drwxr-xr-x	root/root	usr/share/icons/hicolor/48x48/
-drwxr-xr-x	root/root	usr/share/icons/hicolor/48x48/apps/
--rw-r--r--	root/root	usr/share/icons/hicolor/48x48/apps/gcr-gnupg.png
--rw-r--r--	root/root	usr/share/icons/hicolor/48x48/apps/gcr-key-pair.png
--rw-r--r--	root/root	usr/share/icons/hicolor/48x48/apps/gcr-key.png
--rw-r--r--	root/root	usr/share/icons/hicolor/48x48/apps/gcr-password.png
--rw-r--r--	root/root	usr/share/icons/hicolor/48x48/apps/gcr-smart-card.png
-drwxr-xr-x	root/root	usr/share/mime/
-drwxr-xr-x	root/root	usr/share/mime/packages/
--rw-r--r--	root/root	usr/share/mime/packages/gcr-crypto-types.xml
+-rw-r--r--	root/root	usr/share/gir-1.0/Gck-2.gir
+-rw-r--r--	root/root	usr/share/gir-1.0/Gcr-4.gir
 drwxr-xr-x	root/root	usr/share/vala/
 drwxr-xr-x	root/root	usr/share/vala/vapi/
--rw-r--r--	root/root	usr/share/vala/vapi/gck-1.deps
--rw-r--r--	root/root	usr/share/vala/vapi/gck-1.vapi
--rw-r--r--	root/root	usr/share/vala/vapi/gcr-3.deps
--rw-r--r--	root/root	usr/share/vala/vapi/gcr-3.vapi
--rw-r--r--	root/root	usr/share/vala/vapi/gcr-ui-3.deps
--rw-r--r--	root/root	usr/share/vala/vapi/gcr-ui-3.vapi
--rw-r--r--	root/root	usr/share/vala/vapi/pkcs11.vapi
+-rw-r--r--	root/root	usr/share/vala/vapi/gck-2.deps
+-rw-r--r--	root/root	usr/share/vala/vapi/gck-2.vapi
+-rw-r--r--	root/root	usr/share/vala/vapi/gcr-4.deps
+-rw-r--r--	root/root	usr/share/vala/vapi/gcr-4.vapi
diff --git a/gcr/.signature b/gcr/.signature
index 16d39d7d6..a8d575192 100644
--- a/gcr/.signature
+++ b/gcr/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3zkizN2Jl7OB0BT5cfoda5eBI3X8hGW/3MrYtJlX8DysHc31hplhC01M86ES/4M9eo5JS1MGga1NVeSZr503GAM=
-SHA256 (Pkgfile) = 6c82dda18308493e9da0dde69fc4dfd2c5f760e89b1b889138c04b81dce2dc74
-SHA256 (.footprint) = 6748094a2f6a716a08e0bcc67bdfac5a148caae7042c645f12f0bbccee3b3448
-SHA256 (gcr-3.41.1.tar.xz) = bb7128a3c2febbfee9c03b90d77d498d0ceb237b0789802d60185c71c4bea24f
+RWSagIOpLGJF3xdwaMGd8WuKVvvSa88OOw+mdaJ2K/g4zS8g3AvZoVSZhuC3N1rT0PJTuFFSpEy1uZTfRNtqW50oFpwjWXi65wo=
+SHA256 (Pkgfile) = 458d84ab00f63d8926fe7646d9ef7c5ceaa738a4dae83be27cfd10ef97d3530e
+SHA256 (.footprint) = 390b28318f3d7ff2d7b72ad445777d72a92389e3109be4e08fd623eab121dcfc
+SHA256 (gcr-4.0.0.tar.xz) = c45855924f0ee7bab43e2dd38bfafd2ac815c6e9864341c0161e171173dcec7c
diff --git a/gcr/Pkgfile b/gcr/Pkgfile
index 732756e3a..44330a3d5 100644
--- a/gcr/Pkgfile
+++ b/gcr/Pkgfile
@@ -1,12 +1,12 @@
 # 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 libsecret p11-kit vala xorg-libxcomposite xorg-libxcursor xorg-libxinerama
+# Depends on: gnupg gtk4 libsecret p11-kit vala xorg-libxcomposite xorg-libxcursor xorg-libxinerama
 
 name=gcr
-version=3.41.1
+version=4.0.0
 release=1
-source=(https://download.gnome.org/sources/$name/${version:0:4}/$name-$version.tar.xz)
+source=(https://download.gnome.org/sources/$name/${version:0:3}/$name-$version.tar.xz)
 
 build() {
 	meson setup build $name-$version \
@@ -14,7 +14,7 @@ build() {
 		--libexecdir=/usr/lib \
 		--buildtype=plain \
 		--wrap-mode nodownload \
-		-D b_lto=false \
+		-D b_lto=true \
 		-D b_pie=true \
 		-D gtk_doc=false