Update gpgme to 1.18.0, OK?
diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index c7934381aa8..aeea514a306 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -1,14 +1,14 @@
COMMENT-main = GnuPG Made Easy
COMMENT-qt = Qt bindings for GPGme
-VERSION = 1.17.1
+VERSION = 1.18.0
DISTNAME = gpgme-${VERSION}
PKGNAME-main = gpgme-${VERSION}
PKGNAME-qt = gpgme-qt-${VERSION}
CATEGORIES = security devel
-SHARED_LIBS += gpgme 23.0 # 37.0
+SHARED_LIBS += gpgme 23.1 # 37.0
SHARED_LIBS += gpgmepp 2.0 # 20.0
SHARED_LIBS += qgpgme 1.0 # 14.0
diff --git a/security/gpgme/distinfo b/security/gpgme/distinfo
index 7c8cbabc736..403ffe889b2 100644
--- a/security/gpgme/distinfo
+++ b/security/gpgme/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gpgme-1.17.1.tar.bz2) = cR6r9d1mG5sEvp7cms4qe8Ax9r2dN6do0C0O/e8Qj18=
-SIZE (gpgme-1.17.1.tar.bz2) = 1747692
+SHA256 (gpgme-1.18.0.tar.bz2) = Nh1OrkfOkl26DqVpr0DntSxkXEri5l5WIb8bbN2LDp4=
+SIZE (gpgme-1.18.0.tar.bz2) = 1762323
diff --git a/security/gpgme/patches/patch-configure
b/security/gpgme/patches/patch-configure
index 5013d429118..554f26029c7 100644
--- a/security/gpgme/patches/patch-configure
+++ b/security/gpgme/patches/patch-configure
@@ -1,7 +1,7 @@
Index: configure
--- configure.orig
+++ configure
-@@ -25152,7 +25152,6 @@ $as_echo "$_gcc_wopt" >&6; }
+@@ -25296,7 +25296,6 @@ $as_echo "$_gcc_wopt" >&6; }
CFLAGS="$CFLAGS -Wno-missing-field-initializers"
CFLAGS="$CFLAGS -Wno-sign-compare"
CFLAGS="$CFLAGS -Wno-format-zero-length"
diff --git a/security/gpgme/patches/patch-lang_cpp_tests_Makefile_in
b/security/gpgme/patches/patch-lang_cpp_tests_Makefile_in
index 5af8992374a..dfe1904a6cb 100644
--- a/security/gpgme/patches/patch-lang_cpp_tests_Makefile_in
+++ b/security/gpgme/patches/patch-lang_cpp_tests_Makefile_in
@@ -3,7 +3,7 @@
Index: lang/cpp/tests/Makefile.in
--- lang/cpp/tests/Makefile.in.orig
+++ lang/cpp/tests/Makefile.in
-@@ -426,7 +426,7 @@ top_srcdir = @top_srcdir@
+@@ -428,7 +428,7 @@ top_srcdir = @top_srcdir@
AM_LDFLAGS = -no-install
LDADD = ../../cpp/src/libgpgmepp.la \
../../../src/libgpgme.la @GPG_ERROR_LIBS@ \
diff --git a/security/gpgme/patches/patch-lang_qt_Makefile_in
b/security/gpgme/patches/patch-lang_qt_Makefile_in
index ebe550ad087..e37fa31f1b6 100644
--- a/security/gpgme/patches/patch-lang_qt_Makefile_in
+++ b/security/gpgme/patches/patch-lang_qt_Makefile_in
@@ -4,7 +4,7 @@ don't allow doxygen to run even if installed, something with
the files
Index: lang/qt/Makefile.in
--- lang/qt/Makefile.in.orig
+++ lang/qt/Makefile.in
-@@ -410,7 +410,7 @@ top_builddir = @top_builddir@
+@@ -412,7 +412,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@RUN_GPG_TESTS_FALSE@tests =
@RUN_GPG_TESTS_TRUE@tests = tests
diff --git a/security/gpgme/patches/patch-lang_qt_tests_Makefile_in
b/security/gpgme/patches/patch-lang_qt_tests_Makefile_in
index 78c98ac427d..b15e6d65aaa 100644
--- a/security/gpgme/patches/patch-lang_qt_tests_Makefile_in
+++ b/security/gpgme/patches/patch-lang_qt_tests_Makefile_in
@@ -1,7 +1,7 @@
Index: lang/qt/tests/Makefile.in
--- lang/qt/tests/Makefile.in.orig
+++ lang/qt/tests/Makefile.in
-@@ -601,7 +601,7 @@ moc_files = \
+@@ -628,7 +628,7 @@ moc_files = \
AM_LDFLAGS = -no-install
LDADD = ../../cpp/src/libgpgmepp.la ../src/libqgpgme.la \
../../../src/libgpgme.la @GPGME_QT_LIBS@ @GPG_ERROR_LIBS@ \
diff --git a/security/gpgme/pkg/PLIST-qt b/security/gpgme/pkg/PLIST-qt
index 25dcdf800a1..dbcb07ef0bc 100644
--- a/security/gpgme/pkg/PLIST-qt
+++ b/security/gpgme/pkg/PLIST-qt
@@ -31,6 +31,8 @@ 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
@@ -61,6 +63,7 @@ include/gpgme++/gpggencardkeyinteractor.h
include/gpgme++/gpgmefw.h
include/gpgme++/gpgmepp_export.h
include/gpgme++/gpgmepp_version.h
+include/gpgme++/gpgrevokekeyeditinteractor.h
include/gpgme++/gpgsetexpirytimeeditinteractor.h
include/gpgme++/gpgsetownertrusteditinteractor.h
include/gpgme++/gpgsignkeyeditinteractor.h
@@ -119,6 +122,8 @@ 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
@@ -129,7 +134,6 @@ include/qgpgme/verifyopaquejob.h
include/qgpgme/wkdlookupjob.h
include/qgpgme/wkdlookupresult.h
include/qgpgme/wkspublishjob.h
-lib/cmake/
lib/cmake/Gpgmepp/
lib/cmake/Gpgmepp/GpgmeppConfig.cmake
lib/cmake/Gpgmepp/GpgmeppConfigVersion.cmake
