openbsd/ports
1
0
Fork 0
mirror of https://github.com/openbsd/ports.git synced 2026-06-17 23:13:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

update to gpa-0.11.0 (switching to gtk+3)

Browse Source 
add post-release patches to fix with newer gpgme
This commit is contained in:
sthen
2025-12-20 14:27:04 +00:00
parent 0372e8d5c3
commit 65b8742236
8 changed files with 178 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
security/gpa/Makefile
+10 -11
View File
@@ -1,7 +1,6 @@
COMMENT= graphical interface for GnuPG
DISTNAME= gpa-0.10.0
REVISION= 1
DISTNAME= gpa-0.11.0
EXTRACT_SUFX= .tar.bz2
CATEGORIES= security x11
@@ -9,20 +8,20 @@ CATEGORIES= security x11
HOMEPAGE= https://www.gnupg.org/software/gpa/
SITES = https://gnupg.org/ftp/gcrypt/gpa/
# GPLv2
# GPLv3+
PERMIT_PACKAGE= Yes
WANTLIB = X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama Xrandr
WANTLIB += Xrender assuan atk-1.0 c cairo fontconfig freetype
WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
WANTLIB += gpg-error gpgme gtk-x11-2.0 harfbuzz iconv intl m pango-1.0
WANTLIB += pangocairo-1.0 pangoft2-1.0 pthread z
WANTLIB += assuan atk-1.0 c cairo cairo-gobject gdk-3 gdk_pixbuf-2.0
WANTLIB += gio-2.0 glib-2.0 gobject-2.0 gpg-error gpgme gtk-3
WANTLIB += harfbuzz iconv intl m pango-1.0 pangocairo-1.0 pthread
WANTLIB += z
CONFIGURE_STYLE= gnu
USE_GMAKE= Yes
RUN_DEPENDS= devel/desktop-file-utils
LIB_DEPENDS= devel/gettext,-runtime \
security/gpgme \
x11/gtk+2
CONFIGURE_STYLE= gnu
x11/gtk+3
.include <bsd.port.mk>
security/gpa/distinfo
+2 -2
View File
@@ -1,2 +1,2 @@
SHA256 (gpa-0.10.0.tar.bz2) = ldur51+lyNxH46zy33pRzuCWBR5ahCtMm21h5Aphd7E=
SIZE (gpa-0.10.0.tar.bz2) = 782455
SHA256 (gpa-0.11.0.tar.bz2) = Jqj6W/cFQct0Hwxxt8/ikbHqVuq2jusHqpYs71zfM8w=
SIZE (gpa-0.11.0.tar.bz2) = 827217
security/gpa/patches/patch-src_cm-piv_c
+16
View File
@@ -0,0 +1,16 @@
From aa63712b18b79b983e3d9cd7ce5105d0ec7ac262 Mon Sep 17 00:00:00 2001
From: Andreas Stieger <Andreas.Stieger@gmx.de>
Date: Fri, 18 Jul 2025 09:39:50 +0200
Subject: [PATCH] Fix implicit declaration of gpa_keytable_ensure
Index: src/cm-piv.c
--- src/cm-piv.c.orig
+++ 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"
security/gpa/patches/patch-src_gpa-marshal_list
+12
View File
@@ -0,0 +1,12 @@
From 45fc64a4ac9f73457bf610ce76cca087c0d0d09a Mon Sep 17 00:00:00 2001
From: Sam James via Gnupg-devel <gnupg-devel@gnupg.org>
Date: Sun, 10 Aug 2025 03:36:11 +0100
Subject: [PATCH] Fix incorrect callback arguments
Index: src/gpa-marshal.list
--- src/gpa-marshal.list.orig
+++ src/gpa-marshal.list
@@ -1 +1,3 @@
INT:STRING,STRING
+VOID:INT,INT
+VOID:POINTER,POINTER
security/gpa/patches/patch-src_gpacontext_c
+97
View File
@@ -0,0 +1,97 @@
From 45fc64a4ac9f73457bf610ce76cca087c0d0d09a Mon Sep 17 00:00:00 2001
From: Sam James via Gnupg-devel <gnupg-devel@gnupg.org>
Date: Sun, 10 Aug 2025 03:36:11 +0100
Subject: [PATCH] Fix incorrect callback arguments
From b6ba8bcc6db7765667cd6c49b7edc9a2073bc74f Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@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
Index: src/gpacontext.c
--- src/gpacontext.c.orig
+++ src/gpacontext.c
@@ -25,6 +25,7 @@
#include "gpa.h"
#include "gpgmetools.h"
#include "gpacontext.h"
+#include "gpa-marshal.h"
/* GObject type functions */
@@ -38,8 +39,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 +64,6 @@ enum
START,
DONE,
NEXT_KEY,
- NEXT_TRUST_ITEM,
PROGRESS,
LAST_SIGNAL
};
@@ -113,7 +111,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,24 +140,15 @@ 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),
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
@@ -496,10 +484,6 @@ gpa_context_event_cb (void *data, gpgme_event_io_t typ
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;
@@ -527,12 +511,6 @@ gpa_context_done (GpaContext *context, gpg_error_t err
static void
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 */
}
security/gpa/patches/patch-src_gpacontext_h
+16
View File
@@ -0,0 +1,16 @@
From b6ba8bcc6db7765667cd6c49b7edc9a2073bc74f Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@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
Index: src/gpacontext.h
--- src/gpacontext.h.orig
+++ 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);
};
security/gpa/patches/patch-src_gpakeyexpireop_c
+25
View File
@@ -0,0 +1,25 @@
From 45fc64a4ac9f73457bf610ce76cca087c0d0d09a Mon Sep 17 00:00:00 2001
From: Sam James via Gnupg-devel <gnupg-devel@gnupg.org>
Date: Sun, 10 Aug 2025 03:36:11 +0100
Subject: [PATCH] Fix incorrect callback arguments
Index: src/gpakeyexpireop.c
--- src/gpakeyexpireop.c.orig
+++ 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 (GpaKeyExpireOpera
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);
security/gpa/pkg/PLIST
-2
View File
@@ -18,6 +18,4 @@ share/locale/sv/LC_MESSAGES/gpa.mo
share/locale/tr/LC_MESSAGES/gpa.mo
share/locale/zh_CN/LC_MESSAGES/gpa.mo
share/locale/zh_TW/LC_MESSAGES/gpa.mo
share/pixmaps/
share/pixmaps/gpa.png
@tag update-desktop-database