qgpgme: update to 1.18.0 to sync with gpgme.

4 files changed, 28 insertions, 17 deletions

diff --git a/security/qgpgme/Makefile b/security/qgpgme/Makefile
index b1d05f3ab48..f3e8253c170 100644
--- a/security/qgpgme/Makefile
+++ b/security/qgpgme/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2022/04/18 19:10:05 adam Exp $
+# $NetBSD: Makefile,v 1.21 2022/09/29 00:11:59 markd Exp $
 
-DISTNAME=	gpgme-1.15.1
-PKGNAME=	qgpgme-1.15.1
-PKGREVISION=	3
+DISTNAME=	gpgme-1.18.0
+PKGNAME=	qgpgme-1.18.0
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/gpgme/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/security/qgpgme/PLIST b/security/qgpgme/PLIST
index 27c28e3e9a0..71ca9cc2fa8 100644
--- a/security/qgpgme/PLIST
+++ b/security/qgpgme/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2021/03/18 06:44:45 markd Exp $
+@comment $NetBSD: PLIST,v 1.3 2022/09/29 00:11:59 markd Exp $
 include/QGpgME/AbstractImportJob
+include/QGpgME/AddExistingSubkeyJob
 include/QGpgME/AddUserIDJob
 include/QGpgME/ChangeExpiryJob
 include/QGpgME/ChangeOwnerTrustJob
@@ -28,7 +29,10 @@ include/QGpgME/MultiDeleteJob
 include/QGpgME/Protocol
 include/QGpgME/QGpgMENewCryptoConfig
 include/QGpgME/QuickJob
+include/QGpgME/ReceiveKeysJob
 include/QGpgME/RefreshKeysJob
+include/QGpgME/RevokeKeyJob
+include/QGpgME/SetPrimaryUserIDJob
 include/QGpgME/SignEncryptJob
 include/QGpgME/SignJob
 include/QGpgME/SignKeyJob
@@ -36,8 +40,11 @@ include/QGpgME/SpecialJob
 include/QGpgME/TofuPolicyJob
 include/QGpgME/VerifyDetachedJob
 include/QGpgME/VerifyOpaqueJob
+include/QGpgME/WKDLookupJob
+include/QGpgME/WKDLookupResult
 include/QGpgME/WKSPublishJob
 include/qgpgme/abstractimportjob.h
+include/qgpgme/addexistingsubkeyjob.h
 include/qgpgme/adduseridjob.h
 include/qgpgme/changeexpiryjob.h
 include/qgpgme/changeownertrustjob.h
@@ -68,7 +75,10 @@ include/qgpgme/qgpgme_export.h
 include/qgpgme/qgpgme_version.h
 include/qgpgme/qgpgmenewcryptoconfig.h
 include/qgpgme/quickjob.h
+include/qgpgme/receivekeysjob.h
 include/qgpgme/refreshkeysjob.h
+include/qgpgme/revokekeyjob.h
+include/qgpgme/setprimaryuseridjob.h
 include/qgpgme/signencryptjob.h
 include/qgpgme/signjob.h
 include/qgpgme/signkeyjob.h
@@ -76,6 +86,8 @@ include/qgpgme/specialjob.h
 include/qgpgme/tofupolicyjob.h
 include/qgpgme/verifydetachedjob.h
 include/qgpgme/verifyopaquejob.h
+include/qgpgme/wkdlookupjob.h
+include/qgpgme/wkdlookupresult.h
 include/qgpgme/wkspublishjob.h
 lib/cmake/QGpgme/QGpgmeConfig.cmake
 lib/cmake/QGpgme/QGpgmeConfigVersion.cmake
diff --git a/security/qgpgme/distinfo b/security/qgpgme/distinfo
index 969d417865b..1c07c10024f 100644
--- a/security/qgpgme/distinfo
+++ b/security/qgpgme/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2021/10/26 11:17:52 nia Exp $
+$NetBSD: distinfo,v 1.5 2022/09/29 00:11:59 markd Exp $
 
