gpgme: Update to 1.24.0
* 0001-fix-broken-version.patch: refresh * 0002-gpgme-engine-cache-version.patch: included in the new release
This commit is contained in:
parent
9fc3bd8683
commit
c9822ba25d
@ -1,11 +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 @@
|
||||
--- gpgme-1.24.0/autogen.sh.orig 2024-11-10 18:30:32.006547200 +0100
|
||||
+++ gpgme-1.24.0/autogen.sh 2024-11-10 18:31:09.378811700 +0100
|
||||
@@ -271,7 +271,7 @@
|
||||
else
|
||||
ingit=no
|
||||
beta=yes
|
||||
- tmp="-unknown"
|
||||
+ tmp=""
|
||||
cid="0000000"
|
||||
rev="0000000"
|
||||
rvd="0"
|
||||
fi
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
diff --git a/src/engine.c b/src/engine.c
|
||||
index 69f1c150..252d8805 100644
|
||||
--- a/src/engine.c
|
||||
+++ b/src/engine.c
|
||||
@@ -449,9 +449,16 @@ _gpgme_set_engine_info (gpgme_engine_info_t info, gpgme_protocol_t proto,
|
||||
new_home_dir = NULL;
|
||||
}
|
||||
|
||||
- new_version = engine_get_version (proto, new_file_name);
|
||||
+ if (info && info->version
|
||||
+ && ((!info->file_name && !new_file_name)
|
||||
+ || (info->file_name && new_file_name
|
||||
+ && !strcmp (info->file_name, new_file_name))))
|
||||
+ new_version = strdup (info->version);
|
||||
+ else
|
||||
+ new_version = engine_get_version (proto, new_file_name);
|
||||
if (!new_version)
|
||||
{
|
||||
+ /* Note that we also get here on a ENOMEM in strdup. */
|
||||
new_version = strdup ("1.0.0"); /* Fake one for dummy entries. */
|
||||
if (!new_version)
|
||||
{
|
||||
--
|
||||
2.30.2
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
pkgbase=gpgme
|
||||
pkgname=('libgpgme' 'libgpgme-devel' 'libgpgme-python')
|
||||
pkgver=1.23.2
|
||||
pkgrel=5
|
||||
pkgver=1.24.0
|
||||
pkgrel=1
|
||||
pkgdesc="A C wrapper library for GnuPG"
|
||||
arch=('i686' 'x86_64')
|
||||
url="https://gnupg.org/related_software/gpgme/"
|
||||
@ -25,12 +25,10 @@ makedepends=(
|
||||
'python-installer'
|
||||
)
|
||||
source=(https://gnupg.org/ftp/gcrypt/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2{,.sig}
|
||||
0001-fix-broken-version.patch
|
||||
0002-gpgme-engine-cache-version.patch)
|
||||
sha256sums=('9499e8b1f33cccb6815527a1bc16049d35a6198a6c5fae0185f2bd561bce5224'
|
||||
0001-fix-broken-version.patch)
|
||||
sha256sums=('61e3a6ad89323fecfaff176bc1728fb8c3312f2faa83424d9d5077ba20f5f7da'
|
||||
'SKIP'
|
||||
'80771f9811ad809c8ff8977b05cfcc0d2d4a1c764c3df6ae5aa91c5aa7565a9a'
|
||||
'241206490b1f6dbb044c167525f8d1d85fc816be5f17a4b991664c7863a887bb')
|
||||
'ff9eec1d2c1803a3f1f77cb8073c7a328859e5b26e8b0327581357110038d4cd')
|
||||
#These might be signed by any of these keys https://gnupg.org/signature_key.html
|
||||
validpgpkeys=('5B80C5754298F0CB55D8ED6ABCEF7E294B092E28'
|
||||
'6DAA6E64A76D2840571B4902528897B826403ADA'
|
||||
@ -42,10 +40,6 @@ prepare() {
|
||||
# otherwise it appends "unknown" to the version which isn't a valid python version
|
||||
patch -p1 -i "${srcdir}/0001-fix-broken-version.patch"
|
||||
|
||||
# https://github.com/msys2/msys2-pacman/issues/26
|
||||
# https://dev.gnupg.org/T6369
|
||||
patch -p1 -i "${srcdir}/0002-gpgme-engine-cache-version.patch"
|
||||
|
||||
autoreconf -ivf
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user