gpgme: update to 1.10.0.

srcpkgs/gpgme/patches/cmake-crossbuild-support.patch

@@ -1,11 +1,8 @@
-Cross-building needs that include and library paths to be computed 
-at this package's build time and not at runtime usage of this cmake support.
-
-Code inspired from cmake files of KDE Framework 5 various subparts.
-
---- lang/cpp/src/GpgmeppConfig.cmake.in.in.ORIG
+diff --git lang/cpp/src/GpgmeppConfig.cmake.in.in lang/cpp/src/GpgmeppConfig.cmake.in.in
+index 73f5eaad..019de555 100644
+--- lang/cpp/src/GpgmeppConfig.cmake.in.in
 +++ lang/cpp/src/GpgmeppConfig.cmake.in.in
-@@ -58,19 +58,41 @@
+@@ -58,19 +58,41 @@ unset(_targetsDefined)
  unset(_targetsNotDefined)
  unset(_expectedTargets)
  
@@ -33,7 +30,7 @@ Code inspired from cmake files of KDE Framework 5 various subparts.
  
  set_target_properties(Gpgmepp PROPERTIES
 -  INTERFACE_INCLUDE_DIRECTORIES "@resolved_includedir@/gpgme++;@resolved_includedir@"
--  INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme.so;@LIBASSUAN_LIBS@"
+-  INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme@libsuffix@;@LIBASSUAN_LIBS@"
 -  IMPORTED_LOCATION "@resolved_libdir@/libgpgmepp@libsuffix@"
 +  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include/gpgme++"
 +  INTERFACE_LINK_LIBRARIES "pthread;${_IMPORT_PREFIX}/lib/libgpgme@libsuffix@;@LIBASSUAN_LIBS@"
@@ -50,9 +47,11 @@ Code inspired from cmake files of KDE Framework 5 various subparts.
  # Loop over all imported files and verify that they actually exist
  foreach(target ${_IMPORT_CHECK_TARGETS} )
    foreach(file ${_IMPORT_CHECK_FILES_FOR_${target}} )
---- lang/qt/src/QGpgmeConfig.cmake.in.in.ORIG
+diff --git lang/qt/src/QGpgmeConfig.cmake.in.in lang/qt/src/QGpgmeConfig.cmake.in.in
+index a17a19fd..29a6b87a 100644
+--- lang/qt/src/QGpgmeConfig.cmake.in.in
 +++ lang/qt/src/QGpgmeConfig.cmake.in.in
-@@ -58,19 +58,41 @@
+@@ -58,19 +58,41 @@ unset(_targetsDefined)
  unset(_targetsNotDefined)
  unset(_expectedTargets)
  
@@ -83,7 +82,7 @@ Code inspired from cmake files of KDE Framework 5 various subparts.
 +  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include/qgpgme"
    INTERFACE_LINK_LIBRARIES "Gpgmepp;Qt5::Core"
 -  IMPORTED_LOCATION "@resolved_libdir@/libqgpgme@libsuffix@"
-+  IMPORTED_LOCATION "${_IMPORT_PREFIX}/libqgpgme@libsuffix@"
++  IMPORTED_LOCATION "${_IMPORT_PREFIX}/lib/libqgpgme@libsuffix@"
  )
  
  if(CMAKE_VERSION VERSION_LESS 2.8.12)

srcpkgs/gpgme/template

@@ -1,21 +1,21 @@
 # Template file for 'gpgme'
 pkgname=gpgme
-version=1.9.0
-revision=2
+version=1.10.0
+revision=1
 build_style=gnu-configure
 configure_args="--enable-fd-passing --disable-gpgconf-test
  --disable-gpg-test --disable-gpgsm-test
  --with-libgpg-error-prefix=$XBPS_CROSS_BASE/usr
  --with-libassuan-prefix=$XBPS_CROSS_BASE/usr"
-hostmakedepends="qt5-qmake pkg-config qt5-host-tools"
+hostmakedepends="qt5-qmake pkg-config qt5-host-tools gnupg2"
 makedepends="libgpg-error-devel libassuan-devel qt5-tools-devel"
 depends="gnupg2"
 short_desc="GnuPG Made Easy"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
-license="GPL-2"
+license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://www.gnupg.org/related_software/gpgme/"
 distfiles="ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-$version.tar.bz2"
-checksum=1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb
+checksum=1a8fed1197c3b99c35f403066bb344a26224d292afc048cfdfc4ccd5690a0693
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) configure_args+=" ac_cv_sys_file_offset_bits=no";;
@@ -26,6 +26,11 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 CXXFLAGS+=" -D_GLIBCXX_USE_C99_STDIO=1"
 
+post_extract() {
+	sed -i 's|GPG = gpg|GPG = gpg2|g' tests/gpg/Makefile.* \
+		lang/qt/tests/Makefile.* lang/python/tests/Makefile.*
+}
+
 gpgme-devel_package() {
 	depends="${makedepends/qt5-tools-devel/} gpgme>=${version}_${revision}"
 	short_desc+=" - development files"