From e0ffd9de84140d56404e61b06c6da58fcd8388a0ed6ae2fffa9f41fa0c1b109a Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Wed, 17 Jun 2020 12:15:12 +0000 Subject: [PATCH] Accepting request 815500 from home:polslinux:branches:network:cryptocurrencies - Add fix-qpainterpath.patch - Add -fcommon to allow building against GCC10 OBS-URL: https://build.opensuse.org/request/show/815500 OBS-URL: https://build.opensuse.org/package/show/network:cryptocurrencies/bitcoin?expand=0&rev=32 --- bitcoin.changes | 6 ++++++ bitcoin.spec | 6 ++++-- fix-qpainterpath.patch | 10 ++++++++++ 3 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 fix-qpainterpath.patch diff --git a/bitcoin.changes b/bitcoin.changes index e33d255..b4ba228 100644 --- a/bitcoin.changes +++ b/bitcoin.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jun 17 11:57:34 UTC 2020 - Paolo Stivanin + +- Add fix-qpainterpath.patch +- Add -fcommon to allow building against GCC10 + ------------------------------------------------------------------- Fri Jun 12 05:39:25 UTC 2020 - Martin Pluskal diff --git a/bitcoin.spec b/bitcoin.spec index d3d91e5..b8ac873 100644 --- a/bitcoin.spec +++ b/bitcoin.spec @@ -34,6 +34,7 @@ Source0: https://github.com/%{name}/%{name}/archive/v%{version}.tar.gz#/% Source1: %{base}d.service Source3: %{base}d.conf Source4: %{base}.conf +Patch0: fix-qpainterpath.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++ @@ -170,11 +171,12 @@ This package provides automated tests for %{name}-qt5 and %{name}d. %prep %setup -q +%patch0 -p1 %build autoreconf -fiv -export CXXFLAGS="%{optflags} -fPIE -fPIC" -export CFLAGS="%{optflags} -fPIE -fPIC" +export CXXFLAGS="%{optflags} -fPIE -fPIC -fcommon" +export CFLAGS="%{optflags} -fPIE -fPIC -fcommon" export LDFLAGS="-pie" # Autodetecting if assembly optimizazions for secp256k1 can be used does not diff --git a/fix-qpainterpath.patch b/fix-qpainterpath.patch new file mode 100644 index 0000000..16a9553 --- /dev/null +++ b/fix-qpainterpath.patch @@ -0,0 +1,10 @@ +--- bitcoin-0.20.0/src/qt/trafficgraphwidget.cpp.orig 2020-06-17 13:42:31.658215250 +0200 ++++ bitcoin-0.20.0/src/qt/trafficgraphwidget.cpp 2020-06-17 13:42:39.286235611 +0200 +@@ -7,6 +7,7 @@ + #include + + #include ++#include + #include + #include +