pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/security/gcr



Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Aug 14 08:58:42 UTC 2024

Modified Files:
        pkgsrc/security/gcr: Makefile PLIST distinfo
Added Files:
        pkgsrc/security/gcr/patches: patch-gck_meson.build
            patch-gcr_meson.build patch-ui_meson.build

Log Message:
gcr: updated to 3.40.0

gcr 3.40.0:
- FEATURE: add hkps://keys.openpgp.org to keyserver defaults
- gcr/key-mechanism: Port to GTask
- GckCall: Simplify the code by using GTask based implementation
- Remove Autotools
- gck: Don't use g_assert() in tests
- Create a workaround for tests and GTask
- ui: Set "use-underline" for GcrImportButton
- Get rid of most GSimpleAsyncResult usages
- Gck flags check fixes
- Increase test-gnupg-collection timeout
- ci: Fix ASAN jobs
- Updated translations


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 pkgsrc/security/gcr/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/gcr/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/security/gcr/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/security/gcr/patches/patch-gck_meson.build \
    pkgsrc/security/gcr/patches/patch-gcr_meson.build \
    pkgsrc/security/gcr/patches/patch-ui_meson.build

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/gcr/Makefile
diff -u pkgsrc/security/gcr/Makefile:1.37 pkgsrc/security/gcr/Makefile:1.38
--- pkgsrc/security/gcr/Makefile:1.37   Sun Apr  7 07:34:56 2024
+++ pkgsrc/security/gcr/Makefile        Wed Aug 14 08:58:42 2024
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2024/04/07 07:34:56 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2024/08/14 08:58:42 adam Exp $
 
-DISTNAME=      gcr-3.38.1
-PKGREVISION=   13
+DISTNAME=      gcr-3.40.0
 CATEGORIES=    security
-MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gcr/${PKGVERSION_NOREV:R}/}
+MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -11,31 +10,26 @@ HOMEPAGE=   https://www.gnome.org/
 COMMENT=       Library for crypto UI and related tasks
 LICENSE=       gnu-gpl-v2
 
-TOOL_DEPENDS+=         gettext-m4-[0-9]*:../../devel/gettext-m4
+TOOL_DEPENDS+= gettext-m4-[0-9]*:../../devel/gettext-m4
+DEPENDS+=      gnupg2-[0-9]*:../../security/gnupg2
 
-USE_LIBTOOL=           yes
-USE_TOOLS+=            gmake intltool msgfmt perl pkg-config
-USE_TOOLS+=            aclocal autoconf automake autopoint
-USE_TOOLS+=            gdbus-codegen readlink
-GNU_CONFIGURE=         yes
-CONFIGURE_ARGS+=       --enable-gtk-doc
-CONFIGURE_ARGS+=       --enable-vala
+USE_TOOLS+=    gdbus-codegen intltool msgfmt perl pkg-config readlink
+TEST_ENV+=     LD_LIBRARY_PATH=${WRKSRC}/output/gck
+TEST_ENV+=     DYLD_LIBRARY_PATH=${WRKSRC}/output/gck
 
 PKGCONFIG_OVERRIDE+=   gck-1.pc.in
 PKGCONFIG_OVERRIDE+=   gcr-base-3.pc.in
 PKGCONFIG_OVERRIDE+=   gcr-ui.pc.in
 PKGCONFIG_OVERRIDE+=   gcr-3.pc.in
 
-TEST_TARGET=           check
-
-pre-configure:
-       cd ${WRKSRC} && NOCONFIGURE=1 ./autogen.sh
+REPLACE_PYTHON=                meson_post_install.py
 
 .include "../../devel/gettext-tools/msgfmt-desktop.mk"
-BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.38
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/gobject-introspection/buildlink3.mk"
+.include "../../devel/meson/build.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../lang/python/application.mk"
 .include "../../lang/vala/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../security/p11-kit/buildlink3.mk"

Index: pkgsrc/security/gcr/PLIST
diff -u pkgsrc/security/gcr/PLIST:1.2 pkgsrc/security/gcr/PLIST:1.3
--- pkgsrc/security/gcr/PLIST:1.2       Sat Nov  7 07:17:07 2020
+++ pkgsrc/security/gcr/PLIST   Wed Aug 14 08:58:42 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2020/11/07 07:17:07 mef Exp $
+@comment $NetBSD: PLIST,v 1.3 2024/08/14 08:58:42 adam Exp $
 bin/gcr-viewer
 include/gck-1/gck/gck-deprecated.h
 include/gck-1/gck/gck-enum-types.h
@@ -63,12 +63,15 @@ include/gcr-3/ui/gcr-viewer.h
 lib/girepository-1.0/Gck-1.typelib
 lib/girepository-1.0/Gcr-3.typelib
 lib/girepository-1.0/GcrUi-3.typelib
