Merge bitcoin/bitcoin#26927 : [22.x] Backports

ea584a617c 23.x Add missing includes to fix gcc-13 compile error (fanquake) c21e6a9ce2 Add missing includes to fix gcc-13 compile error (MarcoFalke) Pull request description: Backports: * https://github.com/bitcoin/bitcoin/pull/26924 ACKs for top commit: instagibbs: ACK ea584a617c Tree-SHA512: e231d2e3e17f884eb9eb63f2f31829cef3e64351c9d6b90abeef421c366cef228a0a87b9c3a07c840879bd514ebe33b554fb62947c13bd05806865e59323cae7
23.x Add missing includes to fix gcc-13 compile error
2026-01-23 08:34:58 +01:00 · 2023-02-16 15:42:48 +00:00 · 2023-01-20 12:19:25 +00:00 · 2023-01-20 10:31:16 +00:00 · 2022-12-05 15:26:10 +00:00 · 2022-12-05 09:53:20 +00:00
13 changed files with 32 additions and 25 deletions
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.69])
 define(_CLIENT_VERSION_MAJOR, 22)
 define(_CLIENT_VERSION_MINOR, 1)
 define(_CLIENT_VERSION_BUILD, 0)
-define(_CLIENT_VERSION_RC, 2)
+define(_CLIENT_VERSION_RC, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2021)
 define(_COPYRIGHT_HOLDERS,[The %s developers])
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -1,6 +1,6 @@
 PACKAGE=qt
 $(package)_version=5.12.11
-$(package)_download_path=https://download.qt.io/official_releases/qt/5.12/$($(package)_version)/submodules
+$(package)_download_path=https://download.qt.io/archive/qt/5.12/$($(package)_version)/submodules
 $(package)_suffix=everywhere-src-$($(package)_version).tar.xz
 $(package)_file_name=qtbase-$($(package)_suffix)
 $(package)_sha256_hash=1c1b4e33137ca77881074c140d54c3c9747e845a31338cfe8680f171f0bc3a39
--- a/doc/man/bitcoin-cli.1
+++ b/doc/man/bitcoin-cli.1
@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.2.
-.TH BITCOIN-CLI "1" "November 2022" "bitcoin-cli v22.1.0rc2" "User Commands"
+.TH BITCOIN-CLI "1" "December 2022" "bitcoin-cli v22.1.0" "User Commands"
 .SH NAME
-bitcoin-cli \- manual page for bitcoin-cli v22.1.0rc2
+bitcoin-cli \- manual page for bitcoin-cli v22.1.0
 .SH SYNOPSIS
 .B bitcoin-cli
 [\fI\,options\/\fR] \fI\,<command> \/\fR[\fI\,params\/\fR]  \fI\,Send command to Bitcoin Core\/\fR
@@ -15,7 +15,7 @@ bitcoin-cli \- manual page for bitcoin-cli v22.1.0rc2
 .B bitcoin-cli
 [\fI\,options\/\fR] \fI\,help <command>      Get help for a command\/\fR
 .SH DESCRIPTION
-Bitcoin Core RPC client version v22.1.0rc2
+Bitcoin Core RPC client version v22.1.0
 .SH OPTIONS
 .HP
 \-?
--- a/doc/man/bitcoin-qt.1
+++ b/doc/man/bitcoin-qt.1
@@ -1,12 +1,12 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.2.
-.TH BITCOIN-QT "1" "November 2022" "bitcoin-qt v22.1.0rc2" "User Commands"
+.TH BITCOIN-QT "1" "December 2022" "bitcoin-qt v22.1.0" "User Commands"
 .SH NAME
-bitcoin-qt \- manual page for bitcoin-qt v22.1.0rc2
+bitcoin-qt \- manual page for bitcoin-qt v22.1.0
 .SH SYNOPSIS
 .B bitcoin-qt
 [\fI\,command-line options\/\fR]
 .SH DESCRIPTION
-Bitcoin Core version v22.1.0rc2
+Bitcoin Core version v22.1.0
 .SH OPTIONS
 .HP
 \-?
--- a/doc/man/bitcoin-tx.1
+++ b/doc/man/bitcoin-tx.1
@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.2.
-.TH BITCOIN-TX "1" "November 2022" "bitcoin-tx v22.1.0rc2" "User Commands"
+.TH BITCOIN-TX "1" "December 2022" "bitcoin-tx v22.1.0" "User Commands"
 .SH NAME
