summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authordevelnk2019-11-09 17:48:31 +0300
committerdevelnk2019-11-09 17:48:31 +0300
commitddbc4a2c00816e2d5266472290705f661f28bd89 (patch)
treec6bac661c2607c2ff2d8b4d61a1c6a50e5aa4247
parent1f6c896abfeb29f9fb3840b9237e9ea6f9d5439a (diff)
downloadaur-ddbc4a2c00816e2d5266472290705f661f28bd89.tar.gz
Update version 2.1.0
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD6
-rw-r--r--use-system-rust.patch10
3 files changed, 14 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 998cb6832526..77ddde899b8d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -5,12 +5,15 @@ pkgbase = asofe
url = https://asofe.org/
arch = x86_64
license = MIT
+ checkdepends = python2-pyblake2
+ checkdepends = python2-pyzmq
+ checkdepends = python2-qpid-proton
makedepends = boost
makedepends = cmake
makedepends = git
makedepends = gmock
makedepends = python
- makedepends = rustup
+ makedepends = rust
makedepends = wget
depends = boost-libs
depends = libevent
@@ -22,7 +25,7 @@ pkgbase = asofe
source = asofed.service
sha512sums = SKIP
sha512sums = 019870971a0cec093d0552585f4140f39dd65f90cb56b97e512bbaf0d79c0f1574295e722310d4e1762af12ff693802fc465765d4d1410d209e259326f307d6a
- sha512sums = e2bdf46696e70a93ffcb45bf4e081c780cda8f11f6fa346b6807731f7c739f18c689c4e78a71f8bd7099874108b6b6584b8a96395bbca8d5441f7600a3fe0ebe
+ sha512sums = 8878b5c805d6cdf159dbac0ef73fb47d0fbd2fc35332f1c15f05d6041c0eca7f16b12aeb1cc20615d0a325a68e8d22bb3961cadebbfa54b87783ad5de35b92fb
sha512sums = bfc39352e50078c7897ae3b8167f06d152f26c52dc7199ae952bad85b99a9da4f9d25d63edfe52291ad27b6e08b828c5db205eb0dc6091ec3fc75dc2b1bfca19
pkgname = asofe
diff --git a/PKGBUILD b/PKGBUILD
index d8b7eaa358bd..c1c71d033c82 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,15 +10,15 @@ arch=('x86_64')
url='https://asofe.org/'
license=('MIT')
depends=('boost-libs' 'libevent' 'qpid-proton' 'zeromq')
-makedepends=('boost' 'cmake' 'git' 'gmock' 'python' 'rustup' 'wget')
-heckdepends=('python2-pyblake2' 'python2-pyzmq' 'python2-qpid-proton')
+makedepends=('boost' 'cmake' 'git' 'gmock' 'python' 'rust' 'wget')
+checkdepends=('python2-pyblake2' 'python2-pyzmq' 'python2-qpid-proton')
source=("git+https://github.com/TheLightSide/asofe.git#commit=${_commit}"
'use-system-qpid-proton.patch'
'use-system-rust.patch'
'asofed.service')
sha512sums=('SKIP'
'019870971a0cec093d0552585f4140f39dd65f90cb56b97e512bbaf0d79c0f1574295e722310d4e1762af12ff693802fc465765d4d1410d209e259326f307d6a'
- 'e2bdf46696e70a93ffcb45bf4e081c780cda8f11f6fa346b6807731f7c739f18c689c4e78a71f8bd7099874108b6b6584b8a96395bbca8d5441f7600a3fe0ebe'
+ '8878b5c805d6cdf159dbac0ef73fb47d0fbd2fc35332f1c15f05d6041c0eca7f16b12aeb1cc20615d0a325a68e8d22bb3961cadebbfa54b87783ad5de35b92fb'
'bfc39352e50078c7897ae3b8167f06d152f26c52dc7199ae952bad85b99a9da4f9d25d63edfe52291ad27b6e08b828c5db205eb0dc6091ec3fc75dc2b1bfca19')
prepare() {
diff --git a/use-system-rust.patch b/use-system-rust.patch
index b9abf1664302..bf5bf945cce6 100644
--- a/use-system-rust.patch
+++ b/use-system-rust.patch
@@ -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