git: 469f3f057707 - main - security/gcr3: update to 3.41.2

From: Baptiste Daroussin <bapt_at_FreeBSD.org>
Date: Wed, 11 Jun 2025 10:07:50 UTC
The branch main has been updated by bapt:

URL: https://cgit.FreeBSD.org/ports/commit/?id=469f3f05770728c0c13ffb54920a354c3b2eac32

commit 469f3f05770728c0c13ffb54920a354c3b2eac32
Author:     Olivier Duchateau <duchateau.olivier@gmail.com>
AuthorDate: 2025-06-11 08:03:10 +0000
Commit:     Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2025-06-11 10:07:04 +0000

    security/gcr3: update to 3.41.2
    
    PR:     286697
---
 security/gcr3/Makefile  | 34 ++++++++-----------
 security/gcr3/distinfo  |  8 ++---
 security/gcr3/pkg-plist | 87 +------------------------------------------------
 3 files changed, 18 insertions(+), 111 deletions(-)

diff --git a/security/gcr3/Makefile b/security/gcr3/Makefile
index 3a0eb14dd719..01220e4a5180 100644
--- a/security/gcr3/Makefile
+++ b/security/gcr3/Makefile
@@ -1,42 +1,36 @@
 PORTNAME=	gcr
-PORTVERSION=	3.40.0
-PORTREVISION=	3
+PORTVERSION=	3.41.2
 CATEGORIES=	security gnome
 MASTER_SITES=	GNOME
+DIST_SUBDIR=	gnome
 PKGNAMESUFFIX=	3
 
-LICENSE=	LGPL20+
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-PATCH_SITES=	https://gitlab.gnome.org/GNOME/${PORTNAME}/-/commit/
-PATCHFILES+=	b3ca1d02bb01.patch:-p1 # https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/81
-
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Library for bits of crypto UI and parsing
-WWW=		https://live.gnome.org/GnomeKeyring
+WWW=		https://gitlab.gnome.org/GNOME/gcr
 
 BUILD_DEPENDS=	gpg2:security/gnupg
 LIB_DEPENDS=	libdbus-1.so:devel/dbus \
-		libgpg-error.so:security/libgpg-error \
 		libp11-kit.so:security/p11-kit \
-		libgcrypt.so:security/libgcrypt
+		libgcrypt.so:security/libgcrypt \
+		libsecret-1.so:security/libsecret
+RUN_DEPENDS=	gpg2:security/gnupg
 
-CONFLICTS=	gnome-keyring-2.[0-9]*
 PORTSCOUT=	limitw:1,even
 
-USE_GNOME=	cairo gtk30 intlhack introspection:build
-USES=		desktop-file-utils gettext gmake gnome meson pathfix \
-		pkgconfig python shared-mime-info tar:xz vala:build
+USES=		desktop-file-utils gettext gnome meson pkgconfig python \
+		shared-mime-info tar:xz vala:build
+USE_GNOME=	cairo glib20 gdkpixbuf gtk30 introspection:build
+MESON_ARGS=	-Dsystemd=disabled \
+		-Dgtk_doc=false
+# Avoid conflicts with security/gcr -> /usr/local/libexec/gcr-ssh-agent
+MESON_ARGS+=	-Dssh_agent=false
 USE_LDCONFIG=	yes
 BINARY_ALIAS=	python3=${PYTHON_VERSION}
-INSTALL_TARGET=	install-strip
 
 GLIB_SCHEMAS=	org.gnome.crypto.pgp.gschema.xml
 
-OPTIONS_DEFINE=	DOCS
-
-DOCS_BUILD_DEPENDS=	gtk-doc>0:textproc/gtk-doc
-DOCS_MESON_TRUE=	gtk_doc
-DOCSDIR=		${PREFIX}/share/gtk-doc/html/
-
 .include <bsd.port.mk>
diff --git a/security/gcr3/distinfo b/security/gcr3/distinfo
index b5f4fff9582f..8b715e1db19a 100644
--- a/security/gcr3/distinfo
+++ b/security/gcr3/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1644692066
-SHA256 (gcr-3.40.0.tar.xz) = b9d3645a5fd953a54285cc64d4fc046736463dbd4dcc25caf5c7b59bed3027f5
-SIZE (gcr-3.40.0.tar.xz) = 1011044
-SHA256 (b3ca1d02bb01.patch) = 3b2714ea24e6f5985eb4ac124899dfbc5e70200df498552ae198a8039b7c0a83
-SIZE (b3ca1d02bb01.patch) = 1929
+TIMESTAMP = 1731165414
+SHA256 (gnome/gcr-3.41.2.tar.xz) = bad10f3c553a0e1854649ab59c5b2434da22ca1a54ae6138f1f53961567e1ab7
+SIZE (gnome/gcr-3.41.2.tar.xz) = 1034532
diff --git a/security/gcr3/pkg-plist b/security/gcr3/pkg-plist
index 20d8329fb818..66778bc4b634 100644
--- a/security/gcr3/pkg-plist
+++ b/security/gcr3/pkg-plist
@@ -86,91 +86,6 @@ share/dbus-1/services/org.gnome.keyring.SystemPrompter.service
 share/gir-1.0/Gck-1.gir
 share/gir-1.0/Gcr-3.gir
 share/gir-1.0/GcrUi-3.gir