-bitcoin-tx \- manual page for bitcoin-tx v22.1.0rc2
+bitcoin-tx \- manual page for bitcoin-tx v22.1.0
 .SH SYNOPSIS
 .B bitcoin-tx
 [\fI\,options\/\fR] \fI\,<hex-tx> \/\fR[\fI\,commands\/\fR]  \fI\,Update hex-encoded bitcoin transaction\/\fR
@@ -9,7 +9,7 @@ bitcoin-tx \- manual page for bitcoin-tx v22.1.0rc2
 .B bitcoin-tx
 [\fI\,options\/\fR] \fI\,-create \/\fR[\fI\,commands\/\fR]   \fI\,Create hex-encoded bitcoin transaction\/\fR
 .SH DESCRIPTION
-Bitcoin Core bitcoin\-tx utility version v22.1.0rc2
+Bitcoin Core bitcoin\-tx utility version v22.1.0
 .SH OPTIONS
 .HP
 \-?
--- a/doc/man/bitcoin-util.1
+++ b/doc/man/bitcoin-util.1
@@ -1,12 +1,12 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.2.
-.TH BITCOIN-UTIL "1" "November 2022" "bitcoin-util v22.1.0rc2" "User Commands"
+.TH BITCOIN-UTIL "1" "December 2022" "bitcoin-util v22.1.0" "User Commands"
 .SH NAME
-bitcoin-util \- manual page for bitcoin-util v22.1.0rc2
+bitcoin-util \- manual page for bitcoin-util v22.1.0
 .SH SYNOPSIS
 .B bitcoin-util
 [\fI\,options\/\fR] [\fI\,commands\/\fR]  \fI\,Do stuff\/\fR
 .SH DESCRIPTION
-Bitcoin Core bitcoin\-util utility version v22.1.0rc2
+Bitcoin Core bitcoin\-util utility version v22.1.0
 .SH OPTIONS
 .HP
 \-?
--- a/doc/man/bitcoin-wallet.1
+++ b/doc/man/bitcoin-wallet.1
@@ -1,9 +1,9 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.2.
-.TH BITCOIN-WALLET "1" "November 2022" "bitcoin-wallet v22.1.0rc2" "User Commands"
+.TH BITCOIN-WALLET "1" "December 2022" "bitcoin-wallet v22.1.0" "User Commands"
 .SH NAME
-bitcoin-wallet \- manual page for bitcoin-wallet v22.1.0rc2
+bitcoin-wallet \- manual page for bitcoin-wallet v22.1.0
 .SH DESCRIPTION
-Bitcoin Core bitcoin\-wallet version v22.1.0rc2
+Bitcoin Core bitcoin\-wallet version v22.1.0
 .PP
 bitcoin\-wallet is an offline tool for creating and interacting with Bitcoin Core wallet files.
 By default bitcoin\-wallet will act on wallets in the default mainnet wallet directory in the datadir.
--- a/doc/man/bitcoind.1
+++ b/doc/man/bitcoind.1
@@ -1,12 +1,12 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.2.
-.TH BITCOIND "1" "November 2022" "bitcoind v22.1.0rc2" "User Commands"
+.TH BITCOIND "1" "December 2022" "bitcoind v22.1.0" "User Commands"
 .SH NAME
-bitcoind \- manual page for bitcoind v22.1.0rc2
+bitcoind \- manual page for bitcoind v22.1.0
 .SH SYNOPSIS
 .B bitcoind
 [\fI\,options\/\fR]                     \fI\,Start Bitcoin Core\/\fR
 .SH DESCRIPTION