-lib/libgck-1.la
+lib/libgck-1.so
+lib/libgck-1.so.0
 lib/libgcr-3.so
 lib/libgcr-3.so.1
 lib/libgcr-3.so.1.0.0
-lib/libgcr-base-3.la
-lib/libgcr-ui-3.la
+lib/libgcr-base-3.so
+lib/libgcr-base-3.so.1
+lib/libgcr-ui-3.so
+lib/libgcr-ui-3.so.1
 lib/pkgconfig/gck-1.pc
 lib/pkgconfig/gcr-3.pc
 lib/pkgconfig/gcr-base-3.pc
@@ -85,6 +88,7 @@ share/gir-1.0/Gck-1.gir
 share/gir-1.0/Gcr-3.gir
 share/gir-1.0/GcrUi-3.gir
 share/glib-2.0/schemas/org.gnome.crypto.pgp.gschema.xml
+share/gtk-doc/html/gck/GckAttribute.html
 share/gtk-doc/html/gck/GckAttributes.html
 share/gtk-doc/html/gck/GckEnumerator.html
 share/gtk-doc/html/gck/GckModule.html
@@ -94,7 +98,6 @@ share/gtk-doc/html/gck/GckSession.html
 share/gtk-doc/html/gck/GckSlot.html
 share/gtk-doc/html/gck/annotation-glossary.html
 share/gtk-doc/html/gck/gck-Errors.html
-share/gtk-doc/html/gck/gck-GckAttribute.html
 share/gtk-doc/html/gck/gck-GckModule-lists.html
 share/gtk-doc/html/gck/gck-Library-Utilities.html
 share/gtk-doc/html/gck/gck-Miscellaneous-Functions.html
@@ -111,65 +114,65 @@ share/gtk-doc/html/gck/right.png
 share/gtk-doc/html/gck/style.css
 share/gtk-doc/html/gck/up-insensitive.png
 share/gtk-doc/html/gck/up.png
