depends: Update Qt to version 6.8.3#34650
Merged
fanquake merged 6 commits intobitcoin:masterfrom Mar 6, 2026
Merged
Conversation
Contributor
|
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers. ReviewsSee the guideline for information on the review process.
If your review is incorrectly listed, please copy-paste ConflictsReviewers, this pull request conflicts with the following ones:
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first. |
hebasto
commented
Feb 22, 2026
Comment on lines
+99
to
+103
|
|
||
| ifeq ($(host_os),darwin) | ||
| $(package)_cmake_opts += -DQT_INTERNAL_XCODE_VERSION=$(XCODE_VERSION) | ||
| $(package)_cmake_opts += -DQT_NO_APPLE_SDK_MAX_VERSION_CHECK=ON | ||
| endif |
Member
Author
There was a problem hiding this comment.
We already use the same approach in qt.mk to work around a warning/error related to Xcode version check.
hebasto
commented
Feb 22, 2026
|
|
||
| $(package)_cmake_opts := -DCMAKE_PREFIX_PATH=$(host_prefix) | ||
| $(package)_cmake_opts += -DQT_FEATURE_cxx20=ON | ||
| $(package)_cmake_opts += -DQT_ENABLE_CXX_EXTENSIONS=OFF |
Member
Author
There was a problem hiding this comment.
Otherwise, the configuration step logs the following:
-- Configuring done (20.0s)
-- Generating done (1.0s)
CMake Warning:
Manually-specified variables were not used by the project:
QT_ENABLE_CXX_EXTENSIONS
Related upstream items:
hebasto
commented
Feb 22, 2026
Comment on lines
+205
to
+209
| ifeq ($(host_os),linux) | ||
| # For some reason, the `-dbus-runtime` configure | ||
| # option does not work as expected. | ||
| $(package)_cmake_opts += -DINPUT_dbus=runtime | ||
| endif |
Member
Author
There was a problem hiding this comment.
An upstream issue has not been opened yet.
Member
Author
There was a problem hiding this comment.
Not yet. I'll submit a bug report upstream next week.
Member
Author
There was a problem hiding this comment.
The upstream bug report has been submitted: https://qt-project.atlassian.net/browse/QTBUG-144864.
4ba60fe to
21ec23a
Compare
Member
Author
|
My Guix build: |
Member
Which parts of this can be backported to 30.x? |
Member
Author
Let me try to backport gcc16-specific patches. |
Member
Author
Member
|
On macOS 26.3 when I do If I interrupt and run again, it prompts me once more: 4b14633 is the first commit that triggers this. |
21ec23a to
a8ae80a
Compare
Member
|
The qt patch behaves now. Lightly tested depends build on macOS 26.3. I'm doing a Guix build, will report back. |
Member
Author
Thanks! Should be fixed now. |
Member
|
Guix: |
Member
Author
|
My Guix build: Do not match #34650 (comment). UPDATE: I've checked the branch from #34578. It also has this issue. |
Member
|
So this is currently non-deterministic? |
Member
Author
Yes, it is. |
Member
|
x86_64: Which match Sjor's @hebasto can you put the binaries somewhere? I'd like to debug. |
Member
Author
https://github.com/hebasto/artefacts/tree/guix-build-pr34650 |
Member
Author
|
diffoscope points at the standard library include paths such as: -/gnu/store/x7lhdqphpzpmc28q77p6hv8zkiqc8lqx-gcc-cross-x86_64-linux-gnu-14.3.0/include/c++/bits/stl_vector.h
+/gnu/store/axv7w2js4kmf2gk5szq1zyvbbjiin6x7-gcc-cross-x86_64-linux-gnu-14.3.0/include/c++/bits/stl_vector.h |
Member
Concept ACK on this approach, compared to the prior one. I still don't think it's ideal, because we shouldn't really be setting options in depends packages (that effect all (self-compiling) users), that are only needed for reproducibility in Guix, but it's good enough for now. I am working on a change that should solve the path embedding more whole-sale, rather than per package / dep as we are currently doing it, but that would not be doable for |
Member
|
on x86_64: |
Member
|
ACK 0a6724a I kind of preferred the other approach, especially if it could be generalized for all of the other dependencies. It seems like it could be useful for us to pass |
Contributor
|
On aarch64 |
sedited
approved these changes
Mar 5, 2026
Contributor
|
My guix Build Output (matches) Host architecture: b067d97b5a54388f450a69eccde54a8e229fa29e617bbce7e0092cb243b11f0d guix-build-0a6724aaae97/output/aarch64-linux-gnu/SHA256SUMS.part
b942e61894c0aacae4a8a167eb737c7089b18885d391b56901748c2a78412de3 guix-build-0a6724aaae97/output/aarch64-linux-gnu/bitcoin-0a6724aaae97-aarch64-linux-gnu-debug.tar.gz
0d128cfb744d5781f1b1c1fab99e711bd1c1cdbfcfdaed7850e3c97f35ca01ff guix-build-0a6724aaae97/output/aarch64-linux-gnu/bitcoin-0a6724aaae97-aarch64-linux-gnu.tar.gz
6aa0c7510090a46ee4863681c2f01baf3b1fc33377a2265eefbf87d54ad98347 guix-build-0a6724aaae97/output/arm-linux-gnueabihf/SHA256SUMS.part
581fd27b5aa10a9b11a6bdaed14378d38eb314c5dfa447464f2087dc480eb354 guix-build-0a6724aaae97/output/arm-linux-gnueabihf/bitcoin-0a6724aaae97-arm-linux-gnueabihf-debug.tar.gz
83dd201cf6120fb034bf4a6d86d3af36a5c8c54b4e67d02ba39c0f5b2ba056f9 guix-build-0a6724aaae97/output/arm-linux-gnueabihf/bitcoin-0a6724aaae97-arm-linux-gnueabihf.tar.gz
0dfdab2a78abd3509e6a71dc2cd494a53a39ecfce1db21229187b696b860bf3e guix-build-0a6724aaae97/output/arm64-apple-darwin/SHA256SUMS.part
f8963a35fa3e4c30c29a49c0cd706d65404f348302c98c0e7d00088eb515fac0 guix-build-0a6724aaae97/output/arm64-apple-darwin/bitcoin-0a6724aaae97-arm64-apple-darwin-codesigning.tar.gz
cf2f9638326a0da3c88fb5e838ae0fc064eaa1f5e36e4abb8773f4dfa926bbc9 guix-build-0a6724aaae97/output/arm64-apple-darwin/bitcoin-0a6724aaae97-arm64-apple-darwin-unsigned.tar.gz
77eabea5206dfe596af1e898348a4416505fe6ec2c366ca918aa94e5064e0bd9 guix-build-0a6724aaae97/output/arm64-apple-darwin/bitcoin-0a6724aaae97-arm64-apple-darwin-unsigned.zip
9ab54a74b53437102375d78abee300a96cb8ee4566145a9a53cbb581fb2c4d21 guix-build-0a6724aaae97/output/dist-archive/bitcoin-0a6724aaae97.tar.gz
a626987e508e67e448ee8a853136291bf7c46d7c4356ae7233e530618a04d52a guix-build-0a6724aaae97/output/powerpc64-linux-gnu/SHA256SUMS.part
6135e006906fe1ec37d2ee80a7a853274cf8e71256d291da199cba3ae691bba4 guix-build-0a6724aaae97/output/powerpc64-linux-gnu/bitcoin-0a6724aaae97-powerpc64-linux-gnu-debug.tar.gz
a1ba5d01ccf51bbd829c2f23009619b2552c9c539fc8a98cfc1807dcc5576092 guix-build-0a6724aaae97/output/powerpc64-linux-gnu/bitcoin-0a6724aaae97-powerpc64-linux-gnu.tar.gz
e3a6624df5c3c6323595dd3ac63636323cf24479dcee35f9c0c805364e4b7c97 guix-build-0a6724aaae97/output/riscv64-linux-gnu/SHA256SUMS.part
aca33521e76571ea1eba82764eb3702ad3cfd9c64fd6c6081f7941e00e4ca73e guix-build-0a6724aaae97/output/riscv64-linux-gnu/bitcoin-0a6724aaae97-riscv64-linux-gnu-debug.tar.gz
c4044b1708f78e0c22a216e739a6449f032ff1a61828c04aaa2d4b088bd16982 guix-build-0a6724aaae97/output/riscv64-linux-gnu/bitcoin-0a6724aaae97-riscv64-linux-gnu.tar.gz
7a99fa525e29417d5cb83a39f00a23cfd0907ab0e048df3973b8ce4f81d05114 guix-build-0a6724aaae97/output/x86_64-apple-darwin/SHA256SUMS.part
f8a97c0cb4571ba1faecc73f40cbcdd6b8f3c11142e0ef566525a66e82d16635 guix-build-0a6724aaae97/output/x86_64-apple-darwin/bitcoin-0a6724aaae97-x86_64-apple-darwin-codesigning.tar.gz
9f59f07e8e6449df40da195158809281e8f715cd3fa03e92c2170d769672afcb guix-build-0a6724aaae97/output/x86_64-apple-darwin/bitcoin-0a6724aaae97-x86_64-apple-darwin-unsigned.tar.gz
6b1311b96de92f67497757ecfd9c0040b1c395a6bad934365ab922e456df292c guix-build-0a6724aaae97/output/x86_64-apple-darwin/bitcoin-0a6724aaae97-x86_64-apple-darwin-unsigned.zip
65aab0b07bc25dc3ec9dedfab7b0c40b3bfd55f5240e58e30ca611240267525d guix-build-0a6724aaae97/output/x86_64-linux-gnu/SHA256SUMS.part
242984688d26e39a9e825e7b140fccd984b5db2c2d0acc283109f9b458ef5c84 guix-build-0a6724aaae97/output/x86_64-linux-gnu/bitcoin-0a6724aaae97-x86_64-linux-gnu-debug.tar.gz
eee2585afc5684ad605941a7f71c55edce2c0efe3abb9034f9c75dab0e914e43 guix-build-0a6724aaae97/output/x86_64-linux-gnu/bitcoin-0a6724aaae97-x86_64-linux-gnu.tar.gz
31514555de4f8ed2a45ec4232be212a733ee5ffe3fbefc01b1afc9caeeb36f68 guix-build-0a6724aaae97/output/x86_64-w64-mingw32/SHA256SUMS.part
9ec18d017a4b3776c88b2c3d8e282c922332ec3f26a3e5056c06294ad94f6845 guix-build-0a6724aaae97/output/x86_64-w64-mingw32/bitcoin-0a6724aaae97-win64-codesigning.tar.gz
421f6b5d7ddf0e74e79ab68f696f3973cdfc31e06d29f73057cc32741c738fdc guix-build-0a6724aaae97/output/x86_64-w64-mingw32/bitcoin-0a6724aaae97-win64-debug.zip
8aca8b62e15d7890e30a63289adaa4c9f2f83bf4cfbf181f99c5be1c0c7c053a guix-build-0a6724aaae97/output/x86_64-w64-mingw32/bitcoin-0a6724aaae97-win64-setup-unsigned.exe
047b85cbc80f96f34bc203bddec920418f0012345a7e5e99e8a9cca3fdd2d3ec guix-build-0a6724aaae97/output/x86_64-w64-mingw32/bitcoin-0a6724aaae97-win64-unsigned.zip |
Member
|
This resolves the issues with GCC 16, and seems to work fine with latest Clang (22). |
Member
|
@hebasto can you open a branch targeting |
Member
Author
Sure. |
hebasto
added a commit
to hebasto/bitcoin
that referenced
this pull request
Mar 6, 2026
The `find_package(Qt .. MODULE REQUIRED COMPONENTS ...)` call must treat any missing component as a fatal error. Github-Pull: bitcoin#34650 Rebased-From: c555845
hebasto
pushed a commit
to hebasto/bitcoin
that referenced
this pull request
Mar 6, 2026
Backported from: qt/qtbase@7fccc79 Github-Pull: bitcoin#34650 Rebased-From: d7e972a
hebasto
pushed a commit
to hebasto/bitcoin
that referenced
this pull request
Mar 6, 2026
Meta-Issue: https://qt-project.atlassian.net/browse/QTBUG-143470 Backports: qt/qtbase@679e8bd qt/qtbase@3312e89 qt/qtbase@05f201a An additional includes fix is needed after the others: qt/qtbase@d68fc6e Github-Pull: bitcoin#34650 Rebased-From: 3cb4d60
hebasto
added a commit
to hebasto/bitcoin
that referenced
this pull request
Mar 6, 2026
Github-Pull: bitcoin#34650 Rebased-From: 473e5f8
Member
|
Partial backport to 30.x in #34754 (this doesn't need to go back to 29.x). |
hebasto
pushed a commit
to hebasto/bitcoin
that referenced
this pull request
Mar 6, 2026
Meta-Issue: https://qt-project.atlassian.net/browse/QTBUG-143470 Backports: qt/qtbase@679e8bd qt/qtbase@3312e89 qt/qtbase@05f201a An additional includes fix is needed after the others: qt/qtbase@d68fc6e Github-Pull: bitcoin#34650 Rebased-From: 3cb4d60
hebasto
pushed a commit
to hebasto/bitcoin
that referenced
this pull request
Mar 6, 2026
Backported from: qt/qtbase@7fccc79 Github-Pull: bitcoin#34650 Rebased-From: d7e972a
hebasto
pushed a commit
to hebasto/bitcoin
that referenced
this pull request
Mar 6, 2026
Meta-Issue: https://qt-project.atlassian.net/browse/QTBUG-143470 Backports: qt/qtbase@679e8bd qt/qtbase@3312e89 qt/qtbase@05f201a An additional includes fix is needed after the others: qt/qtbase@d68fc6e Github-Pull: bitcoin#34650 Rebased-From: 3cb4d60
hebasto
added a commit
to hebasto/bitcoin
that referenced
this pull request
Mar 6, 2026
Github-Pull: bitcoin#34650 Rebased-From: 473e5f8
fanquake
added a commit
that referenced
this pull request
Mar 9, 2026
fbfc778 qt: Add patch to fix SFINAE warnings in QAnyStringView with gcc16 (Hennadii Stepanov) 8f5c205 qt: add patches to fix SFINAE errors/warnings with gcc16 (Cory Fields) b268b4b qt: add patch to fix build with gcc16 (Cory Fields) 916428f cmake: Fix `FindQt` module (Hennadii Stepanov) Pull request description: This PR backports commits from #34650 not related to Qt update. They fix issues when building with GCC 16 and improves Qt detecting. ACKs for top commit: fanquake: ACK fbfc778 willcl-ark: utACK fbfc778 Tree-SHA512: dd2d1b23aaad64a8eb6a279dbb7def1b29149cfdebd88e0667ebbccfd30ad9762f90dbbc6968eae148e724f0257646939360765c2fae1b5d513a11cf0c2902d8
fanquake
added a commit
to fanquake/bitcoin
that referenced
this pull request
Mar 10, 2026
hebasto
added a commit
that referenced
this pull request
Mar 10, 2026
3a83715 depends: link to upstream qt issue (fanquake) Pull request description: Follows up to: #34650 (comment). https://qt-project.atlassian.net/browse/QTBUG-144864 ACKs for top commit: sedited: ACK 3a83715 hebasto: ACK 3a83715. Tree-SHA512: a0ad902bb8d19cd065410dc3a9f15c83d4ff3807219b5fd6084f09a12c4003ef89fc28b4237311baa39c534d2ae1194b70b2d9dd036d4cf6f8a8385362f411b7
fanquake
added a commit
that referenced
this pull request
Mar 11, 2026
0ebc689 depends: delete Boost extra files (fanquake) 168997e depends: disable Qt sbom generation (fanquake) Pull request description: 1 followup to #34650, to disable sbom generation. 1 commit to Boost, to cleanup `.natvis` files that end up in share. ACKs for top commit: hebasto: ACK 0ebc689, tested on Ubuntu 25.10. Tree-SHA512: 728b51d798a30c54df915564446a7a8648eb4fc27adb8c18b8202df506e2ff61e74516cfe4d6af1af72279255fc75fe14cb43403632a978637781d59eb11fc0f
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR updates the
qtpackage in depends to the latest open-source 6.8.3 LTS release.The update includes numerous bugfixes, which allows us to drop
qtbase_plugins_windows11style.patch.Additionally, it includes patches for compatibility with GCC 16 (along with one extra patch), and incorporates a commit from #32709.
Closes #34569.