security/*gpgme*: Update to 1.22.0

gpgme-qt: Fix COMMENT when FLAVOR is not explicitly set and use just
one PORTREVISION line to avoid confusing bumping tools.

https://dev.gnupg.org/T6668

3 files changed, 37 insertions, 5 deletions

diff --git a/security/gpgme/files/patch-configure b/security/gpgme/files/patch-configure
index d54dc9867a9c..c459227ace77 100644
--- a/security/gpgme/files/patch-configure
+++ b/security/gpgme/files/patch-configure
@@ -4,9 +4,9 @@ of a clean environment since the ports system can only build a package for one
 Python flavor at a time. The found versions of Python are overridden by
 environment variables set in the port Makefile.
 
---- configure.orig	2019-03-26 17:29:46 UTC
+--- configure.orig	2023-08-21 07:46:33 UTC
 +++ configure
-@@ -23851,6 +23851,10 @@ $as_echo "$as_me: WARNING:
+@@ -31342,6 +31342,10 @@ printf "%s\n" "$as_me: WARNING:
  
  	fi
  
diff --git a/security/gpgme/files/patch-lang_python_Makefile.in b/security/gpgme/files/patch-lang_python_Makefile.in
index 227ab2c55e59..e78760200c2a 100644
--- a/security/gpgme/files/patch-lang_python_Makefile.in
+++ b/security/gpgme/files/patch-lang_python_Makefile.in
@@ -6,9 +6,9 @@ unable to execute 'swig': No such file or directory
 Second hunk:
 Fix staging and build the *.pyc and *.pyo files 
 
---- lang/python/Makefile.in.orig	2017-12-12 11:56:08 UTC
+--- lang/python/Makefile.in.orig	2023-08-21 07:46:32 UTC
 +++ lang/python/Makefile.in
-@@ -740,7 +740,7 @@ all-local: copystamp
+@@ -768,7 +768,7 @@ all-local: copystamp
  	  CFLAGS="$(CFLAGS)" \
  	  srcdir="$(srcdir)" \
  	  top_builddir="$(top_builddir)" \
@@ -17,7 +17,7 @@ Fix staging and build the *.pyc and *.pyo files
  	done
  
  python$(PYTHON_VERSION)-gpg/dist/gpg-$(VERSION).tar.gz.asc: copystamp
-@@ -782,7 +782,8 @@ install-exec-local:
+@@ -811,7 +811,8 @@ install-exec-local:
  	  build \
  	  --build-base="$$(basename "$${PYTHON}")-gpg" \
  	  install \
diff --git a/security/gpgme/files/patch-lang_qt_tests_Makefile.in b/security/gpgme/files/patch-lang_qt_tests_Makefile.in
new file mode 100644
index 000000000000..ffc5f0ef5c55
--- /dev/null
+++ b/security/gpgme/files/patch-lang_qt_tests_Makefile.in
@@ -0,0 +1,32 @@
+Fix build of Qt tests.
+
+This fixes the problem that the debug.h in the C sources was found
+before the one in the Qt bindings.
+
+Based on upstream commits:
+https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=commit;h=d23528cadf4284f508bc4ba05e1b5c14b46bd354
+https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=commit;h=aee18a2ab2498bc6092bef518c532796bbe5b502
+
+--- lang/qt/tests/Makefile.in.orig	2023-08-21 07:46:32 UTC
++++ lang/qt/tests/Makefile.in
+@@ -796,16 +796,16 @@ AM_LDFLAGS = -no-install
+ @WANT_QT6_TRUE@        ../../../src/libgpgme.la @GPGME_QT6_LIBS@ @GPG_ERROR_LIBS@ \
+ @WANT_QT6_TRUE@        @GPGME_QT6TEST_LIBS@ @LDADD_FOR_TESTS_KLUDGE@ -lstdc++
+ 
+-@WANT_QT5_TRUE@AM_CPPFLAGS = -I$(top_srcdir)/lang/cpp/src -I$(top_builddir)/src \
++@WANT_QT5_TRUE@AM_CPPFLAGS = -I$(top_srcdir)/lang/qt/src -I$(top_srcdir)/lang/cpp/src \
++@WANT_QT5_TRUE@              -I$(top_builddir)/src \
+ @WANT_QT5_TRUE@              @GPG_ERROR_CFLAGS@ @GPGME_QT5_CFLAGS@ @GPG_ERROR_CFLAGS@ \
+ @WANT_QT5_TRUE@              @LIBASSUAN_CFLAGS@ @GPGME_QT5TEST_CFLAGS@ -DBUILDING_QGPGME \
+-@WANT_QT5_TRUE@              -I$(top_srcdir)/lang/qt/src \
+ @WANT_QT5_TRUE@              -DTOP_SRCDIR="$(top_srcdir)"
+ 
+-@WANT_QT6_TRUE@AM_CPPFLAGS = -I$(top_srcdir)/lang/cpp/src -I$(top_builddir)/src \
++@WANT_QT6_TRUE@AM_CPPFLAGS = -I$(top_srcdir)/lang/qt/src -I$(top_srcdir)/lang/cpp/src \
++@WANT_QT6_TRUE@              -I$(top_builddir)/src \
+ @WANT_QT6_TRUE@              @GPG_ERROR_CFLAGS@ @GPGME_QT6_CFLAGS@ @GPG_ERROR_CFLAGS@ \
+ @WANT_QT6_TRUE@              @LIBASSUAN_CFLAGS@ @GPGME_QT6TEST_CFLAGS@ -DBUILDING_QGPGME \
+-@WANT_QT6_TRUE@              -I$(top_srcdir)/lang/qt/src \
+ @WANT_QT6_TRUE@              -DTOP_SRCDIR="$(top_srcdir)"
+ 
+ support_src = t-support.h t-support.cpp