-Bitcoin Core version v22.1.0rc2
+Bitcoin Core version v22.1.0
 Copyright \(co 2009\-2021 The Bitcoin Core developers
 .PP
 Please contribute if you find Bitcoin Core useful. Visit
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -1,7 +1,7 @@
-22.1rc2 Release Notes Draft
-===========================
+22.1 Release Notes
+==================

-Bitcoin Core version 22.1rc2 is now available from:
+Bitcoin Core version 22.1 is now available from:

  <https://bitcoincore.org/bin/bitcoin-core-22.1/>

@@ -76,6 +76,7 @@ Updated settings
 - #24256 build: Bump depends packages (zmq, libXau)
 - #25201 windeploy: Renewed windows code signing certificate
 - #25985 Revert "build: Use Homebrew's sqlite package if it is available"
+- #26633 depends: update qt 5.12 url to archive location

 ### GUI

@@ -106,6 +107,7 @@ Credits
 Thanks to everyone who directly contributed to this release:

 - Andrew Chow
+- BlackcoinDev
 - Carl Dong
 - Hennadii Stepanov
 - Joan Karadimov
--- a/src/support/lockedpool.cpp
+++ b/src/support/lockedpool.cpp
@@ -22,6 +22,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>

 /**
--- a/src/util/bip32.h
+++ b/src/util/bip32.h
@@ -6,6 +6,7 @@
 #define BITCOIN_UTIL_BIP32_H

 #include <attributes.h>
+#include <cstdint>
 #include <string>
 #include <vector>

--- a/src/util/string.h
+++ b/src/util/string.h
@@ -9,6 +9,7 @@

 #include <algorithm>
 #include <array>
+#include <cstdint>
 #include <cstring>
 #include <locale>
 #include <sstream>
Author	SHA1	Message	Date
fanquake	a896f61290	Merge bitcoin/bitcoin#26927 : [22.x] Backports `ea584a617c` 23.x Add missing includes to fix gcc-13 compile error (fanquake) `c21e6a9ce2` Add missing includes to fix gcc-13 compile error (MarcoFalke) Pull request description: Backports: * https://github.com/bitcoin/bitcoin/pull/26924 ACKs for top commit: instagibbs: ACK `ea584a617c` Tree-SHA512: e231d2e3e17f884eb9eb63f2f31829cef3e64351c9d6b90abeef421c366cef228a0a87b9c3a07c840879bd514ebe33b554fb62947c13bd05806865e59323cae7	2023-02-16 15:42:48 +00:00
fanquake	ea584a617c	23.x Add missing includes to fix gcc-13 compile error Additional include fixes are required to make the 23.x branch compile using GCC 13. Github-Pull: #26921 Rebased-From: `af86266165`	2023-01-20 12:19:25 +00:00
MarcoFalke	c21e6a9ce2	Add missing includes to fix gcc-13 compile error Github-Pull: #26924 Rebased-From: `fadeb6b103`	2023-01-20 10:31:16 +00:00
fanquake	6fd35e2cb1	Merge bitcoin/bitcoin#26639 : [22.x] bump version to v22.1 `8cc07f7fff` doc: update release notes for 22.1 (fanquake) `45355ec10b` doc: update manual pages for 22.1 (fanquake) `99e0ccc742` build: bump version to 22.1 final (fanquake) Pull request description: Bump version to v22.1. Regenerate manpages. Add the only change since rc2 (https://github.com/bitcoin/bitcoin/pull/26633) to the release notes. That change does not require another rc. ACKs for top commit: hebasto: ACK `8cc07f7fff`, I have reviewed the changes and they look OK. Tree-SHA512: 1d75235e41ac64f80d3b209934460cec05af1f4ddcd426bf941316374de7dc7d909de2e3dffe9716559b9422262c39724ff330cdbb3774b856e4e6bb8a10248f	2022-12-05 15:26:10 +00:00
fanquake	8cc07f7fff	doc: update release notes for 22.1	2022-12-05 09:53:20 +00:00
fanquake	45355ec10b	doc: update manual pages for 22.1	2022-12-05 09:50:44 +00:00
fanquake	99e0ccc742	build: bump version to 22.1 final	2022-12-05 09:45:12 +00:00
fanquake	1b05169c32	Merge bitcoin/bitcoin#26633 : depends: update qt 5.12 url to archive location `28fc72f781` depends: update qt 5.12 url to archive location (BlackcoinDev) Pull request description: QT 5.12 cannot be downloaded from https://download.qt.io/official_releases/qt/ It can be access from https://download.qt.io/archive/qt/ ACKs for top commit: hebasto: ACK `28fc72f781`, verified a new link. jarolrod: ACK `28fc72f781` Tree-SHA512: 8aeb34d0e0f2fc8713306ee81a4520da4149552c068102a36aaaf2575544322b43c977797aba169b57333013219fa683e651225e087696dec2d835270d4dc9b5	2022-12-05 09:32:16 +00:00
BlackcoinDev	28fc72f781	depends: update qt 5.12 url to archive location QT 5.12 cannot be downloaded from https://download.qt.io/official_releases/qt/ It can be access from https://download.qt.io/archive/qt/	2022-12-04 13:57:03 +01:00