-share/gtk-doc/html/gcr-3/GcrCertificate.html
-share/gtk-doc/html/gcr-3/GcrCertificateChain.html
-share/gtk-doc/html/gcr-3/GcrCertificateWidget.html
-share/gtk-doc/html/gcr-3/GcrCollection.html
-share/gtk-doc/html/gcr-3/GcrCollectionModel.html
-share/gtk-doc/html/gcr-3/GcrComboSelector.html
-share/gtk-doc/html/gcr-3/GcrComparable.html
-share/gtk-doc/html/gcr-3/GcrImportButton.html
-share/gtk-doc/html/gcr-3/GcrImporter.html
-share/gtk-doc/html/gcr-3/GcrKeyWidget.html
-share/gtk-doc/html/gcr-3/GcrListSelector.html
-share/gtk-doc/html/gcr-3/GcrParser.html
-share/gtk-doc/html/gcr-3/GcrPkcs11Certificate.html
-share/gtk-doc/html/gcr-3/GcrPrompt.html
-share/gtk-doc/html/gcr-3/GcrPromptDialog.html
-share/gtk-doc/html/gcr-3/GcrRenderer.html
-share/gtk-doc/html/gcr-3/GcrSecretExchange.html
-share/gtk-doc/html/gcr-3/GcrSecureEntryBuffer.html
-share/gtk-doc/html/gcr-3/GcrSimpleCertificate.html
-share/gtk-doc/html/gcr-3/GcrSimpleCollection.html
-share/gtk-doc/html/gcr-3/GcrSystemPrompt.html
-share/gtk-doc/html/gcr-3/GcrSystemPrompter.html
-share/gtk-doc/html/gcr-3/GcrTreeSelector.html
-share/gtk-doc/html/gcr-3/GcrViewer.html
-share/gtk-doc/html/gcr-3/GcrViewerWidget.html
-share/gtk-doc/html/gcr-3/annotation-glossary.html
-share/gtk-doc/html/gcr-3/certificate-widget.png
-share/gtk-doc/html/gcr-3/certificates.html
-share/gtk-doc/html/gcr-3/ch01.html
-share/gtk-doc/html/gcr-3/collections.html
-share/gtk-doc/html/gcr-3/combo-selector.png
-share/gtk-doc/html/gcr-3/gcr-3.devhelp2
-share/gtk-doc/html/gcr-3/gcr-GcrCertificateRequest.html
-share/gtk-doc/html/gcr-3/gcr-GcrColumn.html
-share/gtk-doc/html/gcr-3/gcr-GcrImportInteraction.html
-share/gtk-doc/html/gcr-3/gcr-GcrSshAskpass.html
-share/gtk-doc/html/gcr-3/gcr-Key-Fingerprints.html
-share/gtk-doc/html/gcr-3/gcr-Library-PKCS#11.html
-share/gtk-doc/html/gcr-3/gcr-Library-Utilities.html
-share/gtk-doc/html/gcr-3/gcr-Non-pageable-Memory.html
-share/gtk-doc/html/gcr-3/gcr-Trust-Storage-and-Lookups.html
-share/gtk-doc/html/gcr-3/home.png
-share/gtk-doc/html/gcr-3/import-button.png
-share/gtk-doc/html/gcr-3/index.html
-share/gtk-doc/html/gcr-3/key-widget.png
-share/gtk-doc/html/gcr-3/left-insensitive.png
-share/gtk-doc/html/gcr-3/left.png
-share/gtk-doc/html/gcr-3/list-selector.png
-share/gtk-doc/html/gcr-3/misc.html
-share/gtk-doc/html/gcr-3/prompts.html
-share/gtk-doc/html/gcr-3/right-insensitive.png
-share/gtk-doc/html/gcr-3/right.png
-share/gtk-doc/html/gcr-3/storage.html
-share/gtk-doc/html/gcr-3/style.css
-share/gtk-doc/html/gcr-3/tree-selector.png
-share/gtk-doc/html/gcr-3/up-insensitive.png
-share/gtk-doc/html/gcr-3/up.png
-share/gtk-doc/html/gcr-3/viewer-widget.png
-share/gtk-doc/html/gcr-3/widgets.html
+share/gtk-doc/html/gcr/GcrCertificate.html
+share/gtk-doc/html/gcr/GcrCertificateChain.html
+share/gtk-doc/html/gcr/GcrCertificateRequest.html
+share/gtk-doc/html/gcr/GcrCertificateWidget.html
+share/gtk-doc/html/gcr/GcrCollection.html
+share/gtk-doc/html/gcr/GcrCollectionModel.html
+share/gtk-doc/html/gcr/GcrComboSelector.html
+share/gtk-doc/html/gcr/GcrComparable.html
+share/gtk-doc/html/gcr/GcrImportButton.html
+share/gtk-doc/html/gcr/GcrImportInteraction.html
+share/gtk-doc/html/gcr/GcrImporter.html
+share/gtk-doc/html/gcr/GcrKeyWidget.html
+share/gtk-doc/html/gcr/GcrListSelector.html
+share/gtk-doc/html/gcr/GcrParser.html
+share/gtk-doc/html/gcr/GcrPkcs11Certificate.html
+share/gtk-doc/html/gcr/GcrPrompt.html
+share/gtk-doc/html/gcr/GcrPromptDialog.html
+share/gtk-doc/html/gcr/GcrRenderer.html
+share/gtk-doc/html/gcr/GcrSecretExchange.html
+share/gtk-doc/html/gcr/GcrSecureEntryBuffer.html
+share/gtk-doc/html/gcr/GcrSimpleCertificate.html
+share/gtk-doc/html/gcr/GcrSimpleCollection.html
+share/gtk-doc/html/gcr/GcrSshAskpass.html
+share/gtk-doc/html/gcr/GcrSystemPrompt.html
+share/gtk-doc/html/gcr/GcrSystemPrompter.html
+share/gtk-doc/html/gcr/GcrTreeSelector.html
+share/gtk-doc/html/gcr/GcrViewer.html
+share/gtk-doc/html/gcr/GcrViewerWidget.html
+share/gtk-doc/html/gcr/annotation-glossary.html
+share/gtk-doc/html/gcr/certificate-widget.png
+share/gtk-doc/html/gcr/certificates.html
+share/gtk-doc/html/gcr/ch01.html
+share/gtk-doc/html/gcr/collections.html
+share/gtk-doc/html/gcr/combo-selector.png
+share/gtk-doc/html/gcr/gcr-GcrColumn.html
+share/gtk-doc/html/gcr/gcr-Key-Fingerprints.html
+share/gtk-doc/html/gcr/gcr-Library-PKCS#11.html
+share/gtk-doc/html/gcr/gcr-Library-Utilities.html
+share/gtk-doc/html/gcr/gcr-Non-pageable-Memory.html
+share/gtk-doc/html/gcr/gcr-Trust-Storage-and-Lookups.html
+share/gtk-doc/html/gcr/gcr.devhelp2
+share/gtk-doc/html/gcr/home.png
+share/gtk-doc/html/gcr/import-button.png
+share/gtk-doc/html/gcr/index.html
+share/gtk-doc/html/gcr/key-widget.png
+share/gtk-doc/html/gcr/left-insensitive.png
+share/gtk-doc/html/gcr/left.png
+share/gtk-doc/html/gcr/list-selector.png
+share/gtk-doc/html/gcr/misc.html
+share/gtk-doc/html/gcr/prompts.html
+share/gtk-doc/html/gcr/right-insensitive.png
+share/gtk-doc/html/gcr/right.png
+share/gtk-doc/html/gcr/storage.html
+share/gtk-doc/html/gcr/style.css
+share/gtk-doc/html/gcr/tree-selector.png
+share/gtk-doc/html/gcr/up-insensitive.png
+share/gtk-doc/html/gcr/up.png
+share/gtk-doc/html/gcr/viewer-widget.png
+share/gtk-doc/html/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

