From 286549ff5246ff645f7c38a5204a131db4acd5e8c0caefdb65084607ef41f755 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 11 Apr 2023 08:25:35 +0000 Subject: [PATCH] Accepting request 1077721 from home:dimstar:Factory - Add 392dc68e.patch: Fix build with gcc 13. OBS-URL: https://build.opensuse.org/request/show/1077721 OBS-URL: https://build.opensuse.org/package/show/network:cryptocurrencies/bitcoin?expand=0&rev=51 --- 392dc68e.patch | 42 ++++++++++++++++++++++++++++++++++++++++++ bitcoin.changes | 5 +++++ bitcoin.spec | 3 ++- 3 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 392dc68e.patch diff --git a/392dc68e.patch b/392dc68e.patch new file mode 100644 index 0000000..890173f --- /dev/null +++ b/392dc68e.patch @@ -0,0 +1,42 @@ +From fadeb6b103cb441e0e91ef506ef29febabb10715 Mon Sep 17 00:00:00 2001 +From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> +Date: Thu, 19 Jan 2023 19:35:43 +0100 +Subject: [PATCH] Add missing includes to fix gcc-13 compile error + +--- + src/support/lockedpool.cpp | 3 +++ + src/support/lockedpool.h | 4 ++-- + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/src/support/lockedpool.cpp b/src/support/lockedpool.cpp +index fb59324f7a890..8b057433309fe 100644 +--- a/src/support/lockedpool.cpp ++++ b/src/support/lockedpool.cpp +@@ -19,6 +19,9 @@ + #endif + + #include ++#include ++#include ++#include + #ifdef ARENA_DEBUG + #include + #include +diff --git a/src/support/lockedpool.h b/src/support/lockedpool.h +index 03e4e371a3a98..66fbc218abfd9 100644 +--- a/src/support/lockedpool.h ++++ b/src/support/lockedpool.h +@@ -5,11 +5,11 @@ + #ifndef BITCOIN_SUPPORT_LOCKEDPOOL_H + #define BITCOIN_SUPPORT_LOCKEDPOOL_H + +-#include ++#include + #include + #include +-#include + #include ++#include + #include + + /** diff --git a/bitcoin.changes b/bitcoin.changes index faa3ae0..4997507 100644 --- a/bitcoin.changes +++ b/bitcoin.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Apr 6 11:56:11 UTC 2023 - Dominique Leuenberger + +- Add 392dc68e.patch: Fix build with gcc 13. + ------------------------------------------------------------------- Tue Dec 20 15:28:42 UTC 2022 - Andrea Manzini diff --git a/bitcoin.spec b/bitcoin.spec index d79c1e2..e03a622 100644 --- a/bitcoin.spec +++ b/bitcoin.spec @@ -1,7 +1,7 @@ # # spec file for package bitcoin # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # Copyright (c) 2011-2014 P Rusnak # # All modifications and additions to the file contributed by third parties @@ -41,6 +41,7 @@ Source1: %{base}d.service Source3: %{base}d.conf Source4: %{base}.conf Patch0: harden_bitcoind.service.patch +Patch1: https://github.com/bitcoin/bitcoin/commit/392dc68e.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++