gpgme: Update to 1.19.0

gpgme/0001-fix-broken-version.patch

@@ -0,0 +1,11 @@
+--- gpgme-1.19.0/autogen.sh.orig	2023-03-20 10:19:55.775613900 +0100
++++ gpgme-1.19.0/autogen.sh	2023-03-20 10:20:03.505944100 +0100
+@@ -269,7 +269,7 @@
+     else
+       ingit=no
+       beta=yes
+-      tmp="-unknown"
++      tmp=""
+       rev="0000000"
+       rvd="0"
+     fi

gpgme/PKGBUILD

@@ -2,24 +2,30 @@
 
 pkgbase=gpgme
 pkgname=('libgpgme' 'libgpgme-devel' 'libgpgme-python')
-pkgver=1.18.0
+pkgver=1.19.0
-pkgrel=4
+pkgrel=1
 pkgdesc="A C wrapper library for GnuPG"
 arch=('i686' 'x86_64')
 url="https://gnupg.org/related_software/gpgme/"
 license=('LGPL')
 depends=('libassuan' 'libgpg-error' 'gnupg')
-makedepends=('libassuan-devel' 'libgpg-error-devel' 'python-devel' 'swig' 'autotools' 'gcc')
+makedepends=(
-options=('!libtool' '!emptydirs')
+  'libassuan-devel'
+  'libgpg-error-devel'
+  'python-devel'
+  'python-setuptools'
+  'swig'
+  'autotools'
+  'gcc'
+  'python-build'
+  'python-installer'
+  'python-wheel'
+)
 source=(https://gnupg.org/ftp/gcrypt/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2{,.sig}
-        'D545.diff::https://dev.gnupg.org/D545?download=true'
+        0001-fix-broken-version.patch)
-        'D546.diff::https://dev.gnupg.org/D546?download=true'
+sha256sums=('cb58494dc415fba9eeb12b826550ad3190dc92e265c5bb2ae1a21c92841cfd38'
-        py311.patch)
-sha256sums=('361d4eae47ce925dba0ea569af40e7b52c645c4ae2e65e5621bf1b6cdd8b0e9e'
             'SKIP'
-            'e2aa6413a8dbe048d95dd190d9bcdd091e70f31052711dd2ad35b6a0a44a5f74'
+            '80771f9811ad809c8ff8977b05cfcc0d2d4a1c764c3df6ae5aa91c5aa7565a9a')
-            '1315ffae572459bda3c6dac90019ac2221b263f7aecbbb700b4de3966c036c98'
-            '5de7eff30910e27bd98fadfea5ebbfac23322a260d5fe31b7cb6ca174646b2e2')
 #These might be signed by any of these keys https://gnupg.org/signature_key.html
 validpgpkeys=('5B80C5754298F0CB55D8ED6ABCEF7E294B092E28'
               '6DAA6E64A76D2840571B4902528897B826403ADA'
@@ -28,12 +34,8 @@ validpgpkeys=('5B80C5754298F0CB55D8ED6ABCEF7E294B092E28'
 prepare() {
   cd ${srcdir}/${pkgbase}-${pkgver}
 
-  # https://dev.gnupg.org/D545
+  # otherwise it appends "unknown" to the version which isn't a valid python version
-  patch -p1 -i "${srcdir}/D545.diff"
+  patch -p1 -i "${srcdir}/0001-fix-broken-version.patch"
-  # https://dev.gnupg.org/D546
-  patch -p1 -i "${srcdir}/D546.diff"
-
-  patch -p1 -i "${srcdir}/py311.patch"
 
   autoreconf -ivf
 }
@@ -52,9 +54,18 @@ build() {
     --disable-g13-test \
     --enable-shared \
     --enable-static \
+    --enable-languages="cpp python cl" \
     --enable-fixed-path="/usr/bin:/bin:/usr/sbin:/usr/local/bin"
 
   make no_undefined=-no-undefined
+
+  (
+    # use a PEP517 workflow to get a reproducible Python package
+    cd lang/python/
+    top_builddir="${srcdir}/${pkgbase}-${pkgver}" \
+      python -m build --wheel --no-isolation
+  )
+
   make DESTDIR=${srcdir}/dest install
 }
 
@@ -77,7 +88,6 @@ package_libgpgme-devel() {
   pkgdesc="libgpgme headers and libraries"
   groups=('development')
   depends=("libgpgme=${pkgver}" 'libassuan-devel' 'libgpg-error-devel')
-  options=('staticlibs')
 
   mkdir -p ${pkgdir}/usr/{bin,lib,share}
   cp -f ${srcdir}/dest/usr/bin/*-config ${pkgdir}/usr/bin/
@@ -96,9 +106,8 @@ package_libgpgme-python() {
   provides=("libgpgme-python3")
   conflicts=("libgpgme-python3")
   replaces=("libgpgme-python3")
-  options=('staticlibs')
 
-  local _pyver=$(/usr/bin/python -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))")
+  cd ${srcdir}/${pkgbase}-${pkgver}
-  mkdir -p ${pkgdir}/usr/lib
+
-  cp -rf ${srcdir}/dest/usr/lib/python${_pyver} ${pkgdir}/usr/lib
+  python -m installer --destdir="$pkgdir" lang/python/dist/*.whl
 }

gpgme/py311.patch

@@ -1,22 +0,0 @@
---- gpgme-1.18.0/m4/python.m4.orig	2023-02-14 20:38:30.523605800 +0100
-+++ gpgme-1.18.0/m4/python.m4	2023-02-14 20:38:34.193959700 +0100
-@@ -41,7 +41,7 @@
-   m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
- [python2 python2.7 dnl
-  python dnl
-- python3 python3.10 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4
-+ python3 python3.11 python3.10 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4
-  ])
- 
-   AC_ARG_VAR([PYTHON], [the Python interpreter])
---- gpgme-1.18.0/configure.ac.orig	2023-02-14 20:39:33.898571900 +0100
-+++ gpgme-1.18.0/configure.ac	2023-02-14 20:32:32.901864400 +0100
-@@ -443,7 +443,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],[all]],
-+                     [[2.7],[3.4],[3.5],[3.6],[3.7],[3.8],[3.9],[3.10],[3.11],[all]],
-            [unset PYTHON
- 	    unset PYTHON_VERSION
- 	    unset PYTHON_CPPFLAGS