gpgme: Update to 1.24.0

mingw-w64-gpgme/0001-fix-find-moc-qt6.patch

@@ -1,12 +1,12 @@
---- a/m4/qt6.m4
-+++ b/m4/qt6.m4
+--- gpgme-1.24.0/m4/qt6.m4.orig	2024-11-11 07:41:24.266752500 +0100
++++ gpgme-1.24.0/m4/qt6.m4	2024-11-11 07:47:38.877394600 +0100
 @@ -25,7 +25,8 @@
 
    if test "$have_qt6_libs" = "yes"; then
      # Qt6 moved moc to libexec
 -    qt6libexecdir=$($PKG_CONFIG --variable=libexecdir 'Qt6Core >= 6.4.0')
 +    _qt6libexecdir=$($PKG_CONFIG --variable=libexecdir 'Qt6Core >= 6.4.0')
 +    qt6libexecdir=$(cygpath -a $_qt6libexecdir)
-     AC_PATH_TOOL(MOC, moc, [], [$qt6libexecdir])
-     if test -z "$MOC"; then
+     AC_PATH_TOOL(MOC6, moc, [], [$qt6libexecdir])
+     if test -z "$MOC6"; then
        AC_MSG_WARN([moc not found - Qt 6 binding will not be built.])

mingw-w64-gpgme/0008-no-py2.patch

@@ -1,11 +1,11 @@
---- gpgme-1.14.0/configure.ac.orig	2020-09-05 15:02:43.720753300 +0200
-+++ gpgme-1.14.0/configure.ac	2020-09-05 15:03:38.558261200 +0200
-@@ -578,7 +578,7 @@
+--- gpgme-1.24.0/configure.ac.orig	2024-11-11 07:40:12.665109100 +0100
++++ gpgme-1.24.0/configure.ac	2024-11-11 07:40:31.367107300 +0100
+@@ -614,7 +614,7 @@
  	if test "$found_py" = "1" -o "$found_py3" = "1"; then
  	  # Reset everything, so that we can look for another Python.
            m4_foreach([mym4pythonver],
--                     [[2.7],[3.4],[3.5],[3.6],[3.7],[3.8],[3.9],[3.10],
-+                     [[3.4],[3.5],[3.6],[3.7],[3.8],[3.9],[3.10],
-                       [3.11],[3.12],[all]],
+-                     [[2.7],[3.6],[3.8],[3.9],[3.10],[3.11],[3.12],[all]],
++                     [[3.6],[3.8],[3.9],[3.10],[3.11],[3.12],[all]],
             [unset PYTHON
  	    unset PYTHON_VERSION
+ 	    unset PYTHON_CPPFLAGS

mingw-w64-gpgme/0009-fix-broken-version.patch

@@ -1,13 +1,14 @@
 --- a/autogen.sh
 +++ b/autogen.sh
-@@ -268,8 +268,8 @@
+@@ -268,9 +268,9 @@
        rvd=$((0x$(echo ${rev} | dd bs=1 count=4 2>/dev/null)))
      else
        ingit=no
 -      beta=yes
 -      tmp="-unknown"
 +      beta=no
 +      tmp=""
+       cid="0000000"
        rev="0000000"
        rvd="0"
      fi

mingw-w64-gpgme/0011-dont-include-absolute-unix-paths.patch

@@ -0,0 +1,12 @@
+--- gpgme-1.24.0/lang/cpp/src/Makefile.am.orig	2024-11-11 07:48:27.905978800 +0100
++++ gpgme-1.24.0/lang/cpp/src/Makefile.am	2024-11-11 08:04:53.007311700 +0100
+@@ -96,7 +96,7 @@
+
+ $(copied_headers): Makefile.am
+ 	mkdir -p $(builddir)/gpgme++/interfaces
+-	echo -n "#include \"$(abs_srcdir)" > "$@"
++	echo -n "#include \"$(shell cygpath -m "$(abs_srcdir)")" > "$@"
+ 	echo -n "$@" | sed "s/gpgme++//" >> "$@"
+ 	echo "\"" >> "$@"
+
+

mingw-w64-gpgme/PKGBUILD

@@ -9,8 +9,8 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
            "${MINGW_PACKAGE_PREFIX}-qgpgme-qt5" \
            "${MINGW_PACKAGE_PREFIX}-qgpgme-qt6" \
            "${MINGW_PACKAGE_PREFIX}-python-gpgme"))
-pkgver=1.23.2
-pkgrel=8
+pkgver=1.24.0
+pkgrel=1
 pkgdesc="A C wrapper library for GnuPG (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -40,34 +40,30 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "doxygen")
 source=("https://www.gnupg.org/ftp/gcrypt/${_realname}/${_realname}-${pkgver}.tar.bz2"{,.sig}
         0001-fix-find-moc-qt6.patch
-        0002-Build-Python-bindings-without-distutils.patch::"https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=patch;h=5844d9e7"
-        0003-Fix-build-with-setuptools-72.2.0.patch::"https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=patch;h=ecd0c86d"
         0004-gpgme-find-gnupg.patch
         0005-invoke-scripts-via-sh.patch
         0007-mkdefsinc-use-CPPFLAGS.patch
         0008-no-py2.patch
         0009-fix-broken-version.patch
-        0010-m4-check-python-exit-code.patch
+        0011-dont-include-absolute-unix-paths.patch
         relocatable-cmake.patch
         gpgmepp-portable-types.patch)
 #These might be signed by any of these keys https://gnupg.org/signature_key.html
 validpgpkeys=('5B80C5754298F0CB55D8ED6ABCEF7E294B092E28'
               '6DAA6E64A76D2840571B4902528897B826403ADA'
               'AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD'
               '02F38DFF731FF97CB039A1DA549E695E905BA208')
-sha256sums=('9499e8b1f33cccb6815527a1bc16049d35a6198a6c5fae0185f2bd561bce5224'
+sha256sums=('61e3a6ad89323fecfaff176bc1728fb8c3312f2faa83424d9d5077ba20f5f7da'
             'SKIP'
-            'c5079439302d931371118117ad9a2478163c7a84bb1400a89f2437459eb70f5c'
-            '21cb8ff3f141427d5c55d388cb88c6f5774f592370719d3b632c4a8a70ff179b'
-            '69202c576f5f9980bc88bf9e963fd6199093c89ab8dc3be02ab6c460d65fe1b4'
+            'c40148017c651238956aa8322d4dc23eb7e84a8a3400ddfaaf2c5e0bf24b0855'
             '0ff731656094213854877cfe8f88f4ea562a2191c708a26f567b8ecb4873d5df'
             '75f77086c96fb4bcb9edad01bf64bbf11a7ec435f751b901f3fb180b410fa236'
             'f022993b4ae8f69f8248a6e22a0b6f0d0f43a074cdbcdbe2efb479e48064f988'
-            '0b0d511f9d47844d3fd806864310d9abbeb1285d43f6ffa33babf55a4a410458'
-            'ace3d5166372e0422a625f76a2890d70f2916d9239ade74e58bd23077e9c1c6b'
-            '5e8e7e773a09ed1e1724c9d7216eaaecce52af49152513366026a2fa3245d762'
+            '662691274a9f4de2a4ab10d6c6e13430e98d75ebcd84cf8b4c0598a7dfe950e5'
+            '1287460dbb4bb3d151634dafbd1f954cb50ad66de22c5f89b9723444c828ecba'
+            '0d4ab1a46334eb43307b16159341620c73f21ab7e43cd9957a3890cd4548b753'
             '81f412ffdeeb2a0757248b517fbda9caae9913b1552c88abb8347faa4d1efea2'
-            'a110b40d146a7c561140b68831027f61d2132e1069d2476b2e0a4034bc54fae1')
+            '0b1cad5a41977f6c8de17d06ddf3e92f869d5a447a456067fc47718664f260a4')
 
 _apply_patch_with_msg() {
   for _patch in "$@"
@@ -82,21 +78,20 @@ prepare() {
 
   _apply_patch_with_msg \
     0001-fix-find-moc-qt6.patch \
-    0002-Build-Python-bindings-without-distutils.patch \
-    0003-Fix-build-with-setuptools-72.2.0.patch \
     0004-gpgme-find-gnupg.patch \
     0005-invoke-scripts-via-sh.patch \
     0007-mkdefsinc-use-CPPFLAGS.patch \
     0008-no-py2.patch \
     0009-fix-broken-version.patch \
-    0010-m4-check-python-exit-code.patch \
+    0011-dont-include-absolute-unix-paths.patch \
     relocatable-cmake.patch \
     gpgmepp-portable-types.patch
 
   autoreconf -ivf
 }
 
 build() {
+  mkdir -p "${srcdir}"/build-${MSYSTEM}
   cp -r "${srcdir}"/${_realname}-${pkgver} "${srcdir}"/build-${MSYSTEM}
   cd "${srcdir}"/build-${MSYSTEM}
 
@@ -117,7 +112,7 @@ build() {
   # see cmake files for the expected DLL names
   DOXYGEN=/usr/bin/doxygen \
   PYTHON=${MINGW_PREFIX}/bin/python3 \
-  ./configure \
+  "${srcdir}"/${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --libexecdir=${MINGW_PREFIX}/bin \
     --disable-fd-passing \

mingw-w64-gpgme/gpgmepp-portable-types.patch

@@ -12,20 +12,18 @@ index 1813cc57..1d9ceb4b 100644
  AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config)
  AC_CONFIG_FILES(lang/cpp/Makefile lang/cpp/src/Makefile)
  AC_CONFIG_FILES(lang/cpp/tests/Makefile)
-diff --git a/lang/cpp/src/Makefile.am b/lang/cpp/src/Makefile.am
-index 1e6bdc28..ccfb16b0 100644
---- a/lang/cpp/src/Makefile.am
-+++ b/lang/cpp/src/Makefile.am
-@@ -20,7 +20,7 @@
- # 02111-1307, USA
+--- gpgme-1.24.0/lang/cpp/src/Makefile.am.orig	2024-09-09 16:58:10.000000000 +0200
++++ gpgme-1.24.0/lang/cpp/src/Makefile.am	2024-11-11 07:36:50.071848100 +0100
+@@ -23,7 +23,7 @@
+ pkgconfig_DATA = gpgmepp.pc
 
  EXTRA_DIST = GpgmeppConfig.cmake.in.in GpgmeppConfigVersion.cmake.in \
--             gpgmepp_version.h.in GpgmeppConfig-w32.cmake.in.in
-+             gpgmepp_version.h.in data.h.in GpgmeppConfig-w32.cmake.in.in
+-             gpgmepp_version.h.in GpgmeppConfig-w32.cmake.in.in \
++             gpgmepp_version.h.in data.h.in GpgmeppConfig-w32.cmake.in.in \
+              gpgmepp.pc.in
 
  lib_LTLIBRARIES = libgpgmepp.la
-
-@@ -42,7 +42,7 @@ main_sources = \
+@@ -46,7 +46,7 @@
      util.cpp
 
  gpgmepp_headers = \
@@ -34,7 +32,7 @@ index 1e6bdc28..ccfb16b0 100644
      defaultassuantransaction.h editinteractor.h encryptionresult.h \
      engineinfo.h error.h eventloopinteractor.h exception.h global.h \
      gpgadduserideditinteractor.h gpgagentgetinfoassuantransaction.h \
-@@ -68,7 +68,7 @@ interface_headers= \
+@@ -72,7 +72,7 @@
  gpgmeppincludedir = $(includedir)/gpgme++
  gpgmeppinclude_HEADERS = $(gpgmepp_headers)
  nobase_gpgmeppinclude_HEADERS = $(interface_headers)
@@ -43,12 +41,13 @@ index 1e6bdc28..ccfb16b0 100644
 
  libgpgmepp_la_SOURCES = $(main_sources) $(gpgmepp_headers) context_vanilla.cpp \
                          $(interface_headers) $(private_gpgmepp_headers)
-@@ -116,4 +116,4 @@ install-data-local: install-cmake-files
- uninstall-local: uninstall-cmake-files
+@@ -130,5 +130,5 @@
+ BUILT_SOURCES = $(copied_headers)
 
  CLEANFILES = GpgmeppConfig.cmake GpgmeppConfigVersion.cmake \
--             gpgmepp_version.h GpgmeppConfig.cmake.in
-+             gpgmepp_version.h data.h GpgmeppConfig.cmake.in
+-             gpgmepp_version.h GpgmeppConfig.cmake.in \
++             gpgmepp_version.h data.h GpgmeppConfig.cmake.in \
+              $(copied_headers)
 diff --git a/lang/cpp/src/data.cpp b/lang/cpp/src/data.cpp
 index 2782aa79..1da0df52 100644
 --- a/lang/cpp/src/data.cpp