[arch-commits] Commit in zcash/trunk (PKGBUILD use-system-rust.patch)

2020-11-22 Thread Nicola Squartini via arch-commits 
Date: Sunday, November 22, 2020 @ 12:00:28
  Author: tensor5
Revision: 758916

upgpkg: zcash 4.1.1-1

Modified:
  zcash/trunk/PKGBUILD
  zcash/trunk/use-system-rust.patch

---+
 PKGBUILD  |   49 
 use-system-rust.patch |   22 ++---
 2 files changed, 40 insertions(+), 31 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-11-22 12:00:27 UTC (rev 758915)
+++ PKGBUILD2020-11-22 12:00:28 UTC (rev 758916)
@@ -1,22 +1,26 @@
 # Maintainer: Nicola Squartini 
 
 pkgname=zcash
-pkgver=4.0.0
-_commit=5e7e9687fc87a2426bafef2837174eac52978b4c
-pkgrel=2
+pkgver=4.1.1
+_commit=6d856869e9c4cb9e6f3332db6fb04b956bb9fd3d
+_db_version=6.2.23
+_db_sha256_hash=47612c8991aa9ac2f6be721267c8d3cdccf5ac83105df8e50809daea24e95dc7
+pkgrel=1
 pkgdesc='Permissionless financial system employing zero-knowledge security'
 arch=('x86_64')
 url='https://z.cash/'
 license=('MIT')
-depends=('boost-libs' 'libevent' 'zeromq')
+depends=('boost-libs' 'libevent' 'utf8cpp' 'zeromq')
 makedepends=('boost' 'cmake' 'git' 'gmock' 'python' 'rust' 'wget')
 checkdepends=('python-pyblake2' 'python-pyzmq' 'python-requests' 
'python-simplejson')
 source=("git+https://github.com/zcash/zcash.git#commit=${_commit};
+"https://download.oracle.com/berkeley-db/db-${_db_version}.tar.gz;
 'use-system-rust.patch'
 'zcashd.service')
-sha512sums=('SKIP'
-
'1267fc174df81a80a1b0f2e1a6bbaaa6fa95402c83bc6a8678b582ed6c7f7a02eeed0f61c9600496aa782f9fb9fec6dc9ac419d366d059306a5c4f97a5a166f0'
-
'2fb8b0a636ca9c7ee15f0fd2c47046c8323ade3de9562f393da7541eee50dd14b12107dd29b0e1ee90ff88963e2f7e25b12435166a1812df5c88c579c12dde88')
+sha256sums=('SKIP'
+"${_db_sha256_hash}"
+'119e787cb22f2941ead286d2621fae7d6c4de6216e24615eb3c0f875e7a2547f'
+'7b0919ac447824199aff8c17b5a5799b46414818c6aed314506c5295d0ce9ccd')
 
 prepare() {
 cd ${pkgname}
@@ -28,22 +32,27 @@
 }
 
 build() {
-cd ${pkgname}
+cd "db-${_db_version}/build_unix"
 
-cd depends
-make install \
-native_packages='' \
-packages="bdb utfcpp"
-cd ..
+../dist/configure \
+--prefix=/ \
+--disable-shared \
+--enable-cxx \
+--disable-replication \
+--enable-option-checking \
+--with-pic
+make libdb_cxx-6.2.a libdb-6.2.a
+make DESTDIR="${srcdir}/db-root" install
 
-BUILD="$(./depends/config.guess)"
-CPPFLAGS="${CPPFLAGS} -I${PWD}/depends/${BUILD}/include"
-LDFLAGS="${LDFLAGS} -L${PWD}/depends/${BUILD}/lib"
+cd "${srcdir}/${pkgname}"
 
+CPPFLAGS="${CPPFLAGS} -I${srcdir}/db-root/include -I/usr/include/utf8cpp"
+LDFLAGS="${LDFLAGS} -L${srcdir}/db-root/lib"
+
 ./autogen.sh
-depends_prefix="${PWD}/depends/${BUILD}" ./configure --prefix=/usr \
+./configure --prefix=/usr \
 --enable-online-rust
-make RUST_TARGET="${BUILD}"
+make RUST_TARGET=x86_64-unknown-linux-gnu
 }
 
 check() {
@@ -50,7 +59,7 @@
 cd ${pkgname}
 
 ./zcutil/fetch-params.sh --testnet
-export RUST_TARGET="$(./depends/config.guess)"
+export RUST_TARGET=x86_64-unknown-linux-gnu
 ./qa/zcash/full_test_suite.py || true
 }
 
