public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoin-cli/files/, net-p2p/bitcoin-cli/
Date: Mon, 10 Apr 2023 04:11:08 +0000 (UTC)	[thread overview]
Message-ID: <1681099574.cc8c224903f48c9154a66e70383ef72b706c2d38.sam@gentoo> (raw)

commit:     cc8c224903f48c9154a66e70383ef72b706c2d38
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 10 04:06:14 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 10 04:06:14 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc8c2249

net-p2p/bitcoin-cli: fix build w/ gcc 13

Closes: https://bugs.gentoo.org/895814
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-p2p/bitcoin-cli/bitcoin-cli-24.0.1-r1.ebuild |  1 +
 net-p2p/bitcoin-cli/files/24.0.1-gcc13.patch     | 39 ++++++++++++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/net-p2p/bitcoin-cli/bitcoin-cli-24.0.1-r1.ebuild b/net-p2p/bitcoin-cli/bitcoin-cli-24.0.1-r1.ebuild
index 61cee04d2c9c..c93ec569cf67 100644
--- a/net-p2p/bitcoin-cli/bitcoin-cli-24.0.1-r1.ebuild
+++ b/net-p2p/bitcoin-cli/bitcoin-cli-24.0.1-r1.ebuild
@@ -29,6 +29,7 @@ DOCS=( doc/release-notes.md )
 
 PATCHES=(
 	"${FILESDIR}"/24.0.1-syslibs.patch
+	"${FILESDIR}"/24.0.1-gcc13.patch
 )
 
 pkg_pretend() {

diff --git a/net-p2p/bitcoin-cli/files/24.0.1-gcc13.patch b/net-p2p/bitcoin-cli/files/24.0.1-gcc13.patch
new file mode 100644
index 000000000000..39cf81b14953
--- /dev/null
+++ b/net-p2p/bitcoin-cli/files/24.0.1-gcc13.patch
@@ -0,0 +1,39 @@
+https://bugs.gentoo.org/903781
+https://bugs.gentoo.org/900246
+https://bugs.gentoo.org/895814
+https://bugs.gentoo.org/894734
+https://github.com/bitcoin/bitcoin/commit/fadeb6b103cb441e0e91ef506ef29febabb10715
+
+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
+
+--- a/src/support/lockedpool.cpp
++++ b/src/support/lockedpool.cpp
+@@ -19,6 +19,9 @@
+ #endif
+ 
+ #include <algorithm>
++#include <limits>
++#include <stdexcept>
++#include <utility>
+ #ifdef ARENA_DEBUG
+ #include <iomanip>
+ #include <iostream>
+--- 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 <stdint.h>
++#include <cstddef>
+ #include <list>
+ #include <map>
+-#include <mutex>
+ #include <memory>
++#include <mutex>
+ #include <unordered_map>
+ 
+ /**


                 reply	other threads:[~2023-04-10  4:11 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1681099574.cc8c224903f48c9154a66e70383ef72b706c2d38.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox