src/cm-piv.c | 1 1 + 0 - 0 !
1 file changed, 1 insertion(+)

 [patch 1/2] fix implicit declaration of gpa_keytable_ensure

* src/cm-piv.c: Fix implicit declaration of gpa_keytable_ensure.

gpa.desktop | 3 2 + 1 - 0 !
1 file changed, 2 insertions(+), 1 deletion(-)

 clean up gpa.desktop

desktop-file-validate says:

  warning: value "GTK;Application;Security;Utility;" for key
  "Categories" in group "Desktop Entry" contains a deprecated value
  "Application"

So i removed Application.

I added Keywords= because of
https://wiki.gnome.org/Initiatives/GnomeGoals/DesktopFileKeywords

src/gpacontext.c | 23 0 + 23 - 0 !
src/gpacontext.h | 1 0 + 1 - 0 !
2 files changed, 24 deletions(-)

 [patch 2/2] 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/gpa-marshal.list | 2 2 + 0 - 0 !
src/gpacontext.c | 5 3 + 2 - 0 !
src/gpakeyexpireop.c | 3 2 + 1 - 0 !
3 files changed, 7 insertions(+), 3 deletions(-)

 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 <sam@gentoo.org>

ChangeLog entries added by wk.