[arch-commits] Commit in zcash/trunk (3 files)

[Nicola Squartini]

    Date: Tuesday, November 5, 2019 @ 11:12:53
  Author: tensor5
Revision: 524187

upgpkg: zcash 2.1.0-1

Modified:
  zcash/trunk/PKGBUILD
  zcash/trunk/use-system-rust.patch
Deleted:
  zcash/trunk/libsnark-no-gtest.patch

-------------------------+
 PKGBUILD                |   16 +++++-----------
 libsnark-no-gtest.patch |   22 ----------------------
 use-system-rust.patch   |   10 ++++++----
 3 files changed, 11 insertions(+), 37 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-05 10:42:41 UTC (rev 524186)
+++ PKGBUILD	2019-11-05 11:12:53 UTC (rev 524187)
@@ -1,25 +1,23 @@
 # Maintainer: Nicola Squartini <tensor5 at gmail.com>
 
 pkgname=zcash
-pkgver=2.0.7_3
-_commit=e3983afc03d256813662aa2cb07fbe1a05b9ab05
-pkgrel=2
+pkgver=2.1.0
+_commit=ffdba7c19eca07657f722a7c0a1b1c848d661f50
+pkgrel=1
 pkgdesc='Permissionless financial system employing zero-knowledge security'
 arch=('x86_64')
 url='https://z.cash/'
 license=('MIT')
 depends=('boost-libs' 'libevent' 'qpid-proton' 'zeromq')
-makedepends=('boost' 'cmake' 'git' 'gmock' 'python' 'rustup' 'wget')
+makedepends=('boost' 'cmake' 'git' 'gmock' 'python' 'rust' 'wget')
 checkdepends=('python2-pyblake2' 'python2-pyzmq' 'python2-qpid-proton')
 source=("git+https://github.com/zcash/zcash.git#commit=${_commit}"
-        'libsnark-no-gtest.patch'
         'use-system-qpid-proton.patch'
         'use-system-rust.patch'
         'zcashd.service')
 sha512sums=('SKIP'
-            'b4792cc6f4c1e4e633d34257b68a4fbf882dfc692fedc14a06905705dd0778f22097b1e0645e00231ddc366245fe76ff63a43b53fb468496daf5100b15ad2fee'
             '019870971a0cec093d0552585f4140f39dd65f90cb56b97e512bbaf0d79c0f1574295e722310d4e1762af12ff693802fc465765d4d1410d209e259326f307d6a'
-            'e2bdf46696e70a93ffcb45bf4e081c780cda8f11f6fa346b6807731f7c739f18c689c4e78a71f8bd7099874108b6b6584b8a96395bbca8d5441f7600a3fe0ebe'
+            '8878b5c805d6cdf159dbac0ef73fb47d0fbd2fc35332f1c15f05d6041c0eca7f16b12aeb1cc20615d0a325a68e8d22bb3961cadebbfa54b87783ad5de35b92fb'
             '2fb8b0a636ca9c7ee15f0fd2c47046c8323ade3de9562f393da7541eee50dd14b12107dd29b0e1ee90ff88963e2f7e25b12435166a1812df5c88c579c12dde88')
 
 prepare() {
@@ -28,7 +26,6 @@
     # Set gitattributes on src/clientversion.cpp
     git archive --format=tar ${_commit} -- src/clientversion.cpp | tar -xf -
 
-    patch -Np1 -i ../libsnark-no-gtest.patch
     patch -Np1 -i ../use-system-qpid-proton.patch
     patch -Np1 -i ../use-system-rust.patch
 
@@ -39,9 +36,6 @@
 build() {
     cd ${pkgname}
 
-    # Temporary, due to llvm-libs 9 being in [staging]
-    rustup update stable
-
     cd depends
     rust_crates=(
       crate_aes

Deleted: libsnark-no-gtest.patch
===================================================================
--- libsnark-no-gtest.patch	2019-11-05 10:42:41 UTC (rev 524186)
+++ libsnark-no-gtest.patch	2019-11-05 11:12:53 UTC (rev 524187)
@@ -1,22 +0,0 @@
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -61,7 +61,7 @@ $(LIBSECP256K1): $(wildcard secp256k1/src/*) $(wildcard secp256k1/include/*)
- 	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
- 
- LIBSNARK_CXXFLAGS = $(AM_CXXFLAGS) $(PIC_FLAGS) -DBINARY_OUTPUT -DNO_PT_COMPRESSION=1 -fstack-protector-all
--LIBSNARK_CONFIG_FLAGS = CURVE=ALT_BN128 NO_PROCPS=1 NO_DOCS=1 STATIC=1 NO_SUPERCOP=1 FEATUREFLAGS=-DMONTGOMERY_OUTPUT NO_COPY_DEPINST=1 NO_COMPILE_LIBGTEST=1
-+LIBSNARK_CONFIG_FLAGS = CURVE=ALT_BN128 NO_PROCPS=1 NO_DOCS=1 STATIC=1 NO_SUPERCOP=1 FEATUREFLAGS=-DMONTGOMERY_OUTPUT NO_COPY_DEPINST=1 NO_COMPILE_LIBGTEST=1 NO_GTEST=1
- if HAVE_OPENMP
- LIBSNARK_CONFIG_FLAGS += MULTICORE=1
- endif
---- a/src/snark/Makefile
-+++ b/src/snark/Makefile
-@@ -175,7 +175,7 @@ EXEC_OBJS =$(patsubst %,%.o,$(EXECUTABLES) $(EXECUTABLES_WITH_GTEST) $(EXECUTABL
- GTEST_OBJS =$(patsubst %.cpp,%.o,$(GTEST_SRCS))
- 
- all: \
--     $(if $(NO_GTEST),,$(EXECUTABLES_WITH_GTEST) $(GTEST_TESTS)) \
-+     $(if $(NO_GTEST),$(LIBSNARK_A),$(EXECUTABLES_WITH_GTEST) $(GTEST_TESTS)) \
-      $(if $(NO_SUPERCOP),,$(EXECUTABLES_WITH_SUPERCOP)) \
-      $(EXECUTABLES) \
-      $(if $(NO_DOCS),,doc)

Modified: use-system-rust.patch
===================================================================
--- use-system-rust.patch	2019-11-05 10:42:41 UTC (rev 524186)
+++ use-system-rust.patch	2019-11-05 11:12:53 UTC (rev 524187)
@@ -1,15 +1,17 @@
 --- a/depends/packages/librustzcash.mk
 +++ b/depends/packages/librustzcash.mk
-@@ -5,7 +5,7 @@
+@@ -5,9 +5,8 @@
  $(package)_download_file=$($(package)_git_commit).tar.gz
  $(package)_sha256_hash=9909ec59fa7a411c2071d6237b3363a0bc6e5e42358505cf64b7da0f58a7ff5a
  $(package)_git_commit=06da3b9ac8f278e5d4ae13088cf0a4c03d2c13f5
--$(package)_dependencies=rust $(rust_crates)
+-$(package)_dependencies=rust
+ ifeq ($(LIBRUSTZCASH_OVERRIDE),)
+-$(package)_dependencies+=$(rust_crates)
 +$(package)_dependencies=$(rust_crates)
  $(package)_patches=cargo.config 0001-Start-using-cargo-clippy-for-CI.patch remove-dev-dependencies.diff
+ endif
  
- $(package)_rust_target=$(if $(rust_rust_target_$(canonical_host)),$(rust_rust_target_$(canonical_host)),$(canonical_host))
-@@ -33,7 +33,7 @@
+@@ -61,7 +60,7 @@
  endef
  
  define $(package)_build_cmds