@@ -57,7 +66,7 @@
 package() {
 cd ${pkgname}
 
-make DESTDIR="${pkgdir}" RUST_TARGET="$(./depends/config.guess)" install
+make DESTDIR="${pkgdir}" RUST_TARGET=x86_64-unknown-linux-gnu install
 
 for ext in '-cli' '-tx' 'd'; do
 install -Dm644 contrib/zcash${ext}.bash-completion \

Modified: use-system-rust.patch
===
--- use-system-rust.patch   2020-11-22 12:00:27 UTC (rev 758915)
+++ use-system-rust.patch   2020-11-22 12:00:28 UTC (rev 758916)
@@ -1,14 +1,14 @@
 --- a/qa/zcash/full_test_suite.py
 +++ b/qa/zcash/full_test_suite.py
-@@ -133,9 +133,9 @@
+@@ -149,9 +149,9 @@
+ return False
  
- if os.path.isdir(depends_dir):
- rust_env = os.environ.copy()
--rust_env['RUSTC'] = os.path.join(depends_dir, 'native', 'bin', 
'rustc')
-+rust_env['RUSTC'] = 'rustc'
- return subprocess.call([
--os.path.join(depends_dir, 'native', 'bin', 'cargo'),
-+'cargo',
- 'test',
- '--manifest-path',
- os.path.join(REPOROOT, 'Cargo.toml'),
+ rust_env = os.environ.copy()
+-rust_env['RUSTC'] = os.path.join(arch_dir, 'native', 'bin', 'rustc')
++rust_env['RUSTC'] = 'rustc'
+ return subprocess.call([
+-os.path.join(arch_dir, 'native', 'bin', 'cargo'),
++'cargo',
+ 'test',
+ '--manifest-path',
+ os.path.join(REPOROOT, 'Cargo.toml'),

[arch-commits] Commit in zcash/trunk (PKGBUILD use-system-rust.patch)

2018-12-13 Thread Nicola Squartini via arch-commits 
Date: Thursday, December 13, 2018 @ 15:29:35
  Author: tensor5
Revision: 416025

upgpkg: zcash 2.0.2-1

Modified:
  zcash/trunk/PKGBUILD
  zcash/trunk/use-system-rust.patch

---+
 PKGBUILD  |6 +++---
 use-system-rust.patch |6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-12-13 15:20:34 UTC (rev 416024)
+++ PKGBUILD2018-12-13 15:29:35 UTC (rev 416025)
@@ -1,8 +1,8 @@
 # Maintainer: Nicola Squartini 
 
 pkgname=zcash
-pkgver=2.0.1
-_commit=e8f5e592b864b341391c9becf80bbe3e0e930a33
+pkgver=2.0.2
+_commit=8e2ca4d94e2f1bc0835d3d888a969fe2e83e7ece
 pkgrel=1
 pkgdesc='Permissionless financial system employing zero-knowledge security'
 arch=('x86_64')
@@ -17,7 +17,7 @@
 'zcashd.service')
 sha512sums=('SKIP'
 
'3c002c9d721853089f02cc397e2bc4130574a9c06b1118824338efedc476daa5bdbdcf55bf6beba69fb9c4bd065b871b3111259fa1e25828f333056d340282a1'
-
'fe07d546b88bd0d03dbbf9843d33c2be4e8eb4744f308ed6c73015757fe77d5fde0d30ee480a9175d218b6a21b403d4defae70c44aa9e8e7541cced1c477a857'
+
'dba24a8a99da58c856bf346631b675b5b2512514384c85a3ffbbacd4c51df808d127de926850eeb36993597f31a0052ac758d065c9cecbb05a87c079555e0a54'
 
'2fb8b0a636ca9c7ee15f0fd2c47046c8323ade3de9562f393da7541eee50dd14b12107dd29b0e1ee90ff88963e2f7e25b12435166a1812df5c88c579c12dde88')
 
 prepare() {

Modified: use-system-rust.patch
===
--- use-system-rust.patch   2018-12-13 15:20:34 UTC (rev 416024)
+++ use-system-rust.patch   2018-12-13 15:29:35 UTC (rev 416025)
@@ -2,10 +2,10 @@
 +++ b/depends/packages/librustzcash.mk
 @@ -5,7 +5,7 @@
  $(package)_download_file=$($(package)_git_commit).tar.gz
- 
$(package)_sha256_hash=e9a488a8bbecf7fb237a32dadd65133211ef61616d44cf55609e029837a41004
- $(package)_git_commit=f5e5cb24e1bd756a02fc4a3fd2b824238ccd15ad
+ 
$(package)_sha256_hash=9909ec59fa7a411c2071d6237b3363a0bc6e5e42358505cf64b7da0f58a7ff5a
+ $(package)_git_commit=06da3b9ac8f278e5d4ae13088cf0a4c03d2c13f5
 -$(package)_dependencies=rust $(rust_crates)
 +$(package)_dependencies=$(rust_crates)
- $(package)_patches=cargo.config
+ $(package)_patches=cargo.config 0001-Start-using-cargo-clippy-for-CI.patch 
remove-dev-dependencies.diff
  
  ifeq ($(host_os),mingw32)

[arch-commits] Commit in zcash/trunk (PKGBUILD use-system-rust.patch)

2018-07-19 Thread Nicola Squartini via arch-commits 
Date: Thursday, July 19, 2018 @ 09:48:59
  Author: tensor5
Revision: 362386

upgpkg: zcash 1.1.2-1

Modified:
  zcash/trunk/PKGBUILD
  zcash/trunk/use-system-rust.patch

---+
 PKGBUILD  |6 +++---
 use-system-rust.patch |4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-07-19 09:28:24 UTC (rev 362385)
+++ PKGBUILD2018-07-19 09:48:59 UTC (rev 362386)
@@ -2,8 +2,8 @@
 # Maintainer: Nicola Squartini 
 
 pkgname=zcash
-pkgver=1.1.1
-_commit=047b0bf94a2018a5f842219d3d5cdc157f9a52da
+pkgver=1.1.2
+_commit=bbee5e25258da49775a1f0fe6c1ab0b1466c765e
 pkgrel=1
 pkgdesc='Permissionless financial system employing zero-knowledge security'
 arch=('x86_64')
@@ -18,7 +18,7 @@
 'zcashd.service')
 sha512sums=('SKIP'
 
'04d397a29f6c1916ba494069fa79a65e7760d95d67174ae113b1ebc2b71233c7ded24f74bec591546ee49cff2c20e45c762aa50bf3fc3b47789f8aa34e42f930'
-
'720e3f43f5d9093981148e181f8621224a678dab2e8923e5d3fce05e0eda9eb0e2677f5b8c2c19062eff5b5c277d85962ce11fd966438f3238d4b6df75c55aa8'
+
'6da4341ea5077240c195418aac7d61b2e141250034441b49a52a7d9c45e692b317dc5fe4ea2d6e44b4e10fe674f07d78d644fd5f5eecfebb9d692b8020cdcaa3'
 
'2fb8b0a636ca9c7ee15f0fd2c47046c8323ade3de9562f393da7541eee50dd14b12107dd29b0e1ee90ff88963e2f7e25b12435166a1812df5c88c579c12dde88')
 
 prepare() {

Modified: use-system-rust.patch
===
--- use-system-rust.patch   2018-07-19 09:28:24 UTC (rev 362385)
+++ use-system-rust.patch   2018-07-19 09:48:59 UTC (rev 362386)
@@ -2,8 +2,8 @@
 +++ b/depends/packages/librustzcash.mk
 @@ -5,7 +5,7 @@
  $(package)_download_file=$($(package)_git_commit).tar.gz
- 
$(package)_sha256_hash=1fb331a92b63da41e95ef9db671982d243a13bcd6d25570760c9ca83b8996887
- $(package)_git_commit=36d7acf3f37570f499fc8fe79fda372e5eb873ca
+ 
$(package)_sha256_hash=5231145ea6abf61092c21b6770baf3af65994f83dff96b10118ba5dd53451f26
+ $(package)_git_commit=0af1ce8bf121e1ad367db907c39d214581e270a6
 -$(package)_dependencies=rust $(rust_crates)
 +$(package)_dependencies=$(rust_crates)
  $(package)_patches=cargo.config

[arch-commits] Commit in zcash/trunk (PKGBUILD use-system-rust.patch)

2018-06-01 Thread Nicola Squartini via arch-commits 
Date: Friday, June 1, 2018 @ 23:33:13
  Author: tensor5
Revision: 337030

upgpkg: zcash 1.1.1-1

Modified:
  zcash/trunk/PKGBUILD
  zcash/trunk/use-system-rust.patch

---+
 PKGBUILD  |   39 +--
 use-system-rust.patch |4 ++--
 2 files changed, 35 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-06-01 21:28:29 UTC (rev 337029)
+++ PKGBUILD2018-06-01 23:33:13 UTC (rev 337030)
@@ -2,9 +2,9 @@
 # Maintainer: Nicola Squartini 
 
 pkgname=zcash
-pkgver=1.1.0
-_commit=42e30252372b39f2b8da655ebeca03565dc02de4
-pkgrel=3
+pkgver=1.1.1
+_commit=047b0bf94a2018a5f842219d3d5cdc157f9a52da
+pkgrel=1
 pkgdesc='Permissionless financial system employing zero-knowledge security'
 arch=('x86_64')
 url='https://z.cash/'
@@ -18,7 +18,7 @@
 'zcashd.service')
 sha512sums=('SKIP'
 
'04d397a29f6c1916ba494069fa79a65e7760d95d67174ae113b1ebc2b71233c7ded24f74bec591546ee49cff2c20e45c762aa50bf3fc3b47789f8aa34e42f930'
-
'ce98eb983956704af4fc05d0c0959bb3538127432e64b1ea1482f345a15b9d4fc6b41f631705cd5aa1e09aeea608781106e7915ddbc57f314811d262ae361c50'
+
'720e3f43f5d9093981148e181f8621224a678dab2e8923e5d3fce05e0eda9eb0e2677f5b8c2c19062eff5b5c277d85962ce11fd966438f3238d4b6df75c55aa8'
 
'2fb8b0a636ca9c7ee15f0fd2c47046c8323ade3de9562f393da7541eee50dd14b12107dd29b0e1ee90ff88963e2f7e25b12435166a1812df5c88c579c12dde88')
 
 prepare() {
@@ -38,9 +38,36 @@
 cd ${pkgname}
 
 cd depends
+rust_crates=(
+  crate_arrayvec
+  crate_bellman
+  crate_bitflags
+  crate_bit_vec
+  crate_blake2_rfc
+  crate_byteorder
+  crate_constant_time_eq
+  crate_crossbeam
+  crate_digest
+  crate_fuchsia_zircon
+  crate_fuchsia_zircon_sys
+  crate_futures_cpupool
+  crate_futures
+  crate_generic_array
+  crate_lazy_static
+  crate_libc
+  crate_nodrop
+  crate_num_cpus
+  crate_pairing
+  crate_rand
+  crate_sapling_crypto
+  crate_typenum
+  crate_winapi_i686_pc_windows_gnu
+  crate_winapi
+  crate_winapi_x86_64_pc_windows_gnu
+)
 make install \
 native_packages='' \
-packages='bdb crate_libc librustzcash'
+packages="bdb ${rust_crates[*]} librustzcash"
 cd ..
 
 BUILD="$(./depends/config.guess)"
@@ -55,7 +82,7 @@
 check() {
 cd ${pkgname}
 
-./zcutil/fetch-params.sh
+./zcutil/fetch-params.sh --testnet
 # ./qa/zcash/full_test_suite.py
 ./qa/pull-tester/rpc-tests.sh
 }

Modified: use-system-rust.patch
===
--- use-system-rust.patch   2018-06-01 21:28:29 UTC (rev 337029)
+++ use-system-rust.patch   2018-06-01 23:33:13 UTC (rev 337030)
@@ -2,8 +2,8 @@
 +++ b/depends/packages/librustzcash.mk
 @@ -5,7 +5,7 @@
  $(package)_download_file=$($(package)_git_commit).tar.gz
- 
$(package)_sha256_hash=a5760a90d4a1045c8944204f29fa2a3cf2f800afee400f88bf89bbfe2cce1279
- $(package)_git_commit=91348647a86201a9482ad4ad68398152dc3d635e
+ 
$(package)_sha256_hash=1fb331a92b63da41e95ef9db671982d243a13bcd6d25570760c9ca83b8996887
+ $(package)_git_commit=36d7acf3f37570f499fc8fe79fda372e5eb873ca
 -$(package)_dependencies=rust $(rust_crates)
 +$(package)_dependencies=$(rust_crates)
  $(package)_patches=cargo.config