summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorUncle Hunto2015-10-08 17:42:12 -0700
committerUncle Hunto2015-10-08 17:42:12 -0700
commit0bb167532cc7cf440edc1589491bda1b3ea39965 (patch)
tree4cfc260ee9123276589061fd13029b1c5d2190fb
parent06b6eec74af01378374f5b07f62be5a66b8342cc (diff)
downloadaur-0bb167532cc7cf440edc1589491bda1b3ea39965.tar.gz
Added Patch
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD15
2 files changed, 14 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index fdbd38680d7..d1cd74aacb5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = bitcoin-gui-git
pkgdesc = Bitcoind, bitcoin-cli, bitcoin-tx, and bitcoin-qt, most recent stable branch, w/GUI and wallet
pkgver = v0.11.0.r12.g5c27f12
- pkgrel = 1
+ pkgrel = 2
url = https://bitcoinxt.software/
install = bitcoin-qt.install
arch = i686
@@ -27,8 +27,10 @@ pkgbase = bitcoin-gui-git
conflicts = bitcoin-qt
conflicts = bitcoin-tx
source = git+https://github.com/bitcoin/bitcoin.git#branch=0.11
+ source = https://github.com/bitcoin/bitcoin/commit/9f3e48e5219a09b5ddfd6883d1f0498910eff4b6.patch
source = bitcoin-qt.install
sha256sums = SKIP
+ sha256sums = 0910004577764c2251a33c4868c7358a42da68f94d6462e44bbcb1945cefd748
sha256sums = ebf7090ca1202e2c2ccd1aa5bb03e6ac911c458141a1cedda9b41f9c26c2602c
pkgname = bitcoin-gui-git
diff --git a/PKGBUILD b/PKGBUILD
index aaab2461eda..c4437b8a278 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=bitcoin-gui-git
pkgver=v0.11.0.r12.g5c27f12
-pkgrel=1
+pkgrel=2
pkgdesc='Bitcoind, bitcoin-cli, bitcoin-tx, and bitcoin-qt, most recent stable branch, w/GUI and wallet'
arch=('i686' 'x86_64')
url="https://bitcoinxt.software/"
@@ -13,20 +13,27 @@ provides=('bitcoin-daemon' 'bitcoin-cli' 'bitcoin-qt' 'bitcoin-tx')
conflicts=('bitcoin-daemon' 'bitcoin-cli' 'bitcoin-qt' 'bitcoin-tx')
install=bitcoin-qt.install
source=('git+https://github.com/bitcoin/bitcoin.git#branch=0.11'
- 'bitcoin-qt.install')
+ 'https://github.com/bitcoin/bitcoin/commit/9f3e48e5219a09b5ddfd6883d1f0498910eff4b6.patch'
+ 'bitcoin-qt.install')
sha256sums=('SKIP'
+ '0910004577764c2251a33c4868c7358a42da68f94d6462e44bbcb1945cefd748'
'ebf7090ca1202e2c2ccd1aa5bb03e6ac911c458141a1cedda9b41f9c26c2602c')
pkgver() {
- cd ${srcdir}/bitcoin
+ cd "$srcdir/bitcoin"
git describe --long --tags | sed -E 's/([^-]*-g)/r\1/;s/-/./g'
}
+prepare() {
+ cd "$srcdir/bitcoin"
+ patch -Np1 -i "$srcdir"/9f3e48e5219a09b5ddfd6883d1f0498910eff4b6.patch
+}
+
build() {
cd "$srcdir/bitcoin"
msg2 'Building...'
- CXXFLAGS="$CXXFLAGS -DBOOST_VARIANT_USE_RELAXED_GET_BY_DEFAULT=1"
+ CXXFLAGS="$CXXFLAGS -DBOOST_VARIANT_USE_RELAXED_GET_BY_DEFAULT=1 -UUPNPDISCOVER_SUCCESS"
./autogen.sh
./configure --prefix=/usr --with-incompatible-bdb --with-gui=qt4
make