Date: Friday, November 11, 2022 @ 21:02:06 Author: kpcyrd Revision: 1346856
upgpkg: zcash 5.3.0-1 Modified: zcash/trunk/PKGBUILD Deleted: zcash/trunk/use-system-rust.patch -----------------------+ PKGBUILD | 50 ++++++++++++++++-------------------------------- use-system-rust.patch | 14 ------------- 2 files changed, 17 insertions(+), 47 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-11-11 20:57:45 UTC (rev 1346855) +++ PKGBUILD 2022-11-11 21:02:06 UTC (rev 1346856) @@ -1,35 +1,27 @@ # Maintainer: Nicola Squartini <[email protected]> +# Maintainer: kpcyrd <kpcyrd[at]archlinux[dot]org> pkgname=zcash -pkgver=5.0.0 -_commit=16b49eadd56086aae10f2907e5b8e77b773f1813 +pkgver=5.3.0 +_commit=35186b00928f3ba994f0e66bb234c412cbffc7b6 _db_version=6.2.23 -_db_sha256_hash=47612c8991aa9ac2f6be721267c8d3cdccf5ac83105df8e50809daea24e95dc7 -pkgrel=3 +pkgrel=1 pkgdesc='Permissionless financial system employing zero-knowledge security' arch=('x86_64') url='https://z.cash/' license=('MIT') -depends=('boost-libs' 'libevent' 'zeromq') -makedepends=('boost' 'cmake' 'git' 'gmock' 'python' 'rust' 'utf8cpp' 'wget') -checkdepends=('python-pyblake2' 'python-pyzmq' 'python-requests' - 'python-simplejson') +depends=('boost-libs' 'libevent' 'libsodium' 'zeromq') +makedepends=('boost' 'clang' 'cmake' 'cxxbridge' 'git' 'gmock' 'python' 'rust' 'utf8cpp' 'wget') +options=(!lto) 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') sha256sums=('SKIP' - "${_db_sha256_hash}" - '119e787cb22f2941ead286d2621fae7d6c4de6216e24615eb3c0f875e7a2547f' + '47612c8991aa9ac2f6be721267c8d3cdccf5ac83105df8e50809daea24e95dc7' '7b0919ac447824199aff8c17b5a5799b46414818c6aed314506c5295d0ce9ccd') -prepare() { - cd ${pkgname} - - # Set gitattributes on src/clientversion.cpp - git archive --format=tar ${_commit} -- src/clientversion.cpp | tar -xf - - - patch -Np1 -i ../use-system-rust.patch +get_rust_target() { + RUSTC_BOOTSTRAP=1 rustc -Z unstable-options --print target-spec-json | python -c 'import json,sys;obj=json.load(sys.stdin);print(obj["llvm-target"])' } build() { @@ -49,29 +41,21 @@ CPPFLAGS="${CPPFLAGS} -I${srcdir}/db-root/include -I/usr/include/utf8cpp" LDFLAGS="${LDFLAGS} -L${srcdir}/db-root/lib" - rust_target=$(RUSTC_BOOTSTRAP=1 rustc -Z unstable-options --print target-spec-json | python -c 'import json,sys;obj=json.load(sys.stdin);print(obj["llvm-target"])') + export CC=/usr/bin/clang + export CXX=/usr/bin/clang++ + ./autogen.sh ./configure --prefix=/usr \ --enable-online-rust - make RUST_TARGET="${rust_target}" + cp /usr/share/cxxbridge/cxx.h src/rust/include/rust/ + make RUST_TARGET="$(get_rust_target)" } -check() { - cd ${pkgname} - - ./zcutil/fetch-params.sh - - rust_target=$(RUSTC_BOOTSTRAP=1 rustc -Z unstable-options --print target-spec-json | python -c 'import json,sys;obj=json.load(sys.stdin);print(obj["llvm-target"])') - export RUST_TARGET="${rust_target}" - ./qa/zcash/full_test_suite.py || true -} - package() { cd ${pkgname} - rust_target=$(RUSTC_BOOTSTRAP=1 rustc -Z unstable-options --print target-spec-json | python -c 'import json,sys;obj=json.load(sys.stdin);print(obj["llvm-target"])') - make DESTDIR="${pkgdir}" RUST_TARGET="${rust_target}" install + make DESTDIR="${pkgdir}" RUST_TARGET="$(get_rust_target)" install for ext in '-cli' '-tx' 'd'; do install -Dm644 contrib/zcash${ext}.bash-completion \ @@ -78,6 +62,6 @@ "${pkgdir}"/usr/share/bash-completion/completions/zcash${ext} done - install -Dm644 -t "${pkgdir}"/usr/lib/systemd/user ../zcashd.service + install -Dm644 ../zcashd.service -t "${pkgdir}"/usr/lib/systemd/user install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/COPYING } Deleted: use-system-rust.patch =================================================================== --- use-system-rust.patch 2022-11-11 20:57:45 UTC (rev 1346855) +++ use-system-rust.patch 2022-11-11 21:02:06 UTC (rev 1346856) @@ -1,14 +0,0 @@ ---- a/qa/zcash/full_test_suite.py -+++ b/qa/zcash/full_test_suite.py -@@ -149,9 +149,9 @@ - return False - - 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'),
