From f589fb79937ca8897af264486a2b177e0bdd288f Mon Sep 17 00:00:00 2001 From: Evgeny Ermakov Date: Fri, 12 Mar 2021 06:54:57 +1100 Subject: [PATCH] bitcoin: update to 0.21.0. --- srcpkgs/bitcoin/patches/qt5.15.patch | 10 ------- srcpkgs/bitcoin/template | 42 +++++++++++++++++----------- 2 files changed, 26 insertions(+), 26 deletions(-) delete mode 100644 srcpkgs/bitcoin/patches/qt5.15.patch diff --git a/srcpkgs/bitcoin/patches/qt5.15.patch b/srcpkgs/bitcoin/patches/qt5.15.patch deleted file mode 100644 index adfe3604717..00000000000 --- a/srcpkgs/bitcoin/patches/qt5.15.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- src/qt/trafficgraphwidget.cpp 2020-03-04 13:13:02.000000000 +0100 -+++ - 2020-07-02 17:58:16.576242713 +0200 -@@ -6,6 +6,7 @@ - #include - #include - -+#include - #include - #include - #include diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template index 3506a68aaeb..750da6e90b7 100644 --- a/srcpkgs/bitcoin/template +++ b/srcpkgs/bitcoin/template @@ -1,39 +1,49 @@ # Template file for 'bitcoin' pkgname=bitcoin -version=0.19.1 -revision=4 +version=0.21.0 +revision=1 build_style=gnu-configure configure_args="--with-incompatible-bdb --disable-ccache --disable-static - --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr" -hostmakedepends="pkg-config yasm" -makedepends="db-devel boost-devel miniupnpc-devel - libevent-devel qrencode-devel libatomic-devel" + --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr --with-gui" +hostmakedepends="automake libtool pkg-config yasm" +makedepends="db-devel boost-devel miniupnpc-devel qt5-tools-devel + libevent-devel qrencode-devel libatomic-devel sqlite-devel" short_desc="Bitcoin is a peer-to-peer network based digital currency" maintainer="Orphaned " license="MIT" homepage="https://bitcoin.org/" distfiles="https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz - https://raw.github.com/bitcoin-core/packaging/master/debian/bitcoin-qt.desktop - https://raw.github.com/bitcoin/bitcoin/v${version}/share/pixmaps/bitcoin128.png" -checksum="f2591d555b8e8c2e1bd780e40d53a91e165d8b3c7e0391ae2d24a0c0f23a7cc0 + https://raw.githubusercontent.com/bitcoin-core/packaging/master/debian/bitcoin-qt.desktop + https://raw.githubusercontent.com/bitcoin/bitcoin/v${version}/share/pixmaps/bitcoin128.png" +checksum="1a91202c62ee49fb64d57a52b8d6d01cd392fffcbef257b573800f9289655f37 0a46bbadda140599e807be38999e6848c89f9c3523d26fede02d34d62d50f632 ad880c8459ecfdb96abe6a4689af06bdd27906e0edcd39d0915482f2da91e722" conflicts="litecoin>=0" # Both provide libbitcoinconsensus.so.0 skip_extraction="bitcoin-qt.desktop bitcoin128.png" -subpackages="bitcoin-devel" -if [ -z "$CROSS_BUILD" ]; then - # XXX -qt subpkg - makedepends+=" qt5-devel qt5-tools-devel" - configure_args+=" --with-gui" - subpackages+=" bitcoin-qt" +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" qt5-host-tools" fi +pre_configure() { + autoreconf -fi + case "$XBPS_TARGET_MACHINE" in + aarch64*) + CFLAGS=${CFLAGS/armv8-a/armv8-a+crc+crypto} + CXXFLAGS=${CXXFLAGS/armv8-a/armv8-a+crc+crypto} + ;; + esac +} + +pre_build() { + export BITCOIN_GENBUILD_NO_GIT=1 +} + post_install() { rm "${DESTDIR}"/usr/bin/{test,bench}_bitcoin for b in bitcoind bitcoin-cli bitcoin-tx; do - vinstall contrib/${b}.bash-completion 644 usr/share/bash-completion $b + vcompletion contrib/${b}.bash-completion bash $b done vlicense COPYING