This backports
- https://github.com/bitcoin/bitcoin/commit/3656b828dc2204418974e94928cc8d915b10ed95 - Which was missed in #32563, see #32563 (comment).
- #32693
This backports
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.
For details see: https://corecheck.dev/bitcoin/bitcoin/pulls/32735.
See the guideline for information on the review process.
Type | Reviewers |
---|---|
ACK | willcl-ark |
If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.
Possible typos and grammar issues:
drahtbot_id_4_m
🚧 At least one of the CI tasks failed.
Task Win64, unit tests, no gui tests, no functional tests
: https://github.com/bitcoin/bitcoin/runs/43959393827
LLM reason (✨ experimental): The failure is caused by errors in the test suite due to issues with Wine compatibility and missing system DLLs.
Try to run the tests locally, according to the documentation. However, a CI failure may still happen due to a number of reasons, for example:
Possibly due to a silent merge conflict (the changes in this pull request being incompatible with the current code in the target branch). If so, make sure to rebase on the latest commit of the target branch.
A sanitizer issue, which can only be found by compiling with the sanitizer and running the affected test.
An intermittent issue.
Leave a comment here, if you need help tracking down a confusing failure.
Github-Pull: #31407
Rebased-From: 3656b828dc2204418974e94928cc8d915b10ed95
Patch cmake_minimum_required version for freetype, using the version from
https://gitlab.freedesktop.org/freetype/freetype/-/merge_requests/352/diffs
This fixes a failure when building with CMake 4, where compatibility
with CMake versions < 3.5 has been removed (see https://cmake.org/cmake/help/latest/release/4.0.html#deprecated-and-removed-features)
Github-Pull: #32693
Rebased-From: d7c37906e7b1dc1513439056d0cdb2bd341d00f1
ACK 2437d9398926b82f2015d78752a72d8df82772f2
Commit 9082498589f09b4cd81ec017d67b684fa6f0efd9 “contrib: Sign all Windows binaries too” was missed from a previous backport, and 32693 is backported correctly.
Post-merge ACK 2437d9398926b82f2015d78752a72d8df82772f2
All backport commits are clean, and make sense.
Post merge ACK https://github.com/bitcoin/bitcoin/commit/2437d9398926b82f2015d78752a72d8df82772f2
Briefly sanity checked https://github.com/bitcoin/bitcoin/commit/3656b828dc2204418974e94928cc8d915b10ed95 and then verified that everything with #32693 is good.