upg archlinux-keyring gpgme
This commit is contained in:
parent
55d535af82
commit
ff55d561cb
|
|
@ -6,8 +6,8 @@
|
|||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=archlinux-keyring
|
||||
_tag='40df671d4ba5a23a03624ecb1d5c4a6629b2dc54' # git rev-parse ${pkgver}
|
||||
pkgver=20230704
|
||||
_tag='03dbd253983863950583c94096b0753ab9d740ce' # git rev-parse ${pkgver}
|
||||
pkgver=20230821
|
||||
pkgrel=01
|
||||
pkgdesc='Arch Linux PGP keyring'
|
||||
url='https://gitlab.archlinux.org/archlinux/archlinux-keyring/'
|
||||
|
|
@ -55,5 +55,4 @@ validpgpkeys=('02FD1C7A934E614545849F19A6234074498E9CEE' # Christian Hesse <ewo
|
|||
|
||||
sha256sums=(SKIP)
|
||||
|
||||
## d0e2f538f57e315598a03d52ccf6809591d150bbdda795d40ae085e529c526c2 archlinux-keyring-20230704-01-x86_64.pkg.tar.lz
|
||||
|
||||
## 3863890090c61ad5f7e363566e5cb2a411d9f939dfc460e2f67ff4eb0778e8a9 archlinux-keyring-20230821-01-x86_64.pkg.tar.lz
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
|
||||
|
||||
pkgname=archlinux-keyring
|
||||
_tag='40df671d4ba5a23a03624ecb1d5c4a6629b2dc54' # git rev-parse ${pkgver}
|
||||
pkgver=20230704
|
||||
_tag='03dbd253983863950583c94096b0753ab9d740ce' # git rev-parse ${pkgver}
|
||||
pkgver=20230821
|
||||
pkgrel=1
|
||||
pkgdesc='Arch Linux PGP keyring'
|
||||
arch=('any')
|
||||
|
|
|
|||
|
|
@ -0,0 +1,37 @@
|
|||
From d23528cadf4284f508bc4ba05e1b5c14b46bd354 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
|
||||
Date: Mon, 21 Aug 2023 21:08:01 +0200
|
||||
Subject: qt,tests: Fix build in source directory
|
||||
|
||||
* lang/qt/tests/Makefile.am (AM_CPPFLAGS): Include Qt binding sources
|
||||
before C++ binding sources and C sources.
|
||||
--
|
||||
|
||||
This fixes the problem that the debug.h in the C sources was found
|
||||
before the one in the Qt bindings.
|
||||
|
||||
GnuPG-bug-id: 6673
|
||||
---
|
||||
lang/qt/tests/Makefile.am | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/lang/qt/tests/Makefile.am b/lang/qt/tests/Makefile.am
|
||||
index 32ad6466..aedd3264 100644
|
||||
--- a/lang/qt/tests/Makefile.am
|
||||
+++ b/lang/qt/tests/Makefile.am
|
||||
@@ -51,10 +51,10 @@ LDADD = ../../cpp/src/libgpgmepp.la ../src/libqgpgme.la \
|
||||
../../../src/libgpgme.la @GPGME_QT5_LIBS@ @GPG_ERROR_LIBS@ \
|
||||
@GPGME_QT5TEST_LIBS@ @LDADD_FOR_TESTS_KLUDGE@ -lstdc++
|
||||
|
||||
-AM_CPPFLAGS = -I$(top_srcdir)/lang/cpp/src -I$(top_builddir)/src \
|
||||
+AM_CPPFLAGS = -I$(top_srcdir)/lang/qt/src -I$(top_srcdir)/lang/cpp/src \
|
||||
+ -I$(top_builddir)/src \
|
||||
@GPG_ERROR_CFLAGS@ @GPGME_QT5_CFLAGS@ @GPG_ERROR_CFLAGS@ \
|
||||
@LIBASSUAN_CFLAGS@ @GPGME_QT5TEST_CFLAGS@ -DBUILDING_QGPGME \
|
||||
- -I$(top_srcdir)/lang/qt/src \
|
||||
-DTOP_SRCDIR="$(top_srcdir)"
|
||||
endif
|
||||
if WANT_QT6
|
||||
--
|
||||
2.42.0
|
||||
|
||||
|
|
@ -0,0 +1,37 @@
|
|||
From 2d570b3f80b306ccdbc49b4a8e71c4945486fd1c Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hesse <mail@eworm.de>
|
||||
Date: Mon, 21 Aug 2023 23:53:47 +0200
|
||||
Subject: [PATCH 1/1] qt,tests: Fix build in source directory, part 2
|
||||
|
||||
* lang/qt/tests/Makefile.am (AM_CPPFLAGS): Include Qt binding sources
|
||||
before C++ binding sources and C sources.
|
||||
|
||||
This fixes the problem that the debug.h in the C sources was found
|
||||
before the one in the Qt bindings.
|
||||
|
||||
Commit d23528cadf4284f508bc4ba05e1b5c14b46bd354 fixed it for Qt5, we
|
||||
need Qt6 as well.
|
||||
---
|
||||
lang/qt/tests/Makefile.am | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/lang/qt/tests/Makefile.am b/lang/qt/tests/Makefile.am
|
||||
index aedd3264..615daf6d 100644
|
||||
--- a/lang/qt/tests/Makefile.am
|
||||
+++ b/lang/qt/tests/Makefile.am
|
||||
@@ -62,10 +62,10 @@ LDADD = ../../cpp/src/libgpgmepp.la ../src/libqgpgmeqt6.la \
|
||||
../../../src/libgpgme.la @GPGME_QT6_LIBS@ @GPG_ERROR_LIBS@ \
|
||||
@GPGME_QT6TEST_LIBS@ @LDADD_FOR_TESTS_KLUDGE@ -lstdc++
|
||||
|
||||
-AM_CPPFLAGS = -I$(top_srcdir)/lang/cpp/src -I$(top_builddir)/src \
|
||||
+AM_CPPFLAGS = -I$(top_srcdir)/lang/qt/src -I$(top_srcdir)/lang/cpp/src \
|
||||
+ -I$(top_builddir)/src \
|
||||
@GPG_ERROR_CFLAGS@ @GPGME_QT6_CFLAGS@ @GPG_ERROR_CFLAGS@ \
|
||||
@LIBASSUAN_CFLAGS@ @GPGME_QT6TEST_CFLAGS@ -DBUILDING_QGPGME \
|
||||
- -I$(top_srcdir)/lang/qt/src \
|
||||
-DTOP_SRCDIR="$(top_srcdir)"
|
||||
endif
|
||||
|
||||
--
|
||||
2.42.0
|
||||
|
||||
|
|
@ -8,22 +8,29 @@
|
|||
pkgbase=gpgme
|
||||
#pkgname=(gpgme qgpgme-qt5 qgpgme-qt6 python-gpgme)
|
||||
pkgname=(gpgme python-gpgme) # qgpgme)
|
||||
pkgver=1.21.0
|
||||
pkgver=1.22.0
|
||||
pkgrel=01
|
||||
pkgdesc="A C wrapper library for GnuPG"
|
||||
#options=('debug') ## uncomment this to have the debug pkg produced
|
||||
url='https://www.gnupg.org/related_software/gpgme/'
|
||||
makedepends=('gnupg' 'libgpg-error' 'python' 'python-setuptools' 'python-build' 'python-installer' 'python-setuptools' 'python-wheel' 'swig') # 'qt5-base')
|
||||
source=("https://www.gnupg.org/ftp/gcrypt/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2"{,.sig})
|
||||
source=("https://www.gnupg.org/ftp/gcrypt/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2"{,.sig}
|
||||
'0001-qt-tests-Fix-build-in-source-directory.patch'
|
||||
'0002-qt-tests-Fix-build-in-source-directory-part-2.patch')
|
||||
|
||||
# # joborun: it is not supported but Arch is forcing it to support both qt5 & 6
|
||||
# # get the qt pkgs from Arch then because we would rather live without Qt than allow it to penetrate deeper
|
||||
# # QT's licensing should not be perceived as free any more, Arch tries to support unsupported qt5 and qt6
|
||||
# # Arch note below:
|
||||
#prepare() {
|
||||
## Building qt5 and qt6 bindings in the same source tree is not supported
|
||||
# cp -r ${pkgbase}-${pkgver}{,-qt6}
|
||||
#}
|
||||
prepare() {
|
||||
|
||||
cd ${pkgbase}-${pkgver}/
|
||||
|
||||
patch -Np1 < ../0001-qt-tests-Fix-build-in-source-directory.patch
|
||||
patch -Np1 < ../0002-qt-tests-Fix-build-in-source-directory-part-2.patch
|
||||
|
||||
sed -i 's/-unknown//' autogen.sh
|
||||
autoreconf -fi
|
||||
|
||||
# Building qt5 and qt6 bindings in the same source tree is not supported
|
||||
cp -r ${srcdir}/${pkgbase}-${pkgver}{,-qt6}
|
||||
}
|
||||
|
||||
build() {
|
||||
cd ${pkgbase}-${pkgver}
|
||||
|
|
@ -119,9 +126,10 @@ license=('LGPL')
|
|||
validpgpkeys=('6DAA6E64A76D2840571B4902528897B826403ADA' # Werner Koch (dist signing 2020)
|
||||
'AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD') # Niibe Yutaka (GnuPG Release Key)
|
||||
|
||||
sha256sums=(416e174e165734d84806253f8c96bda2993fd07f258c3aad5f053a6efd463e88 # gpgme-1.21.0.tar.bz2
|
||||
4d1e5f74cc39cdad4efd591a09026f8e7f045d2bd572f1d79ec34d9ba29be446) # gpgme-1.21.0.tar.bz2.sig
|
||||
|
||||
## 15449c25c5dada3a7f45ac52b47e547cab4a284f62089c1777af7da3b4ce47f4 gpgme-1.21.0-01-x86_64.pkg.tar.lz
|
||||
## 64de72fb80ba12ad95243c130df55ba8f918afb1c79263639f45c1977e5f1c9d python-gpgme-1.21.0-01-x86_64.pkg.tar.lz
|
||||
sha256sums=(9551e37081ad3bde81018a0d24f245c3f8206990549598fb31a97a68380a7b71 # gpgme-1.21.0.tar.bz2
|
||||
a5598bc557bd0dad1b50e6850e6b9245b826137fcaf8997820e3bdfe5cd3dcad # gpgme-1.22.0.tar.bz2.sig
|
||||
a0d3d02c46e7053cfc887271fea7d38f64439b9f67b14eaacec3e602de5dccd4 # 0001-qt-tests-Fix-build-in-source-directory.patch
|
||||
eaeae9b9818dd94c08954bb5c3535f43a80583f9c97d5e7f8ca62a104deeebe9) # 0002-qt-tests-Fix-build-in-source-directory-part-2.patch
|
||||
|
||||
## c5413598e36ed40693ce45db40c3a5e8bcc962681578e8675290f0946037164e gpgme-1.22.0-01-x86_64.pkg.tar.lz
|
||||
## 90a4eee5128113d793b9aa9aed71fc1b3077c3644e13c1d7a7003dd4b79a143b python-gpgme-1.22.0-01-x86_64.pkg.tar.lz
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
pkgbase=gpgme
|
||||
pkgname=(gpgme qgpgme-qt5 qgpgme-qt6 python-gpgme)
|
||||
pkgver=1.21.0
|
||||
pkgver=1.22.0
|
||||
pkgrel=1
|
||||
pkgdesc='A C wrapper library for GnuPG'
|
||||
arch=('x86_64')
|
||||
|
|
@ -24,13 +24,25 @@ makedepends=(
|
|||
)
|
||||
validpgpkeys=('6DAA6E64A76D2840571B4902528897B826403ADA' # Werner Koch (dist signing 2020)
|
||||
'AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD') # Niibe Yutaka (GnuPG Release Key)
|
||||
source=("https://www.gnupg.org/ftp/gcrypt/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2"{,.sig})
|
||||
sha256sums=('416e174e165734d84806253f8c96bda2993fd07f258c3aad5f053a6efd463e88'
|
||||
'SKIP')
|
||||
source=("https://www.gnupg.org/ftp/gcrypt/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2"{,.sig}
|
||||
'0001-qt-tests-Fix-build-in-source-directory.patch'
|
||||
'0002-qt-tests-Fix-build-in-source-directory-part-2.patch')
|
||||
sha256sums=('9551e37081ad3bde81018a0d24f245c3f8206990549598fb31a97a68380a7b71'
|
||||
'SKIP'
|
||||
'a0d3d02c46e7053cfc887271fea7d38f64439b9f67b14eaacec3e602de5dccd4'
|
||||
'eaeae9b9818dd94c08954bb5c3535f43a80583f9c97d5e7f8ca62a104deeebe9')
|
||||
|
||||
prepare() {
|
||||
# Building qt5 and qt6 bindings in the same source tree is not supported
|
||||
cp -r ${pkgbase}-${pkgver}{,-qt6}
|
||||
cd ${pkgbase}-${pkgver}/
|
||||
|
||||
patch -Np1 < ../0001-qt-tests-Fix-build-in-source-directory.patch
|
||||
patch -Np1 < ../0002-qt-tests-Fix-build-in-source-directory-part-2.patch
|
||||
|
||||
sed -i 's/-unknown//' autogen.sh
|
||||
autoreconf -fi
|
||||
|
||||
# Building qt5 and qt6 bindings in the same source tree is not supported
|
||||
cp -r ${srcdir}/${pkgbase}-${pkgver}{,-qt6}
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
|
|||
|
|
@ -7,3 +7,5 @@ python-wheel
|
|||
python-typing_extensions
|
||||
|
||||
|
||||
autoconf
|
||||
automake
|
||||
|
|
|
|||
Loading…
Reference in New Issue