security/*gpgme*: Update to 1.23.0

https://dev.gnupg.org/T6774

7 files changed, 14 insertions, 40 deletions

diff --git a/security/gpgme-cpp/pkg-plist b/security/gpgme-cpp/pkg-plist
index bfc7b2f3befe..698eaf3c0a2d 100644
--- a/security/gpgme-cpp/pkg-plist
+++ b/security/gpgme-cpp/pkg-plist
@@ -44,4 +44,4 @@ lib/cmake/Gpgmepp/GpgmeppConfig.cmake
 lib/cmake/Gpgmepp/GpgmeppConfigVersion.cmake
 lib/libgpgmepp.so
 lib/libgpgmepp.so.6
-lib/libgpgmepp.so.6.19.0
+lib/libgpgmepp.so.6.20.0
diff --git a/security/gpgme-qt-headers/pkg-plist b/security/gpgme-qt-headers/pkg-plist
index 5f86f21d9979..b1bebc07ccc1 100644
--- a/security/gpgme-qt-headers/pkg-plist
+++ b/security/gpgme-qt-headers/pkg-plist
@@ -46,6 +46,7 @@ include/QGpgME/VerifyDetachedJob
 include/QGpgME/VerifyOpaqueJob
 include/QGpgME/WKDLookupJob
 include/QGpgME/WKDLookupResult
+include/QGpgME/WKDRefreshJob
 include/QGpgME/WKSPublishJob
 include/qgpgme/abstractimportjob.h
 include/qgpgme/addexistingsubkeyjob.h
@@ -97,4 +98,5 @@ include/qgpgme/verifydetachedjob.h
 include/qgpgme/verifyopaquejob.h
 include/qgpgme/wkdlookupjob.h
 include/qgpgme/wkdlookupresult.h
+include/qgpgme/wkdrefreshjob.h
 include/qgpgme/wkspublishjob.h
diff --git a/security/gpgme-qt/pkg-plist b/security/gpgme-qt/pkg-plist
index b783f7213e81..354a02c93671 100644
--- a/security/gpgme-qt/pkg-plist
+++ b/security/gpgme-qt/pkg-plist
@@ -2,4 +2,4 @@ lib/cmake/QGpgme%%QT_SUFFIX%%/QGpgme%%QT_SUFFIX%%Config.cmake
 lib/cmake/QGpgme%%QT_SUFFIX%%/QGpgme%%QT_SUFFIX%%ConfigVersion.cmake
 lib/libqgpgme%%qt_SUFFIX%%.so
 lib/libqgpgme%%qt_SUFFIX%%.so.15
-lib/libqgpgme%%qt_SUFFIX%%.so.15.4.0
+lib/libqgpgme%%qt_SUFFIX%%.so.15.5.0
diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index fc91141527f7..c6e7a1d63cea 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gpgme
-PORTVERSION=	1.22.0
+PORTVERSION=	1.23.0
 PORTREVISION?=	0
 CATEGORIES?=	security
 MASTER_SITES=	GNUPG/gpgme
@@ -91,8 +91,10 @@ TEST_USE=	QT=testlib:build
 PLIST_SUB=	QT_SUFFIX="" qt_SUFFIX=""
 .    else
 USES+=		compiler:c++17-lang pkgconfig qt:6
-USE_QT=		base
 USE_CXXSTD=	c++17
+USE_LOCALE=	C.UTF-8
+USE_QT=		base
+CXXFLAGS+=	-fPIC
 PLIST_SUB=	QT_SUFFIX="${QT_STR}" qt_SUFFIX="${FLAVOR}"
 .    endif
 
@@ -119,6 +121,8 @@ PLIST_SUB+=	VERSION=${PORTVERSION}
 .endif
 
 post-patch:
+	@${REINPLACE_CMD} -e 's|mno-direct-extern-access|fno-direct-access-external-data|g' \
+		${WRKSRC}/configure
 .if defined(SLAVEPORT)
 	@${FIND} ${BUILD_WRKSRC} -name "Makefile.in" -type f | ${XARGS} \
 	${REINPLACE_CMD} -e 's|../../../src/libgpgme.la|-lgpgme|g'
diff --git a/security/gpgme/distinfo b/security/gpgme/distinfo
index 58bf10398d2a..ec8b15dcb12f 100644
--- a/security/gpgme/distinfo
+++ b/security/gpgme/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1692699022
-SHA256 (gpgme-1.22.0.tar.bz2) = 9551e37081ad3bde81018a0d24f245c3f8206990549598fb31a97a68380a7b71
-SIZE (gpgme-1.22.0.tar.bz2) = 1717836
+TIMESTAMP = 1698244732
+SHA256 (gpgme-1.23.0.tar.bz2) = 043e2efe18b4ad22b96d434dde763fbed32cf8d6c220dc69df0d0ffb9dc66fc6
+SIZE (gpgme-1.23.0.tar.bz2) = 1717618
diff --git a/security/gpgme/files/patch-lang_qt_tests_Makefile.in b/security/gpgme/files/patch-lang_qt_tests_Makefile.in
deleted file mode 100644
index ffc5f0ef5c55..000000000000
--- a/security/gpgme/files/patch-lang_qt_tests_Makefile.in
+++ /dev/null
@@ -1,32 +0,0 @@
-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
diff --git a/security/gpgme/pkg-plist b/security/gpgme/pkg-plist
index 808091e29330..bbc1180e9072 100644
--- a/security/gpgme/pkg-plist
+++ b/security/gpgme/pkg-plist
@@ -8,7 +8,7 @@ lib/common-lisp/gpgme/gpgme.asd
 lib/common-lisp/gpgme/gpgme.lisp
 lib/libgpgme.so
 lib/libgpgme.so.11
-lib/libgpgme.so.11.31.0
+lib/libgpgme.so.11.32.0
 libdata/pkgconfig/gpgme-glib.pc
 libdata/pkgconfig/gpgme.pc
 share/aclocal/gpgme.m4