diff options
| author | Luca Weiss <luca@z3ntu.xyz> | 2020-08-05 19:26:35 +0200 |
|---|---|---|
| committer | Rasmus Thomsen <oss@cogitri.dev> | 2020-08-07 19:44:41 +0000 |
| commit | 785e463801ba428a83972c6b953566d54864eb45 (patch) | |
| tree | 7a63892de8d674fc624144f313065224d7367e04 | |
| parent | d6be4486213cc87d4ef0bd74343d6fd6a336aa23 (diff) | |
community/bitcoin: fix build with Qt 5.15
| -rw-r--r-- | community/bitcoin/0001-Add-missing-QPainterPath-include.patch | 25 | ||||
| -rw-r--r-- | community/bitcoin/APKBUILD | 4 |
2 files changed, 28 insertions, 1 deletions
diff --git a/community/bitcoin/0001-Add-missing-QPainterPath-include.patch b/community/bitcoin/0001-Add-missing-QPainterPath-include.patch new file mode 100644 index 00000000000..f713dd73f23 --- /dev/null +++ b/community/bitcoin/0001-Add-missing-QPainterPath-include.patch @@ -0,0 +1,25 @@ +From 79b0a69e09c1a912122e6431ea3c530cc292c690 Mon Sep 17 00:00:00 2001 +From: Andrew Chow <achow101-github@achow101.com> +Date: Thu, 28 May 2020 14:56:47 -0400 +Subject: [PATCH] Add missing QPainterPath include + +This is needed to compile with Qt 5.15. +--- + src/qt/trafficgraphwidget.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/qt/trafficgraphwidget.cpp b/src/qt/trafficgraphwidget.cpp +index 757648f48..6428fc4da 100644 +--- a/src/qt/trafficgraphwidget.cpp ++++ b/src/qt/trafficgraphwidget.cpp +@@ -7,6 +7,7 @@ + #include <qt/clientmodel.h> + + #include <QPainter> ++#include <QPainterPath> + #include <QColor> + #include <QTimer> + +-- +2.27.0 + diff --git a/community/bitcoin/APKBUILD b/community/bitcoin/APKBUILD index 2fedcea4e64..bacc8ba3027 100644 --- a/community/bitcoin/APKBUILD +++ b/community/bitcoin/APKBUILD @@ -5,7 +5,7 @@ pkgver=0.20.0 pkgrel=0 pkgdesc="Decentralized P2P electronic cash system" url="https://www.bitcoin.org" -arch="all !armhf" +arch="all !armhf !x86" # x86: segfault in check license="MIT" makedepends="autoconf automake libtool boost-dev openssl-dev db-dev miniupnpc-dev qt5-qtbase-dev qt5-qttools-dev protobuf-dev libqrencode-dev libevent-dev chrpath zeromq-dev" @@ -14,6 +14,7 @@ subpackages="$pkgname-dev $pkgname-qt $pkgname-cli $pkgname-tx $pkgname-tests $p $pkgname-doc $pkgname-openrc" source="$pkgname-$pkgver.tar.gz::https://github.com/bitcoin/bitcoin/archive/v$pkgver.tar.gz ssize_t.patch + 0001-Add-missing-QPainterPath-include.patch $pkgname.initd $pkgname.conf " @@ -89,5 +90,6 @@ dev() { sha512sums="8ca27f0ddab8738b909d6381112f78eb1002c97e260b78c70e885cb03dd106d87ab3aad59ffbb3bd9c8f6b9c33c46356eb4987ffb02345e6574b25e210ddbd96 bitcoin-0.20.0.tar.gz 98aa5ad81bdb4ae961b791bc978c39117cdf2d83c2181f92bebbb0db107d9b6e86eda265fb3f93ff8a5ca8a7754d7148818b98095d57201dff9363d60b97e7dd ssize_t.patch +627f2c9b0af06c3b40eb65cec1faf0a1e42418435e193685c3fcc651fb72f3221bb548aac12f39ca218c70f4a7a9b702606d1ee1629cfd19374a3d49c7082569 0001-Add-missing-QPainterPath-include.patch 71e5f3b5079a22b6ddecfad89363fc642d5ea7da18f1203057f626d214734467f4b933b839c269401be7af2c3dcc01afcb3b98198b7d580c56d8740b34451558 bitcoin.initd a31210d8db76c5a9b614a6de756c1678c0344898565ac3e5d6a34ac1bed66aec4964f1dc874294bc978f53b0e961df921655f7309df19b66c90aa6bd40379a09 bitcoin.conf" |