aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTBK <tbk@jjtc.eu>2020-03-08 18:37:32 +0100
committerRasmus Thomsen <oss@cogitri.dev>2020-03-08 22:24:53 +0100
commit822fddb2ebdef17f27060df194412f3449b3e49f (patch)
treea7308f3c3b43e364ad0a3eac5741471f9c2081a6
parent8a4b26ab2958d398b2e0ecf699bfb0d5db3a47f8 (diff)
downloadaports-822fddb2ebdef17f27060df194412f3449b3e49f.tar.gz
aports-822fddb2ebdef17f27060df194412f3449b3e49f.tar.bz2
aports-822fddb2ebdef17f27060df194412f3449b3e49f.tar.xz
community/bitcoin: upgrade to 0.19.1
-rw-r--r--community/bitcoin/APKBUILD27
-rw-r--r--community/bitcoin/wallet-unbreak-with-boost-1.72.patch24
2 files changed, 12 insertions, 39 deletions
diff --git a/community/bitcoin/APKBUILD b/community/bitcoin/APKBUILD
index ae9b5a0831..2252188504 100644
--- a/community/bitcoin/APKBUILD
+++ b/community/bitcoin/APKBUILD
@@ -1,8 +1,7 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
pkgname=bitcoin
-pkgver=0.19.0.1
-_ver=${pkgver/_/}
+pkgver=0.19.1
pkgrel=0
pkgdesc="Decentralized P2P electronic cash system"
url="https://www.bitcoin.org"
@@ -13,17 +12,18 @@ makedepends="autoconf automake libtool boost-dev openssl-dev db-dev miniupnpc-de
install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-install"
subpackages="$pkgname-dev $pkgname-qt $pkgname-cli $pkgname-tx $pkgname-tests $pkgname-bench
$pkgname-doc $pkgname-openrc"
-source="$pkgname-$_ver.tar.gz::https://github.com/bitcoin/bitcoin/archive/v${_ver}.tar.gz
+source="$pkgname-$pkgver.tar.gz::https://github.com/bitcoin/bitcoin/archive/v$pkgver.tar.gz
ssize_t.patch
- wallet-unbreak-with-boost-1.72.patch
$pkgname.initd
$pkgname.conf
"
-builddir="$srcdir/bitcoin-$_ver"
-build() {
- cd "$builddir"
+prepare() {
+ default_prepare
./autogen.sh
+}
+
+build() {
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -38,8 +38,11 @@ build() {
make
}
+check() {
+ make check
+}
+
package() {
- cd "$builddir"
make install DESTDIR="$pkgdir"
install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
install -m600 -D "$srcdir"/$pkgname.conf "$pkgdir"/etc/$pkgname.conf
@@ -84,13 +87,7 @@ dev() {
mv "$pkgdir"/usr/include "$subpkgdir"/usr/
}
-check() {
- cd "$builddir"
- make check
-}
-
-sha512sums="e8c1f22a604ffab04cbcabb344f5e8933d1c54413e4e84cbeff71f7ea5ba31fe9472aa3f684a7d02081c3eb2543524fb07aa97f130a4a22c8a6776b531d2b986 bitcoin-0.19.0.1.tar.gz
+sha512sums="a8750eac35c24a35b580d7b20f8a8ad9236ccffc28526b287581f9926cb6bfc7b4e953bdf251cfc3fafb451efbcaed7e073f90374c177383489158452a3caa79 bitcoin-0.19.1.tar.gz
98aa5ad81bdb4ae961b791bc978c39117cdf2d83c2181f92bebbb0db107d9b6e86eda265fb3f93ff8a5ca8a7754d7148818b98095d57201dff9363d60b97e7dd ssize_t.patch
-840c21ec405e5b326b6042addfe49f456aeb3d8fdbb6104fd9c72043f681c19373eadc5c7a215f70669d76e4148931f572e9b3769a8f03e5aa82d98d732df315 wallet-unbreak-with-boost-1.72.patch
71e5f3b5079a22b6ddecfad89363fc642d5ea7da18f1203057f626d214734467f4b933b839c269401be7af2c3dcc01afcb3b98198b7d580c56d8740b34451558 bitcoin.initd
a31210d8db76c5a9b614a6de756c1678c0344898565ac3e5d6a34ac1bed66aec4964f1dc874294bc978f53b0e961df921655f7309df19b66c90aa6bd40379a09 bitcoin.conf"
diff --git a/community/bitcoin/wallet-unbreak-with-boost-1.72.patch b/community/bitcoin/wallet-unbreak-with-boost-1.72.patch
deleted file mode 100644
index fe70adba57..0000000000
--- a/community/bitcoin/wallet-unbreak-with-boost-1.72.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From a64e97dd476bda7c7981979d045b0d06d6f7ce47 Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Mon, 2 Dec 2019 19:55:10 +0000
-Subject: [PATCH] wallet: unbreak with boost 1.72
-
-wallet/walletutil.cpp:77:23: error: no member named 'level' in 'boost::filesystem::recursive_directory_iterator'
- } else if (it.level() == 0 && it->symlink_status().type() == fs::regular_file && IsBerkeleyBtree(it...
- ~~ ^
----
- src/fs.h | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/fs.h b/src/fs.h
-index c713297d6ef0..8af81f173bdf 100644
---- a/src/fs.h
-+++ b/src/fs.h
-@@ -11,7 +11,6 @@
- #include <ext/stdio_filebuf.h>
- #endif
-
--#define BOOST_FILESYSTEM_NO_DEPRECATED
- #include <boost/filesystem.hpp>
- #include <boost/filesystem/fstream.hpp>
-