summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorquininer kel2016-02-23 17:45:40 +0800
committerquininer kel2016-02-23 17:46:05 +0800
commit14c6b4f7356f7a9ea9dcf02dbc2fe076b077ba56 (patch)
tree892349b599bf97b9e2d350f94e5521da691484e5
parent4952bea6e564663049f3e6b78a9b1a362d269442 (diff)
downloadaur-14c6b4f7356f7a9ea9dcf02dbc2fe076b077ba56.tar.gz
remove patch
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD8
-rw-r--r--fix-ctrlc.patch12
-rw-r--r--fix-heapsize.patch12
4 files changed, 4 insertions, 36 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a90a70181ac..d0c3d9e34f1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Sun Feb 21 16:42:05 UTC 2016
+# Tue Feb 23 09:45:55 UTC 2016
pkgbase = parity-git
pkgdesc = Fast, light, robust Ethereum implementation
- pkgver = 0.9.99.2244
+ pkgver = 0.9.99.2261
pkgrel = 1
url = https://github.com/ethcore/parity
arch = i686
@@ -16,11 +16,7 @@ pkgbase = parity-git
provides = parity
conflicts = parity
source = git://github.com/ethcore/parity.git
- source = fix-heapsize.patch
- source = fix-ctrlc.patch
sha256sums = SKIP
- sha256sums = 3b2f97b2f7905580a3402be36acdff8f61fc248d0c1a0d7831742e2913f81c73
- sha256sums = 203ef0e968a0eb46c6b2cde37f291d9f4584d615a9c51fd6e31804ae7dce5e30
pkgname = parity-git
diff --git a/PKGBUILD b/PKGBUILD
index 12de4ad50ce..b6865e17385 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@ pkgname=parity-git
_pkgname=parity
pkgdesc="Fast, light, robust Ethereum implementation"
pkgrel=1
-pkgver=0.9.99.2244
+pkgver=0.9.99.2261
arch=('i686' 'x86_64')
conflicts=("parity")
provides=("parity")
@@ -10,11 +10,9 @@ url="https://github.com/ethcore/parity"
license=('AGPL-3.0')
depends=('rocksdb')
makedepends=('rust' 'cargo' 'git' 'python-pytoml')
-source=('git://github.com/ethcore/parity.git' 'fix-heapsize.patch' 'fix-ctrlc.patch')
+source=('git://github.com/ethcore/parity.git')
sha256sums=(
'SKIP'
- '3b2f97b2f7905580a3402be36acdff8f61fc248d0c1a0d7831742e2913f81c73'
- '203ef0e968a0eb46c6b2cde37f291d9f4584d615a9c51fd6e31804ae7dce5e30'
)
pkgver() {
@@ -24,8 +22,6 @@ pkgver() {
build() {
cd $_pkgname
- patch ./Cargo.toml <../fix-ctrlc.patch
- patch ./util/Cargo.toml <../fix-heapsize.patch
cargo update
cargo build --release
}
diff --git a/fix-ctrlc.patch b/fix-ctrlc.patch
deleted file mode 100644
index e8cb16b396a..00000000000
--- a/fix-ctrlc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -10,7 +10,7 @@ log = "0.3"
- env_logger = "0.3"
- rustc-serialize = "0.3"
- docopt = "0.6"
--ctrlc = { git = "https://github.com/tomusdrw/rust-ctrlc.git" }
-+ctrlc = { git = "https://github.com/quininer/rust-ctrlc.git", branch = "parity" }
- clippy = { version = "0.0.42", optional = true }
- ethcore-util = { path = "util" }
- ethcore = { path = "ethcore" }
diff --git a/fix-heapsize.patch b/fix-heapsize.patch
deleted file mode 100644
index a63d93f4f2d..00000000000
--- a/fix-heapsize.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -20,7 +20,7 @@ lazy_static = "0.1"
- eth-secp256k1 = { git = "https://github.com/arkpar/rust-secp256k1.git" }
- rust-crypto = "0.2.34"
- elastic-array = "0.4"
--heapsize = "0.3"
-+heapsize = { git = "https://github.com/NikVolf/heapsize.git" }
- itertools = "0.4"
- crossbeam = "0.2"
- slab = { git = "https://github.com/arkpar/slab.git" }