Merge pull request #3561 from lazka/gpgme-py311

gpgme: support Python 3.11
This commit is contained in:
Christoph Reiter 2023-02-14 21:07:19 +01:00 committed by GitHub
commit 4dc695fcf3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 3 deletions

View File

@ -3,7 +3,7 @@
pkgbase=gpgme
pkgname=('libgpgme' 'libgpgme-devel' 'libgpgme-python')
pkgver=1.18.0
pkgrel=3
pkgrel=4
pkgdesc="A C wrapper library for GnuPG"
arch=('i686' 'x86_64')
url="https://gnupg.org/related_software/gpgme/"
@ -13,11 +13,13 @@ makedepends=('libassuan-devel' 'libgpg-error-devel' 'python-devel' 'swig' 'autot
options=('!libtool' '!emptydirs')
source=(https://gnupg.org/ftp/gcrypt/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2{,.sig}
'D545.diff::https://dev.gnupg.org/D545?download=true'
'D546.diff::https://dev.gnupg.org/D546?download=true')
'D546.diff::https://dev.gnupg.org/D546?download=true'
py311.patch)
sha256sums=('361d4eae47ce925dba0ea569af40e7b52c645c4ae2e65e5621bf1b6cdd8b0e9e'
'SKIP'
'e2aa6413a8dbe048d95dd190d9bcdd091e70f31052711dd2ad35b6a0a44a5f74'
'1315ffae572459bda3c6dac90019ac2221b263f7aecbbb700b4de3966c036c98')
'1315ffae572459bda3c6dac90019ac2221b263f7aecbbb700b4de3966c036c98'
'5de7eff30910e27bd98fadfea5ebbfac23322a260d5fe31b7cb6ca174646b2e2')
#These might be signed by any of these keys https://gnupg.org/signature_key.html
validpgpkeys=('5B80C5754298F0CB55D8ED6ABCEF7E294B092E28'
'6DAA6E64A76D2840571B4902528897B826403ADA'
@ -31,6 +33,8 @@ prepare() {
# https://dev.gnupg.org/D546
patch -p1 -i "${srcdir}/D546.diff"
patch -p1 -i "${srcdir}/py311.patch"
autoreconf -ivf
}

22
gpgme/py311.patch Normal file
View File

@ -0,0 +1,22 @@
--- 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