Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gpgme: Update to 1.24.0 #4997

Merged
merged 1 commit into from
Nov 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions gpgme/0001-fix-broken-version.patch
Original file line number Diff line number Diff line change
@@ -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
25 changes: 0 additions & 25 deletions gpgme/0002-gpgme-engine-cache-version.patch

This file was deleted.

16 changes: 5 additions & 11 deletions gpgme/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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/"
Expand All @@ -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'
Expand All @@ -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
}

Expand Down