diff --git a/srcpkgs/gpa/patches/001-keytable-include.patch b/srcpkgs/gpa/patches/001-keytable-include.patch deleted file mode 100644 index 93b45f1632b067..00000000000000 --- a/srcpkgs/gpa/patches/001-keytable-include.patch +++ /dev/null @@ -1,22 +0,0 @@ -From aa63712b18b79b983e3d9cd7ce5105d0ec7ac262 Mon Sep 17 00:00:00 2001 -From: Andreas Stieger -Date: Fri, 18 Jul 2025 09:39:50 +0200 -Subject: [PATCH] Fix implicit declaration of gpa_keytable_ensure - -* src/cm-piv.c: Fix implicit declaration of gpa_keytable_ensure. ---- - src/cm-piv.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/cm-piv.c b/src/cm-piv.c -index c7d98ab..a531123 100644 ---- a/src/cm-piv.c -+++ b/src/cm-piv.c -@@ -41,6 +41,7 @@ - #include "gtktools.h" - #include "convert.h" - #include "gpa-key-details.h" -+#include "keytable.h" - - #include "cm-object.h" - #include "cm-piv.h" diff --git a/srcpkgs/gpa/patches/002-gpgme-2.x.patch b/srcpkgs/gpa/patches/002-gpgme-2.x.patch deleted file mode 100644 index 401c284855e983..00000000000000 --- a/srcpkgs/gpa/patches/002-gpgme-2.x.patch +++ /dev/null @@ -1,100 +0,0 @@ -From b6ba8bcc6db7765667cd6c49b7edc9a2073bc74f Mon Sep 17 00:00:00 2001 -From: Werner Koch -Date: Fri, 18 Jul 2025 09:45:23 +0200 -Subject: [PATCH] Remove trust_item stuff to make it build with gpgme 2.x - -* src/gpacontext.h (struct _GpaContextClass): Remove next_trust_item. -* src/gpacontext.c (NEXT_TRUST_ITEM): Remove -(gpa_context_class_init): Remove assignment. -(gpa_context_event_cb): Remove handler. -(gpa_context_next_trust_item): Remove. --- - -Note that the trust item feature worked only for a very short period -in 2003. ---- - src/gpacontext.c | 23 ----------------------- - src/gpacontext.h | 1 - - 2 files changed, 24 deletions(-) - -diff --git a/src/gpacontext.c b/src/gpacontext.c -index 6afaf45..91bd85f 100644 ---- a/src/gpacontext.c -+++ b/src/gpacontext.c -@@ -38,8 +38,6 @@ static void gpa_context_finalize (GObject *object); - static void gpa_context_start (GpaContext *context); - static void gpa_context_done (GpaContext *context, gpg_error_t err); - static void gpa_context_next_key (GpaContext *context, gpgme_key_t key); --static void gpa_context_next_trust_item (GpaContext *context, -- gpgme_trust_item_t item); - static void gpa_context_progress (GpaContext *context, int current, int total); - - /* The GPGME I/O callbacks */ -@@ -65,7 +63,6 @@ enum - START, - DONE, - NEXT_KEY, -- NEXT_TRUST_ITEM, - PROGRESS, - LAST_SIGNAL - }; -@@ -113,7 +110,6 @@ gpa_context_class_init (GpaContextClass *klass) - klass->start = gpa_context_start; - klass->done = gpa_context_done; - klass->next_key = gpa_context_next_key; -- klass->next_trust_item = gpa_context_next_trust_item; - klass->progress = gpa_context_progress; - - /* Signals */ -@@ -143,15 +139,6 @@ gpa_context_class_init (GpaContextClass *klass) - g_cclosure_marshal_VOID__POINTER, - G_TYPE_NONE, 1, - G_TYPE_POINTER); -- signals[NEXT_TRUST_ITEM] = -- g_signal_new ("next_trust_item", -- G_TYPE_FROM_CLASS (object_class), -- G_SIGNAL_RUN_FIRST, -- G_STRUCT_OFFSET (GpaContextClass, next_trust_item), -- NULL, NULL, -- g_cclosure_marshal_VOID__POINTER, -- G_TYPE_NONE, 1, -- G_TYPE_POINTER); - signals[PROGRESS] = - g_signal_new ("progress", - G_TYPE_FROM_CLASS (object_class), -@@ -496,10 +483,6 @@ gpa_context_event_cb (void *data, gpgme_event_io_t type, void *type_data) - case GPGME_EVENT_NEXT_KEY: - g_signal_emit (context, signals[NEXT_KEY], 0, type_data); - break; -- case GPGME_EVENT_NEXT_TRUSTITEM: -- g_signal_emit (context, signals[NEXT_TRUST_ITEM], 0, -- type_data); -- break; - default: - /* Ignore unsupported event types */ - break; -@@ -531,12 +514,6 @@ gpa_context_next_key (GpaContext *context, gpgme_key_t key) - /* Do nothing yet */ - } - --static void --gpa_context_next_trust_item (GpaContext *context, gpgme_trust_item_t item) --{ -- /* Do nothing yet */ --} -- - static void - gpa_context_progress (GpaContext *context, int current, int total) - { -diff --git a/src/gpacontext.h b/src/gpacontext.h -index 0a091bb..919da41 100644 ---- a/src/gpacontext.h -+++ b/src/gpacontext.h -@@ -63,7 +63,6 @@ struct _GpaContextClass { - void (*start) (GpaContext *context); - void (*done) (GpaContext *context, gpg_error_t err); - void (*next_key) (GpaContext *context, gpgme_key_t key); -- void (*next_trust_item) (GpaContext *context, gpgme_trust_item_t item); - void (*progress) (GpaContext *context, int current, int total); - }; - diff --git a/srcpkgs/gpa/patches/004-callback-args.patch b/srcpkgs/gpa/patches/004-callback-args.patch deleted file mode 100644 index 0756543eebaa72..00000000000000 --- a/srcpkgs/gpa/patches/004-callback-args.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 45fc64a4ac9f73457bf610ce76cca087c0d0d09a Mon Sep 17 00:00:00 2001 -From: Sam James via Gnupg-devel -Date: Sun, 10 Aug 2025 03:36:11 +0100 -Subject: [PATCH] Fix incorrect callback arguments - -* src/gpa-marshal.list: Add two entries. -* src/gpacontext.c (gpa_context_class_init): Fix "progress" signal. -* src/gpakeyexpireop.c (gpa_key_expire_operation_class_init): -Use gpa_marshal_VOID__POINTER_POINTER. - --- - -Some users reported a crash downstream in Gentoo with -g_type_check_is_value_type getting a garbage type. This turns out to -be because 95e07080a2a08196cafb05b69345ea1d629424b1 replaced the -types (and argument counts) incorrectly. - -Fix that by adding to gpa_marshal.list to create custom marshal types -and use those instead, and fix the argument count. - -Bug: https://bugs.gentoo.org/957196 -Fixes: 95e07080a2a08196cafb05b69345ea1d629424b1 -Signed-off-by: Sam James - -ChangeLog entries added by wk. ---- - src/gpa-marshal.list | 2 ++ - src/gpacontext.c | 5 +++-- - src/gpakeyexpireop.c | 3 ++- - 3 files changed, 7 insertions(+), 3 deletions(-) - -diff --git a/src/gpa-marshal.list b/src/gpa-marshal.list -index 081ce17..941257d 100644 ---- a/src/gpa-marshal.list -+++ b/src/gpa-marshal.list -@@ -1 +1,3 @@ - INT:STRING,STRING -+VOID:INT,INT -+VOID:POINTER,POINTER -diff --git a/src/gpacontext.c b/src/gpacontext.c -index 91bd85f..31301c0 100644 ---- a/src/gpacontext.c -+++ b/src/gpacontext.c -@@ -25,6 +25,7 @@ - #include "gpa.h" - #include "gpgmetools.h" - #include "gpacontext.h" -+#include "gpa-marshal.h" - - /* GObject type functions */ - -@@ -145,9 +146,9 @@ gpa_context_class_init (GpaContextClass *klass) - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (GpaContextClass, progress), - NULL, NULL, -- g_cclosure_marshal_VOID__INT, -+ gpa_marshal_VOID__INT_INT, - G_TYPE_NONE, 2, -- G_TYPE_INT); -+ G_TYPE_INT, G_TYPE_INT); - } - - static void -diff --git a/src/gpakeyexpireop.c b/src/gpakeyexpireop.c -index a489087..25e489e 100644 ---- a/src/gpakeyexpireop.c -+++ b/src/gpakeyexpireop.c -@@ -31,6 +31,7 @@ - #endif - - #include "gpa.h" -+#include "gpa-marshal.h" - #include "gpakeyexpireop.h" - #include "expirydlg.h" - #include "gpgmeedit.h" -@@ -114,7 +115,7 @@ gpa_key_expire_operation_class_init (GpaKeyExpireOperationClass *klass) - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (GpaKeyExpireOperationClass, new_expiration), - NULL, NULL, -- g_cclosure_marshal_VOID__POINTER, -+ gpa_marshal_VOID__POINTER_POINTER, - G_TYPE_NONE, 2, - G_TYPE_POINTER, - G_TYPE_POINTER); diff --git a/srcpkgs/gpa/template b/srcpkgs/gpa/template index 9c4509c2bf9379..a3083cd9bd357a 100644 --- a/srcpkgs/gpa/template +++ b/srcpkgs/gpa/template @@ -1,6 +1,6 @@ # Template file for 'gpa' pkgname=gpa -version=0.11.0 +version=0.11.1 revision=1 build_style=gnu-configure hostmakedepends="pkg-config gettext glib-devel" @@ -11,4 +11,4 @@ maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://www.gnupg.org/related_software/gpa/" distfiles="https://gnupg.org/ftp/gcrypt/gpa/gpa-${version}.tar.bz2" -checksum=26a8fa5bf70541cb741f0c71b7cfe291b1ea56eab68eeb07aa962cef5cdf33cc +checksum=0bc5b2cd3e0641d07a2d8af372a09659decd918bee22fdfbefd2133d7c4d5d0b