[PR PATCH] bitcoin: update to 0.21.0.

[PR PATCH] bitcoin: update to 0.21.0.

[unspecd]

[-- Attachment #1: Type: text/plain, Size: 1547 bytes --]

There is a new pull request by unspecd against master on the void-packages repository

https://github.com/unspecd/void-packages pkg/bitcoin
https://github.com/void-linux/void-packages/pull/29406

bitcoin: update to 0.21.0.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, x86_64-musl
- [x] I built this PR locally for these architectures:
  - [x] aarch64-musl
  - [x] armv7l
  - [x] armv6l-musl


A patch file from https://github.com/void-linux/void-packages/pull/29406.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/bitcoin-29406.patch --]
[-- Type: text/x-diff, Size: 3566 bytes --]

From f589fb79937ca8897af264486a2b177e0bdd288f Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
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 <qt/trafficgraphwidget.h>
- #include <qt/clientmodel.h>
- 
-+#include <QPainterPath>
- #include <QPainter>
- #include <QColor>
- #include <QTimer>
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 <orphan@voidlinux.org>"
 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

Re: [PR REVIEW] bitcoin: update to 0.21.0.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 220 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29406#discussion_r592774880

Comment:
Please don't get it from mater (it's an error from the previous version).

Re: [PR PATCH] [Updated] bitcoin: update to 0.21.0.

[unspecd]

[-- Attachment #1: Type: text/plain, Size: 1552 bytes --]

There is an updated pull request by unspecd against master on the void-packages repository

https://github.com/unspecd/void-packages pkg/bitcoin
https://github.com/void-linux/void-packages/pull/29406

bitcoin: update to 0.21.0.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, x86_64-musl
- [x] I built this PR locally for these architectures:
  - [x] aarch64-musl
  - [x] armv7l
  - [x] armv6l-musl


A patch file from https://github.com/void-linux/void-packages/pull/29406.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/bitcoin-29406.patch --]
[-- Type: text/x-diff, Size: 3591 bytes --]

From c15973bdd531fc2a5cacaf2b6fbeea28d2f1cc56 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Fri, 12 Mar 2021 06:54:57 +1100
Subject: [PATCH] bitcoin: update to 0.21.0.

- fix cross build
---
 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 <qt/trafficgraphwidget.h>
- #include <qt/clientmodel.h>
- 
-+#include <QPainterPath>
- #include <QPainter>
- #include <QColor>
- #include <QTimer>
diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 3506a68aaeb..ed8800a1471 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 <orphan@voidlinux.org>"
 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/${version%.*}/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

Re: [PR REVIEW] bitcoin: update to 0.21.0.

[unspecd]

[-- Attachment #1: Type: text/plain, Size: 203 bytes --]

New review comment by unspecd on void-packages repository

https://github.com/void-linux/void-packages/pull/29406#discussion_r592865272

Comment:
> mater

Do you mean 'master'? Anyway, updated the PR.

Re: [PR REVIEW] bitcoin: update to 0.21.0.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 219 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29406#discussion_r592889015

Comment:
Can you explain why this is necessary? Does it fail to build without it?

Re: [PR REVIEW] bitcoin: update to 0.21.0.

[unspecd]

[-- Attachment #1: Type: text/plain, Size: 717 bytes --]

New review comment by unspecd on void-packages repository

https://github.com/void-linux/void-packages/pull/29406#discussion_r592891788

Comment:
Yes, it does. Simple test:
```c
/* sample.c */
#include <arm_acle.h>

int main()
{
    __crc32cd(0, 0);
    return 0;
}
```
```console
$ aarch64-linux-musl-gcc sample.c
/usr/lib/gcc/aarch64-linux-musl/10.2/include/arm_acle.h:128:1: error: inlining failed in call to 'always_inline' '__crc32cd': target specific option mismatch
  128 | __crc32cd (uint32_t __a, uint64_t __b)
      | ^~~~~~~~~
sample.c:5:5: note: called from here
    5 |     __crc32cd(0, 0);
```
```console
$ aarch64-linux-musl-gcc -march=armv8-a+crc+crypto sample.c ; echo $?
0
```

Re: [PR PATCH] [Merged]: bitcoin: update to 0.21.0.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1392 bytes --]

There's a merged pull request on the void-packages repository

bitcoin: update to 0.21.0.
https://github.com/void-linux/void-packages/pull/29406

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, x86_64-musl
- [x] I built this PR locally for these architectures:
  - [x] aarch64-musl
  - [x] armv7l
  - [x] armv6l-musl