-BLAKE2s (gpgme-1.15.1.tar.bz2) = b176678844c9c623cf5ef2dc93838221cc51339ba801218784f1fb5d9162ca4b
-SHA512 (gpgme-1.15.1.tar.bz2) = 1d75a848cce6389f7cb8896b57a28dfe1dc5a447bfb4f128b0994a43e04134343400a3be063e971f03dfd595474cfd558519741d5d56afb3e84853ad4f2a45c2
-Size (gpgme-1.15.1.tar.bz2) = 1699349 bytes
-SHA1 (patch-lang_qt_src_Makefile.in) = 943f3466322a30c8de2c23bdf0dda3bda4fd0e9f
+BLAKE2s (gpgme-1.18.0.tar.bz2) = 48a1a66cca2fbe838112932507f11119039c07e2150da2d4fb392cb6ff21c5c4
+SHA512 (gpgme-1.18.0.tar.bz2) = c0cb0b337d017793a15dd477a7f5eaef24587fcda3d67676bf746bb342398d04792c51abe3c26ae496e799c769ce667d4196d91d86e8a690d02c6718c8f6b4ac
+Size (gpgme-1.18.0.tar.bz2) = 1762323 bytes
+SHA1 (patch-lang_qt_src_Makefile.in) = b9b0e54c65f6b446607cb9e3512b05f0fb7ac356
diff --git a/security/qgpgme/patches/patch-lang_qt_src_Makefile.in b/security/qgpgme/patches/patch-lang_qt_src_Makefile.in
index ffed77fd373..4fbc76299ab 100644
--- a/security/qgpgme/patches/patch-lang_qt_src_Makefile.in
+++ b/security/qgpgme/patches/patch-lang_qt_src_Makefile.in
@@ -1,10 +1,10 @@
-$NetBSD: patch-lang_qt_src_Makefile.in,v 1.2 2021/03/18 06:44:45 markd Exp $
+$NetBSD: patch-lang_qt_src_Makefile.in,v 1.3 2022/09/29 00:11:59 markd Exp $
 
 Use installed libraries
 
---- lang/qt/src/Makefile.in.orig	2021-01-08 17:21:11.000000000 +0000
+--- lang/qt/src/Makefile.in.orig	2022-08-10 13:12:50.000000000 +0000
 +++ lang/qt/src/Makefile.in
-@@ -143,8 +143,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
+@@ -144,8 +144,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
  	"$(DESTDIR)$(qgpgmeincludedir)" \
  	"$(DESTDIR)$(qgpgmeincludedir)"
  LTLIBRARIES = $(lib_LTLIBRARIES)
@@ -12,14 +12,14 @@ Use installed libraries
 -	../../../src/libgpgme.la
 +libqgpgme_la_DEPENDENCIES =
  am__objects_1 = dataprovider.lo debug.lo job.lo multideletejob.lo \
- 	qgpgmeadduseridjob.lo qgpgmebackend.lo \
- 	qgpgmechangeexpiryjob.lo qgpgmechangeownertrustjob.lo \
-@@ -727,7 +726,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/lang/cpp/s
+ 	qgpgmeadduseridjob.lo qgpgmeaddexistingsubkeyjob.lo \
+ 	qgpgmebackend.lo qgpgmechangeexpiryjob.lo \
+@@ -774,7 +773,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/lang/cpp/s
                -DBUILDING_QGPGME -Wsuggest-override \
                -Wzero-as-null-pointer-constant
  
 -libqgpgme_la_LIBADD = ../../cpp/src/libgpgmepp.la ../../../src/libgpgme.la \
 +libqgpgme_la_LIBADD = -lgpgmepp -lgpgme \
-                        @LIBASSUAN_LIBS@ @GPGME_QT_LIBS@
+                        @LIBASSUAN_LIBS@ @GPG_ERROR_LIBS@ @GPGME_QT_LIBS@
  
  libqgpgme_la_LDFLAGS = -no-undefined -version-info \