Merge bitcoin/bitcoin#33557: [28.x] 28.3rc2

44d05b2fb2 doc: update release notes for 28.x (fanquake) 201221b750 doc: update manual pages for v28.3rc2 (fanquake) e2e1138350 build: bump version to 28.3rc2 (fanquake) 9c911f7e2d build: fix depends Qt download link (fanquake) ae8605825f contrib: fix using macdploy script without translations. (amisha) Pull request description: Backports: * #33482 * #33563 Plus final changes for a `28.3rc2`. ACKs for top commit: marcofleon: Nice, re ACK 44d05b2fb2 stickies-v: re-ACK 44d05b2fb2 Tree-SHA512: 63d46b93fcc2201071328a0708d32ef7b9ce80348455ec059c11edf238003a6f0ec7bd018a76bf0d7ba90ab99dae5176dfa387f9ea1b791e1f8ef785d7c2f1f2
2025-11-15 00:17:18 +01:00 · 2025-10-13 12:30:28 +01:00
parent 42c4c6b6dd 44d05b2fb2
commit d70e9c5d13
11 changed files with 33 additions and 30 deletions
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.69])
 define(_CLIENT_VERSION_MAJOR, 28)
 define(_CLIENT_VERSION_MINOR, 3)
 define(_CLIENT_VERSION_BUILD, 0)
-define(_CLIENT_VERSION_RC, 1)
+define(_CLIENT_VERSION_RC, 2)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2025)
 define(_COPYRIGHT_HOLDERS,[The %s developers])
--- a/contrib/macdeploy/macdeployqtplus
+++ b/contrib/macdeploy/macdeployqtplus
@@ -465,18 +465,18 @@ if config.translations_dir:
        sys.stderr.write(f"Error: Could not find translation dir \"{config.translations_dir[0]}\"\n")
        sys.exit(1)

-print("+ Adding Qt translations +")
+    print("+ Adding Qt translations +")

-translations = Path(config.translations_dir[0])
+    translations = Path(config.translations_dir[0])

-regex = re.compile('qt_[a-z]*(.qm|_[A-Z]*.qm)')
+    regex = re.compile('qt_[a-z]*(.qm|_[A-Z]*.qm)')

-lang_files = [x for x in translations.iterdir() if regex.match(x.name)]
+    lang_files = [x for x in translations.iterdir() if regex.match(x.name)]

-for file in lang_files:
-    if verbose:
-        print(file.as_posix(), "->", os.path.join(applicationBundle.resourcesPath, file.name))
-    shutil.copy2(file.as_posix(), os.path.join(applicationBundle.resourcesPath, file.name))
+    for file in lang_files:
+        if verbose:
+            print(file.as_posix(), "->", os.path.join(applicationBundle.resourcesPath, file.name))
+        shutil.copy2(file.as_posix(), os.path.join(applicationBundle.resourcesPath, file.name))

 # ------------------------------------------------

--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -1,6 +1,6 @@
 package=qt
 $(package)_version=5.15.14
-$(package)_download_path=https://download.qt.io/official_releases/qt/5.15/$($(package)_version)/submodules
+$(package)_download_path=https://download.qt.io/archive/qt/5.15/$($(package)_version)/submodules
 $(package)_suffix=everywhere-opensource-src-$($(package)_version).tar.xz
 $(package)_file_name=qtbase-$($(package)_suffix)
 $(package)_sha256_hash=500d3b390048e9538c28b5f523dfea6936f9c2e10d24ab46580ff57d430b98be