-%%PORTDOCS%%%%DOCSDIR%%gck/GckAttribute.html
-%%PORTDOCS%%%%DOCSDIR%%gck/GckAttributes.html
-%%PORTDOCS%%%%DOCSDIR%%gck/GckEnumerator.html
-%%PORTDOCS%%%%DOCSDIR%%gck/GckModule.html
-%%PORTDOCS%%%%DOCSDIR%%gck/GckObject.html
-%%PORTDOCS%%%%DOCSDIR%%gck/GckObjectCache.html
-%%PORTDOCS%%%%DOCSDIR%%gck/GckSession.html
-%%PORTDOCS%%%%DOCSDIR%%gck/GckSlot.html
-%%PORTDOCS%%%%DOCSDIR%%gck/annotation-glossary.html
-%%PORTDOCS%%%%DOCSDIR%%gck/gck-Errors.html
-%%PORTDOCS%%%%DOCSDIR%%gck/gck-GckModule-lists.html
-%%PORTDOCS%%%%DOCSDIR%%gck/gck-Library-Utilities.html
-%%PORTDOCS%%%%DOCSDIR%%gck/gck-Miscellaneous-Functions.html
-%%PORTDOCS%%%%DOCSDIR%%gck/gck-PKCS11-URIs.html
-%%PORTDOCS%%%%DOCSDIR%%gck/gck.devhelp2
-%%PORTDOCS%%%%DOCSDIR%%gck/home.png
-%%PORTDOCS%%%%DOCSDIR%%gck/index.html
-%%PORTDOCS%%%%DOCSDIR%%gck/left-insensitive.png
-%%PORTDOCS%%%%DOCSDIR%%gck/left.png
-%%PORTDOCS%%%%DOCSDIR%%gck/pkcs11-links.html
-%%PORTDOCS%%%%DOCSDIR%%gck/reference.html
-%%PORTDOCS%%%%DOCSDIR%%gck/right-insensitive.png
-%%PORTDOCS%%%%DOCSDIR%%gck/right.png
-%%PORTDOCS%%%%DOCSDIR%%gck/style.css
-%%PORTDOCS%%%%DOCSDIR%%gck/up-insensitive.png
-%%PORTDOCS%%%%DOCSDIR%%gck/up.png
-%%PORTDOCS%%%%DOCSDIR%%gcr/GcrCertificate.html
-%%PORTDOCS%%%%DOCSDIR%%gcr/GcrCertificateChain.html
-%%PORTDOCS%%%%DOCSDIR%%gcr/GcrCertificateRequest.html
-%%PORTDOCS%%%%DOCSDIR%%gcr/GcrCertificateWidget.html
-%%PORTDOCS%%%%DOCSDIR%%gcr/GcrCollection.html
-%%PORTDOCS%%%%DOCSDIR%%gcr/GcrCollectionModel.html
-%%PORTDOCS%%%%DOCSDIR%%gcr/GcrComboSelector.html
-%%PORTDOCS%%%%DOCSDIR%%gcr/GcrComparable.html
-%%PORTDOCS%%%%DOCSDIR%%gcr/GcrImportButton.html
-%%PORTDOCS%%%%DOCSDIR%%gcr/GcrImportInteraction.html
-%%PORTDOCS%%%%DOCSDIR%%gcr/GcrImporter.html
-%%PORTDOCS%%%%DOCSDIR%%gcr/GcrKeyWidget.html
-%%PORTDOCS%%%%DOCSDIR%%gcr/GcrListSelector.html
-%%PORTDOCS%%%%DOCSDIR%%gcr/GcrParser.html
-%%PORTDOCS%%%%DOCSDIR%%gcr/GcrPkcs11Certificate.html
-%%PORTDOCS%%%%DOCSDIR%%gcr/GcrPrompt.html
-%%PORTDOCS%%%%DOCSDIR%%gcr/GcrPromptDialog.html
-%%PORTDOCS%%%%DOCSDIR%%gcr/GcrRenderer.html
-%%PORTDOCS%%%%DOCSDIR%%gcr/GcrSecretExchange.html
-%%PORTDOCS%%%%DOCSDIR%%gcr/GcrSecureEntryBuffer.html
-%%PORTDOCS%%%%DOCSDIR%%gcr/GcrSimpleCertificate.html
-%%PORTDOCS%%%%DOCSDIR%%gcr/GcrSimpleCollection.html
-%%PORTDOCS%%%%DOCSDIR%%gcr/GcrSshAskpass.html
-%%PORTDOCS%%%%DOCSDIR%%gcr/GcrSystemPrompt.html
-%%PORTDOCS%%%%DOCSDIR%%gcr/GcrSystemPrompter.html
-%%PORTDOCS%%%%DOCSDIR%%gcr/GcrTreeSelector.html
-%%PORTDOCS%%%%DOCSDIR%%gcr/GcrViewer.html
-%%PORTDOCS%%%%DOCSDIR%%gcr/GcrViewerWidget.html
-%%PORTDOCS%%%%DOCSDIR%%gcr/annotation-glossary.html
-%%PORTDOCS%%%%DOCSDIR%%gcr/certificate-widget.png
-%%PORTDOCS%%%%DOCSDIR%%gcr/certificates.html
-%%PORTDOCS%%%%DOCSDIR%%gcr/ch01.html
-%%PORTDOCS%%%%DOCSDIR%%gcr/collections.html
-%%PORTDOCS%%%%DOCSDIR%%gcr/combo-selector.png
-%%PORTDOCS%%%%DOCSDIR%%gcr/gcr-GcrColumn.html
-%%PORTDOCS%%%%DOCSDIR%%gcr/gcr-Key-Fingerprints.html
-%%PORTDOCS%%%%DOCSDIR%%gcr/gcr-Library-PKCS#11.html
-%%PORTDOCS%%%%DOCSDIR%%gcr/gcr-Library-Utilities.html
-%%PORTDOCS%%%%DOCSDIR%%gcr/gcr-Non-pageable-Memory.html
-%%PORTDOCS%%%%DOCSDIR%%gcr/gcr-Trust-Storage-and-Lookups.html
-%%PORTDOCS%%%%DOCSDIR%%gcr/gcr.devhelp2
-%%PORTDOCS%%%%DOCSDIR%%gcr/home.png
-%%PORTDOCS%%%%DOCSDIR%%gcr/import-button.png
-%%PORTDOCS%%%%DOCSDIR%%gcr/index.html
-%%PORTDOCS%%%%DOCSDIR%%gcr/key-widget.png
-%%PORTDOCS%%%%DOCSDIR%%gcr/left-insensitive.png
-%%PORTDOCS%%%%DOCSDIR%%gcr/left.png
-%%PORTDOCS%%%%DOCSDIR%%gcr/list-selector.png
-%%PORTDOCS%%%%DOCSDIR%%gcr/misc.html
-%%PORTDOCS%%%%DOCSDIR%%gcr/prompts.html
-%%PORTDOCS%%%%DOCSDIR%%gcr/right-insensitive.png
-%%PORTDOCS%%%%DOCSDIR%%gcr/right.png
-%%PORTDOCS%%%%DOCSDIR%%gcr/storage.html
-%%PORTDOCS%%%%DOCSDIR%%gcr/style.css
-%%PORTDOCS%%%%DOCSDIR%%gcr/tree-selector.png
-%%PORTDOCS%%%%DOCSDIR%%gcr/up-insensitive.png
-%%PORTDOCS%%%%DOCSDIR%%gcr/up.png
-%%PORTDOCS%%%%DOCSDIR%%gcr/viewer-widget.png
-%%PORTDOCS%%%%DOCSDIR%%gcr/widgets.html
 share/icons/hicolor/16x16/apps/gcr-gnupg.png
 share/icons/hicolor/16x16/apps/gcr-key-pair.png
 share/icons/hicolor/16x16/apps/gcr-key.png
@@ -199,6 +114,7 @@ share/icons/hicolor/48x48/apps/gcr-key-pair.png
 share/icons/hicolor/48x48/apps/gcr-key.png
 share/icons/hicolor/48x48/apps/gcr-password.png
 share/icons/hicolor/48x48/apps/gcr-smart-card.png
+share/locale/ab/LC_MESSAGES/gcr.mo
 share/locale/af/LC_MESSAGES/gcr.mo
 share/locale/ar/LC_MESSAGES/gcr.mo
 share/locale/as/LC_MESSAGES/gcr.mo
@@ -238,7 +154,6 @@ share/locale/hi/LC_MESSAGES/gcr.mo
 share/locale/hr/LC_MESSAGES/gcr.mo
 share/locale/hu/LC_MESSAGES/gcr.mo
 share/locale/id/LC_MESSAGES/gcr.mo
-share/locale/is/LC_MESSAGES/gcr.mo
 share/locale/it/LC_MESSAGES/gcr.mo
 share/locale/ja/LC_MESSAGES/gcr.mo
 share/locale/ka/LC_MESSAGES/gcr.mo