[arch-commits] Commit in sequoia/repos/community-x86_64 (3 files)

[Levente Polyak]

    Date: Wednesday, November 11, 2020 @ 00:15:35
  Author: anthraxx
Revision: 749933

archrelease: copy trunk to community-x86_64

Added:
  sequoia/repos/community-x86_64/PKGBUILD
    (from rev 749932, sequoia/trunk/PKGBUILD)
Deleted:
  sequoia/repos/community-x86_64/PKGBUILD
  sequoia/repos/community-x86_64/build.patch

-------------+
 PKGBUILD    |  117 +++++++++++++++++++++++++++++-----------------------------
 build.patch |   13 ------
 2 files changed, 59 insertions(+), 71 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-11 00:15:31 UTC (rev 749932)
+++ PKGBUILD	2020-11-11 00:15:35 UTC (rev 749933)
@@ -1,58 +0,0 @@
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-# Contributor: Kai Michaelis <kai at sequoia-pgp.org>
-
-pkgbase=sequoia
-pkgname=(sequoia python-sequoia)
-pkgver=0.19.0
-pkgrel=1
-pkgdesc='Cool new OpenPGP implementation'
-url='https://sequoia-pgp.org/'
-arch=('x86_64')
-license=('GPL3')
-makedepends=('git' 'cargo' 'clang' 'python' 'python-setuptools' 'python-cffi'
-             'glibc' 'nettle' 'sqlite' 'capnproto' 'openssl' 'gcc-libs' 'gmp')
-checkdepends=('python-pytest' 'python-pytest-runner')
-options=('!makeflags')
-source=(${pkgname}::"git+https://gitlab.com/sequoia-pgp/sequoia.git#tag=v${pkgver}"
-        build.patch)
-sha512sums=('SKIP'
-            '44c8f4af25b3a8c42939ea75e87fa90ac42499545b41c3dc6744debf318ecc6361f4aad2692663a0516b9f5a6e1d33435d82a7749cfd2c26c9baf94f5dcb6b09')
-
-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
-}
-
-build() {
-  cd ${pkgname}
-  make PREFIX=/usr CARGO_FLAGS='--locked' build-release
-}
-
-check() {
-  cd ${pkgname}
-  cargo test --release --locked \
-    --workspace \
-    --exclude sequoia-store
-  # python tests currently fail horribly
-  # make -C ffi/lang/python test
-}
-
-package_sequoia() {
-  depends=('glibc' 'nettle' 'libhogweed.so' 'libnettle.so' 'sqlite' 'capnproto'
-           'openssl' 'gcc-libs' 'gmp')
-  cd ${pkgbase}
-  make DESTDIR="${pkgdir}" PREFIX=/usr CARGO_FLAGS='--locked' install
-  install -Dm 644 README.md -t "${pkgdir}/usr/share/doc/${pkgname}"
-  rm -rf "${pkgdir}/usr/lib/python"*
-}
-
-package_python-sequoia() {
-  depends=('python' 'python-cffi' 'sequoia')
-  pkgdesc+=' - python bindings'
-  cd ${pkgbase}
-  make -C ffi/lang/python DESTDIR="${pkgdir}" PREFIX=/usr install
-}
-
-# vim: ts=2 sw=2 et:

Copied: sequoia/repos/community-x86_64/PKGBUILD (from rev 749932, sequoia/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-11-11 00:15:35 UTC (rev 749933)
@@ -0,0 +1,59 @@
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Kai Michaelis <kai at sequoia-pgp.org>
+
+pkgbase=sequoia
+pkgname=(sequoia python-sequoia)
+pkgver=0.20.0
+pkgrel=1
+pkgdesc='Cool new OpenPGP implementation'
+url='https://sequoia-pgp.org/'
+arch=('x86_64')
+license=('GPL3')
+makedepends=('git' 'cargo' 'clang' 'python' 'python-setuptools' 'python-cffi'
+             '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}"
+        sequoia-0.20-fix-install.patch::https://gitlab.com/sequoia-pgp/sequoia/-/commit/1f3ec0784818bcbe0e73ea4743a19060163fd9b3.patch)
+sha512sums=('SKIP'
+            '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 < ../sequoia-0.20-fix-install.patch
+}
+
+build() {
+  cd ${pkgname}
+  make PREFIX=/usr CARGO_FLAGS='--locked' build-release
+}
+
+check() {
+  cd ${pkgname}
+  cargo test --release --locked \
+    --workspace \
+    --exclude sequoia-store
+  # python tests currently fail horribly
+  # make -C ffi/lang/python test
+}
+
+package_sequoia() {
+  depends=('glibc' 'nettle' 'libhogweed.so' 'libnettle.so' 'sqlite' 'capnproto'
+           '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}"
+  rm -rf "${pkgdir}/usr/lib/python"*
+}
+
+package_python-sequoia() {
+  depends=('python' 'python-cffi' 'sequoia')
+  pkgdesc+=' - python bindings'
+  cd ${pkgbase}
+  make -C ffi/lang/python DESTDIR="${pkgdir}" PREFIX=/usr install
+}
+
+# vim: ts=2 sw=2 et:

Deleted: build.patch
===================================================================
--- build.patch	2020-11-11 00:15:31 UTC (rev 749932)
+++ build.patch	2020-11-11 00:15:35 UTC (rev 749933)
@@ -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