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

[Nicola Squartini]

    Date: Wednesday, April 18, 2018 @ 10:38:44
  Author: tensor5
Revision: 316862

upgpkg: zcash 1.1.0-1

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

--------------------------+
 PKGBUILD                 |   13 +++++--------
 boost-no-mt-suffix.patch |   22 ----------------------
 libsnark-no-gtest.patch  |    2 +-
 use-system-rust.patch    |    9 +++++----
 4 files changed, 11 insertions(+), 35 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-04-18 10:09:07 UTC (rev 316861)
+++ PKGBUILD	2018-04-18 10:38:44 UTC (rev 316862)
@@ -2,8 +2,8 @@
 # Maintainer: Nicola Squartini <tensor5 at gmail.com>
 
 pkgname=zcash
-pkgver=1.0.15
-_commit=93332d6e84590cdcb8c64282f9b525152c3f1b2f
+pkgver=1.1.0
+_commit=42e30252372b39f2b8da655ebeca03565dc02de4
 pkgrel=1
 pkgdesc='Permissionless financial system employing zero-knowledge security'
 arch=('x86_64')
@@ -13,14 +13,12 @@
 makedepends=('boost' 'cargo' 'cmake' 'git' 'gmock' 'python' 'wget')
 checkdepends=('python' 'python2' 'python2-pyzmq')
 source=("git+https://github.com/zcash/zcash.git#commit=${_commit}"
-        "boost-no-mt-suffix.patch"
         'libsnark-no-gtest.patch'
         "use-system-rust.patch"
         'zcashd.service')
 sha512sums=('SKIP'
-            '7019ef6162be0083db7399ec2ec3059b669b4f05247d6f038603ba3541a864d180ca41d5d971993f0d9c028410f811f31a31c39faa7c62cbad23ca65a4a4662c'
-            'ba59e6f94ac7fa94429203e32b9804e6d741e60099e2dd052813ed879ad5a10c46e816dc8d4a5d59444c35c7eaf9a40434fd93b7e392fd535c041c89274375f0'
-            '3663373af04318aa72d877f399f0c9e956d289ac876583e70afa2933bf4171f7441a399e043b2d29b1df6d19d29390bb69d4053cad4b75bef903a8685fcd23bf'
+            '04d397a29f6c1916ba494069fa79a65e7760d95d67174ae113b1ebc2b71233c7ded24f74bec591546ee49cff2c20e45c762aa50bf3fc3b47789f8aa34e42f930'
+            'ce98eb983956704af4fc05d0c0959bb3538127432e64b1ea1482f345a15b9d4fc6b41f631705cd5aa1e09aeea608781106e7915ddbc57f314811d262ae361c50'
             '2fb8b0a636ca9c7ee15f0fd2c47046c8323ade3de9562f393da7541eee50dd14b12107dd29b0e1ee90ff88963e2f7e25b12435166a1812df5c88c579c12dde88')
 
 prepare() {
@@ -29,7 +27,6 @@
     # Set gitattributes on src/clientversion.cpp
     git archive --format=tar ${_commit} -- src/clientversion.cpp | tar -xf -
 
-    patch -Np1 -i ../boost-no-mt-suffix.patch
     patch -Np1 -i ../libsnark-no-gtest.patch
     patch -Np1 -i ../use-system-rust.patch
 }
@@ -40,7 +37,7 @@
     cd depends
     make install \
         native_packages='' \
-        packages='bdb librustzcash'
+        packages='bdb crate_libc librustzcash'
     cd ..
 
     BUILD="$(./depends/config.guess)"

Deleted: boost-no-mt-suffix.patch
===================================================================
--- boost-no-mt-suffix.patch	2018-04-18 10:09:07 UTC (rev 316861)
+++ boost-no-mt-suffix.patch	2018-04-18 10:38:44 UTC (rev 316862)
@@ -1,22 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -720,7 +720,7 @@
- AX_CHECK_COMPILE_FLAG([-fno-strict-aliasing],[CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"])
- AX_CHECK_COMPILE_FLAG([-Wno-builtin-declaration-mismatch],[CXXFLAGS="$CXXFLAGS -Wno-builtin-declaration-mismatch"],,[[$CXXFLAG_WERROR]])
- 
--LIBZCASH_LIBS="-lgmp -lgmpxx -lboost_system-mt -lcrypto -lsodium $RUST_LIBS"
-+LIBZCASH_LIBS="-lgmp -lgmpxx -lboost_system -lcrypto -lsodium $RUST_LIBS"
- 
- AC_MSG_CHECKING([whether to build bitcoind])
- AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes])
---- a/src/snark/Makefile
-+++ b/src/snark/Makefile
-@@ -19,7 +19,7 @@ DEPINST = depinst
- 
- CXXFLAGS += -I$(DEPINST)/include -Ilibsnark
- LDFLAGS += -L$(DEPINST)/lib -Wl,-rpath,$(DEPINST)/lib
--LDLIBS += -lgmpxx -lgmp -lboost_program_options-mt -lsodium
-+LDLIBS += -lgmpxx -lgmp -lboost_program_options -lsodium
- # List of .a files to include within libsnark.a and libsnark.so:
- AR_LIBS =
- # List of library files to install:

Modified: libsnark-no-gtest.patch
===================================================================
--- libsnark-no-gtest.patch	2018-04-18 10:09:07 UTC (rev 316861)
+++ libsnark-no-gtest.patch	2018-04-18 10:38:44 UTC (rev 316862)
@@ -11,7 +11,7 @@
  endif
 --- a/src/snark/Makefile
 +++ b/src/snark/Makefile
-@@ -172,7 +172,7 @@ EXEC_OBJS =$(patsubst %,%.o,$(EXECUTABLES) $(EXECUTABLES_WITH_GTEST) $(EXECUTABL
+@@ -175,7 +175,7 @@ EXEC_OBJS =$(patsubst %,%.o,$(EXECUTABLES) $(EXECUTABLES_WITH_GTEST) $(EXECUTABL
  GTEST_OBJS =$(patsubst %.cpp,%.o,$(GTEST_SRCS))
  
  all: \

Modified: use-system-rust.patch
===================================================================
--- use-system-rust.patch	2018-04-18 10:09:07 UTC (rev 316861)
+++ use-system-rust.patch	2018-04-18 10:38:44 UTC (rev 316862)
@@ -1,10 +1,11 @@
 --- a/depends/packages/librustzcash.mk
 +++ b/depends/packages/librustzcash.mk
-@@ -5,7 +5,6 @@
+@@ -5,7 +5,7 @@
  $(package)_download_file=$($(package)_git_commit).tar.gz
  $(package)_sha256_hash=a5760a90d4a1045c8944204f29fa2a3cf2f800afee400f88bf89bbfe2cce1279
  $(package)_git_commit=91348647a86201a9482ad4ad68398152dc3d635e
--$(package)_dependencies=rust
+-$(package)_dependencies=rust $(rust_crates)
++$(package)_dependencies=$(rust_crates)
+ $(package)_patches=cargo.config
  
- define $(package)_build_cmds
-   cargo build --release
+ define $(package)_preprocess_cmds