--- a/doc/dependencies.md
+++ b/doc/dependencies.md
@@ -30,7 +30,7 @@ You can find installation instructions in the `build-*.md` file for your platfor
 | [Fontconfig](../depends/packages/fontconfig.mk) | [link](https://www.freedesktop.org/wiki/Software/fontconfig/) | [2.12.6](https://github.com/bitcoin/bitcoin/pull/23495) | 2.6 | Yes |
 | [FreeType](../depends/packages/freetype.mk) | [link](https://freetype.org) | [2.11.0](https://github.com/bitcoin/bitcoin/commit/01544dd78ccc0b0474571da854e27adef97137fb) | 2.3.0 | Yes |
 | [qrencode](../depends/packages/qrencode.mk) | [link](https://fukuchi.org/works/qrencode/) | [4.1.1](https://github.com/bitcoin/bitcoin/pull/27312) | | No |
-| [Qt](../depends/packages/qt.mk) | [link](https://download.qt.io/official_releases/qt/) | [5.15.14](https://github.com/bitcoin/bitcoin/pull/30198) | [5.11.3](https://github.com/bitcoin/bitcoin/pull/24132) | No |
+| [Qt](../depends/packages/qt.mk) | [link](https://download.qt.io/archive/qt/) | [5.15.14](https://github.com/bitcoin/bitcoin/pull/30198) | [5.11.3](https://github.com/bitcoin/bitcoin/pull/24132) | No |

 ### Networking
 | Dependency | Releases | Version used | Minimum required | Runtime |
--- 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.3.
-.TH BITCOIN-CLI "1" "September 2025" "bitcoin-cli v28.3.0rc1" "User Commands"
+.TH BITCOIN-CLI "1" "October 2025" "bitcoin-cli v28.3.0rc2" "User Commands"
 .SH NAME
-bitcoin-cli \- manual page for bitcoin-cli v28.3.0rc1
+bitcoin-cli \- manual page for bitcoin-cli v28.3.0rc2
 .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 v28.3.0rc1
 .B bitcoin-cli
 [\fI\,options\/\fR] \fI\,help <command>      Get help for a command\/\fR
 .SH DESCRIPTION
-Bitcoin Core RPC client version v28.3.0rc1
+Bitcoin Core RPC client version v28.3.0rc2
 .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.3.
-.TH BITCOIN-QT "1" "September 2025" "bitcoin-qt v28.3.0rc1" "User Commands"
+.TH BITCOIN-QT "1" "October 2025" "bitcoin-qt v28.3.0rc2" "User Commands"
 .SH NAME
-bitcoin-qt \- manual page for bitcoin-qt v28.3.0rc1
+bitcoin-qt \- manual page for bitcoin-qt v28.3.0rc2
 .SH SYNOPSIS
 .B bitcoin-qt
 [\fI\,command-line options\/\fR] [\fI\,URI\/\fR]
 .SH DESCRIPTION
-Bitcoin Core version v28.3.0rc1
+Bitcoin Core version v28.3.0rc2
 .PP
 Optional URI is a Bitcoin address in BIP21 URI format.
 .SH OPTIONS
--- 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.3.
-.TH BITCOIN-TX "1" "September 2025" "bitcoin-tx v28.3.0rc1" "User Commands"
+.TH BITCOIN-TX "1" "October 2025" "bitcoin-tx v28.3.0rc2" "User Commands"
 .SH NAME
-bitcoin-tx \- manual page for bitcoin-tx v28.3.0rc1
+bitcoin-tx \- manual page for bitcoin-tx v28.3.0rc2
 .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 v28.3.0rc1
 .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 v28.3.0rc1
+Bitcoin Core bitcoin\-tx utility version v28.3.0rc2
 .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.3.
-.TH BITCOIN-UTIL "1" "September 2025" "bitcoin-util v28.3.0rc1" "User Commands"
+.TH BITCOIN-UTIL "1" "October 2025" "bitcoin-util v28.3.0rc2" "User Commands"
 .SH NAME
-bitcoin-util \- manual page for bitcoin-util v28.3.0rc1
+bitcoin-util \- manual page for bitcoin-util v28.3.0rc2
 .SH SYNOPSIS
 .B bitcoin-util
 [\fI\,options\/\fR] [\fI\,commands\/\fR]  \fI\,Do stuff\/\fR
 .SH DESCRIPTION
-Bitcoin Core bitcoin\-util utility version v28.3.0rc1
+Bitcoin Core bitcoin\-util utility version v28.3.0rc2
 .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.3.
-.TH BITCOIN-WALLET "1" "September 2025" "bitcoin-wallet v28.3.0rc1" "User Commands"
+.TH BITCOIN-WALLET "1" "October 2025" "bitcoin-wallet v28.3.0rc2" "User Commands"
 .SH NAME
-bitcoin-wallet \- manual page for bitcoin-wallet v28.3.0rc1
+bitcoin-wallet \- manual page for bitcoin-wallet v28.3.0rc2
 .SH DESCRIPTION
-Bitcoin Core bitcoin\-wallet version v28.3.0rc1
+Bitcoin Core bitcoin\-wallet version v28.3.0rc2
 .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.3.
-.TH BITCOIND "1" "September 2025" "bitcoind v28.3.0rc1" "User Commands"
+.TH BITCOIND "1" "October 2025" "bitcoind v28.3.0rc2" "User Commands"
 .SH NAME
-bitcoind \- manual page for bitcoind v28.3.0rc1
+bitcoind \- manual page for bitcoind v28.3.0rc2
 .SH SYNOPSIS
 .B bitcoind
 [\fI\,options\/\fR]                     \fI\,Start Bitcoin Core\/\fR
 .SH DESCRIPTION
-Bitcoin Core version v28.3.0rc1
+Bitcoin Core version v28.3.0rc2
 .SH OPTIONS
 .HP
 \-?
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -1,6 +1,6 @@
 Bitcoin Core version 28.3rc2 is now available from:

-  <https://bitcoincore.org/bin/bitcoin-core-28.3/test.rc1/>
+  <https://bitcoincore.org/bin/bitcoin-core-28.3/test.rc2/>

 This release includes various bug fixes and performance
 improvements, as well as updated translations.
@@ -71,6 +71,7 @@ recommended to change both together if you decide to do so.
 - #32678 guix: warn and abort when SOURCE_DATE_EPOCH is set
 - #32943 depends: Force CMAKE_EXPORT_NO_PACKAGE_REGISTRY=TRUE
 - #33073 guix: warn SOURCE_DATE_EPOCH set in guix-codesign
+- #33563 build: fix depends Qt download link

 ### Doc

@@ -83,12 +84,14 @@ recommended to change both together if you decide to do so.
 ### Misc

 - #33340 Fix benchmark CSV output
+- #33482 contrib: fix macOS deployment with no translations

 Credits
 =======

 Thanks to everyone who directly contributed to this release:
 - 0xB10C
+- amisha
 - fanquake
 - glozow
 - Hennadii Stepanov