[packages/libcryptui] - added fixes for gpgme 2.x and gpg up to 2.4.x, release 3
qboosh
qboosh at pld-linux.org
Sun Jul 20 10:24:09 CEST 2025
commit 37ea5d9fd2c4ea355ddd2c9c684e09028c43af70
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Jul 20 10:25:50 2025 +0200
- added fixes for gpgme 2.x and gpg up to 2.4.x, release 3
libcryptui-gpg.patch | 11 +++++++++++
libcryptui-gpgme.patch | 38 ++++++++++++++++++++++++++++++++++++++
2 files changed, 49 insertions(+)
---
diff --git a/libcryptui-gpg.patch b/libcryptui-gpg.patch
new file mode 100644
index 0000000..943f220
--- /dev/null
+++ b/libcryptui-gpg.patch
@@ -0,0 +1,11 @@
+--- libcryptui-3.12.2/configure.ac.orig 2025-07-20 09:55:27.559605018 +0200
++++ libcryptui-3.12.2/configure.ac 2025-07-20 09:56:23.715967460 +0200
+@@ -95,7 +95,7 @@ AC_ARG_ENABLE(gpg-check,
+ DO_CHECK=$enableval, DO_CHECK=yes)
+
+ if test "$DO_CHECK" = "yes"; then
+- accepted_versions="1.2 1.4 2.0"
++ accepted_versions="1.2 1.4 2.0 2.2 2.4"
+ AC_PATH_PROGS(GNUPG, [gpg gpg2], no)
+ AC_DEFINE_UNQUOTED(GNUPG, "$GNUPG", [Path to gpg executable.])
+ ok="no"
diff --git a/libcryptui-gpgme.patch b/libcryptui-gpgme.patch
new file mode 100644
index 0000000..424c602
--- /dev/null
+++ b/libcryptui-gpgme.patch
@@ -0,0 +1,38 @@
+--- libcryptui-3.12.2/configure.ac.orig 2014-05-13 20:53:02.000000000 +0200
++++ libcryptui-3.12.2/configure.ac 2025-07-20 09:50:42.957813505 +0200
+@@ -131,7 +131,13 @@ fi
+ ok="no"
+ min_gpgme_version=1.0.0
+ AC_PATH_PROG(GPGME_CONFIG, gpgme-config, "failed")
+-if test $GPGME_CONFIG != "failed" ; then
++if test $GPGME_CONFIG = "failed" ; then
++ AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, "failed")
++ if test $GPGRT_CONFIG != "failed" ; then
++ GPGME_CONFIG="$GPGRT_CONFIG gpgme"
++ fi
++fi
++if test "$GPGME_CONFIG" != "failed" ; then
+ AC_MSG_CHECKING(for GPGME - version >= $min_gpgme_version)
+ req_major=`echo $min_gpgme_version | \
+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
+@@ -153,6 +159,8 @@ if test $GPGME_CONFIG != "failed" ; then
+ ok="yes"
+ fi
+ fi
++ elif test "$major" -gt "$req_major"; then
++ ok="yes"
+ fi
+ fi
+
+--- libcryptui-3.12.2/daemon/seahorse-gpgme-operation.c.orig 2014-03-16 08:57:16.000000000 +0100
++++ libcryptui-3.12.2/daemon/seahorse-gpgme-operation.c 2025-07-20 10:21:29.311144284 +0200
+@@ -302,7 +302,9 @@ event_cb (void *data, gpgme_event_io_t t
+ break;
+
+ case GPGME_EVENT_NEXT_KEY:
++#if GPGME_VERSION_NUMBER < 0x020000
+ case GPGME_EVENT_NEXT_TRUSTITEM:
++#endif
+ default:
+ /* Ignore unsupported event types */
+ break;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libcryptui.git/commitdiff/37ea5d9fd2c4ea355ddd2c9c684e09028c43af70
More information about the pld-cvs-commit
mailing list