[packages/gpa] - added gpgme2 compatibility patch from git; release 2

[qboosh]

commit 25edbfd8d9b3493a2cc008ca50ff3e04aa6f21e3
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Jul 23 16:39:00 2025 +0200

    - added gpgme2 compatibility patch from git; release 2

 gpa-gpgme2.patch | 100 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 gpa.spec         |   4 ++-
 2 files changed, 103 insertions(+), 1 deletion(-)
---
diff --git a/gpa.spec b/gpa.spec
index 8c6cfa5..b1d8e35 100644
--- a/gpa.spec
+++ b/gpa.spec
@@ -2,12 +2,13 @@ Summary:	Gnu Privacy Assistant - Graphical Frontend for the GnuPG
 Summary(pl.UTF-8):	Gnu Privacy Assistant - Graficzny Frontend GnuPG
 Name:		gpa
 Version:	0.11.0
-Release:	1
+Release:	2
 License:	GPL v3+
 Group:		X11/Applications
 Source0:	https://www.gnupg.org/ftp/gcrypt/gpa/%{name}-%{version}.tar.bz2
 # Source0-md5:	38ca404c6835059f952fb33d93fbf3d3
 Patch0:		%{name}-includes.patch
+Patch1:		%{name}-gpgme2.patch
 URL:		https://www.gnupg.org/related_software/gpa/
 BuildRequires:	autoconf >= 2.61
 BuildRequires:	automake >= 1:1.10
@@ -38,6 +39,7 @@ zarządzania zarówno publicznymi, jak i prywatnymi kluczami.
 %prep
 %setup -q
 %patch -P0 -p1
+%patch -P1 -p1
 
 # use newer system versions
 %{__rm} m4/{gpg-error.m4,gpgme.m4,libassuan.m4}
diff --git a/gpa-gpgme2.patch b/gpa-gpgme2.patch
new file mode 100644
index 0000000..401c284
--- /dev/null
+++ b/gpa-gpgme2.patch
@@ -0,0 +1,100 @@
+From b6ba8bcc6db7765667cd6c49b7edc9a2073bc74f Mon Sep 17 00:00:00 2001
+From: Werner Koch <wk at gnupg.org>
+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);
+ };
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gpa.git/commitdiff/25edbfd8d9b3493a2cc008ca50ff3e04aa6f21e3