Index: pkgsrc/security/gcr/distinfo
diff -u pkgsrc/security/gcr/distinfo:1.6 pkgsrc/security/gcr/distinfo:1.7
--- pkgsrc/security/gcr/distinfo:1.6    Thu Jan 13 08:02:29 2022
+++ pkgsrc/security/gcr/distinfo        Wed Aug 14 08:58:42 2024
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.6 2022/01/13 08:02:29 adam Exp $
+$NetBSD: distinfo,v 1.7 2024/08/14 08:58:42 adam Exp $
 
-BLAKE2s (gcr-3.38.1.tar.xz) = 81de7cb748fcd608cface2c097ddff400bf2250fba07baa2c419892c7779e272
-SHA512 (gcr-3.38.1.tar.xz) = 4dc8c3f84023a7cd6f069f4529cb063d7153e589c2f9547410c7eeb5298dc238ea7fc4f22e22d8c237391f31bfcd814190e55125195f20b913665b9ca81d9c21
-Size (gcr-3.38.1.tar.xz) = 1030360 bytes
+BLAKE2s (gcr-3.40.0.tar.xz) = 8d9c790f71ef75d81f56d1f18f42874d5d983b064d64844ad4a6c05a54870cb9
+SHA512 (gcr-3.40.0.tar.xz) = 7118608e7bef7d0cf2eea33cb3286b7f9c3622a38892ce88cf33ed453d343cc33e070831e7b4d0c5cdb43c2e57b3f0b91c7cbd6aa8463982d3af8844b59bcb81
+Size (gcr-3.40.0.tar.xz) = 1011044 bytes
+SHA1 (patch-gck_meson.build) = 7fe90ef3859a401a2be2f9a92f3e8b2c9fe731fd
+SHA1 (patch-gcr_meson.build) = 34a5abe3ce2e0e63aaa7f0b6eeaf6cf735ad79f7
 SHA1 (patch-gcr_test-secure-memory.c) = e8002f64467d001e06c8af28f16b0c1ffe7211ad
+SHA1 (patch-ui_meson.build) = cb1a3647878695a1da66e0ef0886a25357c5cd41

Added files:

Index: pkgsrc/security/gcr/patches/patch-gck_meson.build
diff -u /dev/null pkgsrc/security/gcr/patches/patch-gck_meson.build:1.1
--- /dev/null   Wed Aug 14 08:58:42 2024
+++ pkgsrc/security/gcr/patches/patch-gck_meson.build   Wed Aug 14 08:58:42 2024
@@ -0,0 +1,14 @@
+$NetBSD: patch-gck_meson.build,v 1.1 2024/08/14 08:58:42 adam Exp $
+
+Remove unused argument: https://gitlab.gnome.org/GNOME/gcr/-/issues/89
+
+--- gck/meson.build.orig       2024-07-22 06:47:18.604957655 +0000
++++ 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',
Index: pkgsrc/security/gcr/patches/patch-gcr_meson.build
diff -u /dev/null pkgsrc/security/gcr/patches/patch-gcr_meson.build:1.1
--- /dev/null   Wed Aug 14 08:58:42 2024
+++ pkgsrc/security/gcr/patches/patch-gcr_meson.build   Wed Aug 14 08:58:42 2024
@@ -0,0 +1,14 @@
+$NetBSD: patch-gcr_meson.build,v 1.1 2024/08/14 08:58:42 adam Exp $
+
+Remove unused argument: https://gitlab.gnome.org/GNOME/gcr/-/issues/89
+
+--- gcr/meson.build.orig       2024-07-22 06:48:29.011018530 +0000
++++ gcr/meson.build
+@@ -189,7 +189,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',
Index: pkgsrc/security/gcr/patches/patch-ui_meson.build
diff -u /dev/null pkgsrc/security/gcr/patches/patch-ui_meson.build:1.1
--- /dev/null   Wed Aug 14 08:58:42 2024
+++ pkgsrc/security/gcr/patches/patch-ui_meson.build    Wed Aug 14 08:58:42 2024
@@ -0,0 +1,14 @@
+$NetBSD: patch-ui_meson.build,v 1.1 2024/08/14 08:58:42 adam Exp $
+
+Remove unused argument: https://gitlab.gnome.org/GNOME/gcr/-/issues/89
+
+--- ui/meson.build.orig        2024-07-22 06:49:15.437466037 +0000
++++ 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',



Home | Main Index | Thread Index | Old Index