[arch-commits] Commit in sequoia/trunk (PKGBUILD build.patch)

[Levente Polyak]

    Date: Wednesday, November 11, 2020 @ 00:15:31
  Author: anthraxx
Revision: 749932

upgpkg: sequoia 0.20.0-1

Modified:
  sequoia/trunk/PKGBUILD
Deleted:
  sequoia/trunk/build.patch

-------------+
 PKGBUILD    |   13 +++++++------
 build.patch |   13 -------------
 2 files changed, 7 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-10 23:54:35 UTC (rev 749931)
+++ PKGBUILD	2020-11-11 00:15:31 UTC (rev 749932)
@@ -3,7 +3,7 @@
 
 pkgbase=sequoia
 pkgname=(sequoia python-sequoia)
-pkgver=0.19.0
+pkgver=0.20.0
 pkgrel=1
 pkgdesc='Cool new OpenPGP implementation'
 url='https://sequoia-pgp.org/'
@@ -10,19 +10,20 @@
 arch=('x86_64')
 license=('GPL3')
 makedepends=('git' 'cargo' 'clang' 'python' 'python-setuptools' 'python-cffi'
-             'glibc' 'nettle' 'sqlite' 'capnproto' 'openssl' 'gcc-libs' 'gmp')
+             'glibc' 'nettle' 'sqlite' 'capnproto' 'openssl' 'gcc-libs' 'gmp'
+             'bzip2')
 checkdepends=('python-pytest' 'python-pytest-runner')
 options=('!makeflags')
 source=(${pkgname}::"git+https://gitlab.com/sequoia-pgp/sequoia.git#tag=v${pkgver}"
-        build.patch)
+        sequoia-0.20-fix-install.patch::https://gitlab.com/sequoia-pgp/sequoia/-/commit/1f3ec0784818bcbe0e73ea4743a19060163fd9b3.patch)
 sha512sums=('SKIP'
-            '44c8f4af25b3a8c42939ea75e87fa90ac42499545b41c3dc6744debf318ecc6361f4aad2692663a0516b9f5a6e1d33435d82a7749cfd2c26c9baf94f5dcb6b09')
+            '6510f0da18dc4895aa7a8d99e88c6a4acf09898928b5ce9fb6cd60fa419a3ae1d04312d90b6752bf637998b4530c87fd654fccd163093de36bca311f523671e4')
 
 prepare() {
   cd ${pkgname}
   sed 's/debug/release/g' -i -- */Makefile */*/Makefile */*/*/Makefile
   sed "s/-L/${LDFLAGS},-L/g" -i ffi/lang/python/Makefile
-  patch -Np1 < ../build.patch
+  patch -Np1 < ../sequoia-0.20-fix-install.patch
 }
 
 build() {
@@ -41,7 +42,7 @@
 
 package_sequoia() {
   depends=('glibc' 'nettle' 'libhogweed.so' 'libnettle.so' 'sqlite' 'capnproto'
-           'openssl' 'gcc-libs' 'gmp')
+           'openssl' 'gcc-libs' 'gmp' 'bzip2' 'libbz2.so')
   cd ${pkgbase}
   make DESTDIR="${pkgdir}" PREFIX=/usr CARGO_FLAGS='--locked' install
   install -Dm 644 README.md -t "${pkgdir}/usr/share/doc/${pkgname}"

Deleted: build.patch
===================================================================
--- build.patch	2020-11-10 23:54:35 UTC (rev 749931)
+++ build.patch	2020-11-11 00:15:31 UTC (rev 749932)
@@ -1,13 +0,0 @@
-diff --git a/ffi/Makefile b/ffi/Makefile
-index 3dddfcd4..1feb7b53 100644
---- a/ffi/Makefile
-+++ b/ffi/Makefile
-@@ -62,7 +62,7 @@ build-release:
- 	    $(CARGO) build $(CARGO_FLAGS) --release --package sequoia-ffi
- 	$(MAKE) -Clang/python build-release
- 	$(call sequoia_pc,$(CARGO_TARGET_DIR)/release,true)
--	$(MAKE) -C../store install
-+	$(MAKE) -C../store build-release
- 
- .PHONY: install
- install: build-release