Merge bitcoin/bitcoin#25719: build: Bump Qt to 5.15.5 in depends

fd0e8df67c qt: use patch over sed for guix CROSS_LIBRARY_PATH change (fanquake) ecb617fefe build: Bump Qt to 5.15.5 in depends (Hennadii Stepanov) Pull request description: Bumping Qt patch version allows to drop the `fix_limits_header.patch`. Guix builds on `x86_64`: ``` 6e403f6442f904a17e00f2c5d539c38a6d736963deaca080aaf7e45911f32cd4 guix-build-fd0e8df67cae/output/aarch64-linux-gnu/SHA256SUMS.part 9faf7c7eba364848ab59f78d68a7ef74fc96c1d4b64c9132c8cdeaa3e90dd11c guix-build-fd0e8df67cae/output/aarch64-linux-gnu/bitcoin-fd0e8df67cae-aarch64-linux-gnu-debug.tar.gz 5a6a63c1e81f088db952ddd5184f673583cbce122de8a5714ba313064ac4536d guix-build-fd0e8df67cae/output/aarch64-linux-gnu/bitcoin-fd0e8df67cae-aarch64-linux-gnu.tar.gz d1f0d94a0996d268a498fce2080a456544ccd60c263eb25c6bb335570ee0e181 guix-build-fd0e8df67cae/output/arm-linux-gnueabihf/SHA256SUMS.part ec89d624ec30f0117e435ff31fe3431c15eb0ef2c31fc33f7a1c6b71d8af1166 guix-build-fd0e8df67cae/output/arm-linux-gnueabihf/bitcoin-fd0e8df67cae-arm-linux-gnueabihf-debug.tar.gz 71521ee2e382bb3b1e85db0e702cb3d91a6c713f290cb3835f6e6a6ff65de22b guix-build-fd0e8df67cae/output/arm-linux-gnueabihf/bitcoin-fd0e8df67cae-arm-linux-gnueabihf.tar.gz e757341c8000cdc74b266217bd1bc3ec2fa4d0a53270cef4fe18182010dde213 guix-build-fd0e8df67cae/output/arm64-apple-darwin/SHA256SUMS.part a361215f99ef2e10decc2c97ad5aea62e268554101cd34a75a28a0f8cc25bc4d guix-build-fd0e8df67cae/output/arm64-apple-darwin/bitcoin-fd0e8df67cae-arm64-apple-darwin-unsigned.dmg 81b91ab355544d247c2781bf2e323a70c27780665c3098d8ef01a59d291725f6 guix-build-fd0e8df67cae/output/arm64-apple-darwin/bitcoin-fd0e8df67cae-arm64-apple-darwin-unsigned.tar.gz 0b4e6ae2c66ecf49b2223d8d7fabd00765942ffeb4972fd699e4a9d13f176b6b guix-build-fd0e8df67cae/output/arm64-apple-darwin/bitcoin-fd0e8df67cae-arm64-apple-darwin.tar.gz 94f4a4a319a896c1ce37980fdac0c6bf9b62e2a8ca46476a10895a4fd8d0403f guix-build-fd0e8df67cae/output/dist-archive/bitcoin-fd0e8df67cae.tar.gz cf963b63fabc7e832b9469c9c048b08dcee344cb2044e7930bca53dfdc18c3dd guix-build-fd0e8df67cae/output/powerpc64-linux-gnu/SHA256SUMS.part 50ac40337bed023900ecf1bd3f557276dba8d97cd613f9342e0f7a72e4c7e6f1 guix-build-fd0e8df67cae/output/powerpc64-linux-gnu/bitcoin-fd0e8df67cae-powerpc64-linux-gnu-debug.tar.gz 6884eba5928b831434ae9a1e5c2945185d1e6f013537aac0a05ae9775ab1df7d guix-build-fd0e8df67cae/output/powerpc64-linux-gnu/bitcoin-fd0e8df67cae-powerpc64-linux-gnu.tar.gz ad502cdbf072a3875f4cbf653e9b5593c5f5324edc0e38100234a9778a73cc09 guix-build-fd0e8df67cae/output/powerpc64le-linux-gnu/SHA256SUMS.part e426a8f45095bc6019612a58f60267f6b084e3c273ec70509a0a8759e90e68d2 guix-build-fd0e8df67cae/output/powerpc64le-linux-gnu/bitcoin-fd0e8df67cae-powerpc64le-linux-gnu-debug.tar.gz a68ec3ba7e63382dc44f99806badc62e660dd3ae2d9d74d48e7e8378fd5c03f4 guix-build-fd0e8df67cae/output/powerpc64le-linux-gnu/bitcoin-fd0e8df67cae-powerpc64le-linux-gnu.tar.gz 67d0bf587538fb151aa867363ab7724543607adda2b8be7dffbc263959e02f67 guix-build-fd0e8df67cae/output/riscv64-linux-gnu/SHA256SUMS.part 093c874104e8f8c7bd73c362be471aba6d0c25828c22b2a8324056d516849242 guix-build-fd0e8df67cae/output/riscv64-linux-gnu/bitcoin-fd0e8df67cae-riscv64-linux-gnu-debug.tar.gz 82b03ba2283a8667ea3c3fa86a5f64be7c7a4c0423b92bd8f3dfe71a78c3b210 guix-build-fd0e8df67cae/output/riscv64-linux-gnu/bitcoin-fd0e8df67cae-riscv64-linux-gnu.tar.gz 5a30433c33322b9deabe4d6fc655f6dd9e6e73f2ae09b01502ce1a9377e1ce16 guix-build-fd0e8df67cae/output/x86_64-apple-darwin/SHA256SUMS.part 473a3df8d63a112ca3e76620a56f6a5781b74c594451c86c26ccfef63cc2b023 guix-build-fd0e8df67cae/output/x86_64-apple-darwin/bitcoin-fd0e8df67cae-x86_64-apple-darwin-unsigned.dmg fa0eb43787745d6973ceb880003acf9f5be6e14c5c310bcc359a05cb52dd20a8 guix-build-fd0e8df67cae/output/x86_64-apple-darwin/bitcoin-fd0e8df67cae-x86_64-apple-darwin-unsigned.tar.gz 90ccac950577f15e5dc729e9f94bff39fa0a9f0a96a27eee249df15a604eec44 guix-build-fd0e8df67cae/output/x86_64-apple-darwin/bitcoin-fd0e8df67cae-x86_64-apple-darwin.tar.gz fffda44e37d74908fcb5974a7c290d4e36d457605824f5d3f79b15e4eae5c1e7 guix-build-fd0e8df67cae/output/x86_64-linux-gnu/SHA256SUMS.part 7d807b88d20a759236013fec99d8b16240dc064a0a5a6eb5d51ba02af467d959 guix-build-fd0e8df67cae/output/x86_64-linux-gnu/bitcoin-fd0e8df67cae-x86_64-linux-gnu-debug.tar.gz 8141de0e3aa4174dea1e1cc3ee6344e857650fdd3180e7a4e8359f84733933fe guix-build-fd0e8df67cae/output/x86_64-linux-gnu/bitcoin-fd0e8df67cae-x86_64-linux-gnu.tar.gz 653b6c61d4ab5c5dcb8f36aefb518dc14d7fcf9f7d684a521c7705cbda9ff2fe guix-build-fd0e8df67cae/output/x86_64-w64-mingw32/SHA256SUMS.part 999dc6af5a7262c579be1c9904c1ac2deff0617a48d89d60902de5ba9e3684e6 guix-build-fd0e8df67cae/output/x86_64-w64-mingw32/bitcoin-fd0e8df67cae-win64-debug.zip 03a90e2d6191b6ab84ffb38f845e0565ecf34b5d3b34b7fc36edc99e1feef347 guix-build-fd0e8df67cae/output/x86_64-w64-mingw32/bitcoin-fd0e8df67cae-win64-setup-unsigned.exe 6866e0ba9bd4da9487b679f3216cde3d6d455ca074f22de05552b6faf6a6cfca guix-build-fd0e8df67cae/output/x86_64-w64-mingw32/bitcoin-fd0e8df67cae-win64-unsigned.tar.gz 208d38d00b4a96fb34b558e221f05d08efa078a0d143a2bb2f63fa201c64f29d guix-build-fd0e8df67cae/output/x86_64-w64-mingw32/bitcoin-fd0e8df67cae-win64.zip ``` ACKs for top commit: fanquake: ACK fd0e8df67c jarolrod: ACK fd0e8df67c Tree-SHA512: befa9f8cde4839983a6ff5aac6a4e127022d6ce43af924a42ae53d7e2fab115e7ef1455719de4f92fcc47f94e38c3fe55e663775edff49bd6204d1b2fdeed870
2025-01-11 20:32:35 -03:00 · 2022-08-01 09:41:40 +01:00 · 2022-08-01 09:41:40 +01:00 · b3c7c023b6
commit b3c7c023b6
parent 28be13ec99 fd0e8df67c
8 changed files with 32 additions and 49 deletions
--- a/.cirrus.yml
+++ b/.cirrus.yml
@ -109,9 +109,9 @@ task:
    VCPKG_DEFAULT_BINARY_CACHE: 'C:\Users\ContainerAdministrator\AppData\Local\vcpkg\archives'
    CCACHE_DIR: 'C:\Users\ContainerAdministrator\AppData\Local\ccache'
    WRAPPED_CL: 'C:\Users\ContainerAdministrator\AppData\Local\Temp\cirrus-ci-build\ci\test\wrapped-cl.bat'
-    QT_DOWNLOAD_URL: 'https://download.qt.io/official_releases/qt/5.15/5.15.3/single/qt-everywhere-opensource-src-5.15.3.zip'
-    QT_LOCAL_PATH: 'C:\qt-everywhere-opensource-src-5.15.3.zip'
-    QT_SOURCE_DIR: 'C:\qt-everywhere-src-5.15.3'
+    QT_DOWNLOAD_URL: 'https://download.qt.io/official_releases/qt/5.15/5.15.5/single/qt-everywhere-opensource-src-5.15.5.zip'
+    QT_LOCAL_PATH: 'C:\qt-everywhere-opensource-src-5.15.5.zip'
+    QT_SOURCE_DIR: 'C:\qt-everywhere-src-5.15.5'
    QTBASEDIR: 'C:\Qt_static'
    x64_NATIVE_TOOLS: '"C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Auxiliary\Build\vcvars64.bat"'
    QT_CONFIGURE_COMMAND: '..\configure -release -silent -opensource -confirm-license -opengl desktop -static -static-runtime -mp -qt-zlib -qt-pcre -qt-libpng -nomake examples -nomake tests -nomake tools -no-angle -no-dbus -no-gif -no-gtk -no-ico -no-icu -no-libjpeg -no-libudev -no-sql-sqlite -no-sql-odbc -no-sqlite -no-vulkan -skip qt3d -skip qtactiveqt -skip qtandroidextras -skip qtcharts -skip qtconnectivity -skip qtdatavis3d -skip qtdeclarative -skip doc -skip qtdoc -skip qtgamepad -skip qtgraphicaleffects -skip qtimageformats -skip qtlocation -skip qtlottie -skip qtmacextras -skip qtmultimedia -skip qtnetworkauth -skip qtpurchasing -skip qtquick3d -skip qtquickcontrols -skip qtquickcontrols2 -skip qtquicktimeline -skip qtremoteobjects -skip qtscript -skip qtscxml -skip qtsensors -skip qtserialbus -skip qtserialport -skip qtspeech -skip qtsvg -skip qtvirtualkeyboard -skip qtwayland -skip qtwebchannel -skip qtwebengine -skip qtwebglplugin -skip qtwebsockets -skip qtwebview -skip qtx11extras -skip qtxmlpatterns -no-openssl -no-feature-bearermanagement -no-feature-printdialog -no-feature-printer -no-feature-printpreviewdialog -no-feature-printpreviewwidget -no-feature-sql -no-feature-sqlmodel -no-feature-textbrowser -no-feature-textmarkdownwriter -no-feature-textodfwriter -no-feature-xml'
--- a/build_msvc/README.md
+++ b/build_msvc/README.md
@ -30,7 +30,7 @@ Qt
 ---------------------
 To build Bitcoin Core with the GUI, a static build of Qt is required.

-1. Download a single ZIP archive of Qt source code from https://download.qt.io/official_releases/qt/ (e.g., [`qt-everywhere-opensource-src-5.15.3.zip`](https://download.qt.io/official_releases/qt/5.15/5.15.3/single/qt-everywhere-opensource-src-5.15.3.zip)), and expand it into a dedicated folder. The following instructions assume that this folder is `C:\dev\qt-source`.
+1. Download a single ZIP archive of Qt source code from https://download.qt.io/official_releases/qt/ (e.g., [`qt-everywhere-opensource-src-5.15.5.zip`](https://download.qt.io/official_releases/qt/5.15/5.15.5/single/qt-everywhere-opensource-src-5.15.5.zip)), and expand it into a dedicated folder. The following instructions assume that this folder is `C:\dev\qt-source`.

 2. Open "x64 Native Tools Command Prompt for VS 2022", and input the following commands:
 ```cmd
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@ -1,9 +1,9 @@
 package=qt
-$(package)_version=5.15.3
+$(package)_version=5.15.5
 $(package)_download_path=https://download.qt.io/official_releases/qt/5.15/$($(package)_version)/submodules
 $(package)_suffix=everywhere-opensource-src-$($(package)_version).tar.xz
 $(package)_file_name=qtbase-$($(package)_suffix)
-$(package)_sha256_hash=26394ec9375d52c1592bd7b689b1619c6b8dbe9b6f91fdd5c355589787f3a0b6
+$(package)_sha256_hash=0c42c799aa7c89e479a07c451bf5a301e291266ba789e81afc18f95049524edc
 $(package)_linux_dependencies=freetype fontconfig libxcb libxkbcommon libxcb_util libxcb_util_render libxcb_util_keysyms libxcb_util_image libxcb_util_wm
 $(package)_qt_libs=corelib network widgets gui plugins testlib
 $(package)_linguist_tools = lrelease lupdate lconvert
@ -17,17 +17,17 @@ $(package)_patches += fix_montery_include.patch
 $(package)_patches += fix_android_jni_static.patch
 $(package)_patches += dont_hardcode_pwd.patch
 $(package)_patches += qtbase-moc-ignore-gcc-macro.patch
-$(package)_patches += fix_limits_header.patch
 $(package)_patches += use_android_ndk23.patch
 $(package)_patches += rcc_hardcode_timestamp.patch
 $(package)_patches += duplicate_lcqpafonts.patch
 $(package)_patches += fast_fixed_dtoa_no_optimize.patch
+$(package)_patches += guix_cross_lib_path.patch

 $(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
-$(package)_qttranslations_sha256_hash=5d7869f670a135ad0986e266813b9dd5bbae2b09577338f9cdf8904d4af52db0
+$(package)_qttranslations_sha256_hash=c92af4171397a0ed272330b4fa0669790fcac8d050b07c8b8cc565ebeba6735e

 $(package)_qttools_file_name=qttools-$($(package)_suffix)
-$(package)_qttools_sha256_hash=463b2fe71a085e7ab4e39333ae360ab0ec857b966d7a08f752c427e5df55f90d
+$(package)_qttools_sha256_hash=6d0778b71b2742cb527561791d1d3d255366163d54a10f78c683a398f09ffc6c

 $(package)_extra_sources  = $($(package)_qttranslations_file_name)
 $(package)_extra_sources += $($(package)_qttools_file_name)
@ -248,12 +248,12 @@ define $(package)_preprocess_cmds
  patch -p1 -i $($(package)_patch_dir)/no-xlib.patch && \
  patch -p1 -i $($(package)_patch_dir)/dont_hardcode_x86_64.patch && \
  patch -p1 -i $($(package)_patch_dir)/qtbase-moc-ignore-gcc-macro.patch && \
-  patch -p1 -i $($(package)_patch_dir)/fix_limits_header.patch && \
  patch -p1 -i $($(package)_patch_dir)/fix_montery_include.patch && \
  patch -p1 -i $($(package)_patch_dir)/use_android_ndk23.patch && \
  patch -p1 -i $($(package)_patch_dir)/rcc_hardcode_timestamp.patch && \
  patch -p1 -i $($(package)_patch_dir)/duplicate_lcqpafonts.patch && \
  patch -p1 -i $($(package)_patch_dir)/fast_fixed_dtoa_no_optimize.patch && \
+  patch -p1 -i $($(package)_patch_dir)/guix_cross_lib_path.patch && \
  mkdir -p qtbase/mkspecs/macx-clang-linux &&\
  cp -f qtbase/mkspecs/macx-clang/qplatformdefs.h qtbase/mkspecs/macx-clang-linux/ &&\
  cp -f $($(package)_patch_dir)/mac-qmake.conf qtbase/mkspecs/macx-clang-linux/qmake.conf && \
@ -263,8 +263,7 @@ define $(package)_preprocess_cmds
  echo "!host_build: QMAKE_CXXFLAGS   += $($(package)_cxxflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
  echo "!host_build: QMAKE_LFLAGS     += $($(package)_ldflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
  sed -i.old "s|QMAKE_CC                = \$$$$\$$$${CROSS_COMPILE}clang|QMAKE_CC                = $($(package)_cc)|" qtbase/mkspecs/common/clang.conf && \
-  sed -i.old "s|QMAKE_CXX               = \$$$$\$$$${CROSS_COMPILE}clang++|QMAKE_CXX               = $($(package)_cxx)|" qtbase/mkspecs/common/clang.conf && \
-  sed -i.old "s/LIBRARY_PATH/(CROSS_)?\0/g" qtbase/mkspecs/features/toolchain.prf
+  sed -i.old "s|QMAKE_CXX               = \$$$$\$$$${CROSS_COMPILE}clang++|QMAKE_CXX               = $($(package)_cxx)|" qtbase/mkspecs/common/clang.conf
 endef

 define $(package)_config_cmds
--- a/depends/patches/qt/dont_hardcode_x86_64.patch
+++ b/depends/patches/qt/dont_hardcode_x86_64.patch
@ -73,7 +73,7 @@ diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/defaul
 index 92a9112bca6..d888731ec8d 100644
 --- old/qtbase/mkspecs/features/mac/default_post.prf
 +++ new/qtbase/mkspecs/features/mac/default_post.prf
-@@ -90,6 +90,11 @@ app_extension_api_only {
+@@ -95,6 +95,11 @@ app_extension_api_only {
     QMAKE_LFLAGS              += $$QMAKE_CFLAGS_APPLICATION_EXTENSION
 }
 
@ -85,7 +85,7 @@ index 92a9112bca6..d888731ec8d 100644
 macx-xcode {
     qmake_pkginfo_typeinfo.name = QMAKE_PKGINFO_TYPEINFO
     !isEmpty(QMAKE_PKGINFO_TYPEINFO): \
-@@ -145,9 +150,6 @@ macx-xcode {
+@@ -150,9 +155,6 @@ macx-xcode {
     simulator: VALID_SIMULATOR_ARCHS = $$QMAKE_APPLE_SIMULATOR_ARCHS
     VALID_ARCHS = $$VALID_DEVICE_ARCHS $$VALID_SIMULATOR_ARCHS
 
--- a/depends/patches/qt/fix_android_jni_static.patch
+++ b/depends/patches/qt/fix_android_jni_static.patch
@ -1,6 +1,6 @@
 --- old/qtbase/src/plugins/platforms/android/androidjnimain.cpp
 +++ new/qtbase/src/plugins/platforms/android/androidjnimain.cpp
-@@ -934,6 +934,14 @@ Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void */*reserved*/)
+@@ -943,6 +943,14 @@ Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void */*reserved*/)
         __android_log_print(ANDROID_LOG_FATAL, "Qt", "registerNatives failed");
         return -1;
     }
--- a/depends/patches/qt/fix_limits_header.patch
+++ b/depends/patches/qt/fix_limits_header.patch
@ -1,33 +0,0 @@
-Fix compiling with GCC 11
-
-Upstream:
- - bug report: https://bugreports.qt.io/browse/QTBUG-89977
- - fix in Qt 6.1: 813a928c7c3cf98670b6043149880ed5c955efb9
-
--- old/qtbase/src/corelib/text/qbytearraymatcher.h
-+++ new/qtbase/src/corelib/text/qbytearraymatcher.h
-@@ -42,6 +42,8 @@
- 
- #include <QtCore/qbytearray.h>
- 
-+#include <limits>
-+
- QT_BEGIN_NAMESPACE
- 
- 
-
-Upstream fix and backports:
- - Qt 6.1: 3eab20ad382569cb2c9e6ccec2322c3d08c0f716
- - Qt 6.2: 380294a5971da85010a708dc23b0edec192cbf27
- - Qt 6.3: 2b2b3155d9f6ba1e4f859741468fbc47db09292b
-
--- old/qtbase/src/corelib/tools/qoffsetstringarray_p.h
-+++ new/qtbase/src/corelib/tools/qoffsetstringarray_p.h
-@@ -55,6 +55,7 @@
- 
- #include <tuple>
- #include <array>
-+#include <limits>
- 
- QT_BEGIN_NAMESPACE
- 
--- a/depends/patches/qt/guix_cross_lib_path.patch
+++ b/depends/patches/qt/guix_cross_lib_path.patch
@ -0,0 +1,17 @@
+Facilitate guix building with CROSS_LIBRARY_PATH
+
+See discussion in https://github.com/bitcoin/bitcoin/pull/15277.
+
+--- a/qtbase/mkspecs/features/toolchain.prf
+++ b/qtbase/mkspecs/features/toolchain.prf
+@@ -231,8 +231,8 @@ isEmpty($${target_prefix}.INCDIRS) {
+             add_libraries = false
+             for (line, output) {
+                 line ~= s/^[ \\t]*//  # remove leading spaces
+-                contains(line, "LIBRARY_PATH=.*") {
+-                    line ~= s/^LIBRARY_PATH=//  # remove leading LIBRARY_PATH=
+                contains(line, "(CROSS_)?LIBRARY_PATH=.*") {
+                    line ~= s/^(CROSS_)?LIBRARY_PATH=//  # remove leading (CROSS_)?LIBRARY_PATH=
+                     equals(QMAKE_HOST.os, Windows): \
+                         paths = $$split(line, ;)
+                     else: \
--- 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/) | [3.4.4](https://github.com/bitcoin/bitcoin/pull/6373) | | No |
-| [Qt](../depends/packages/qt.mk) | [link](https://download.qt.io/official_releases/qt/) | [5.15.3](https://github.com/bitcoin/bitcoin/pull/24668) | [5.11.3](https://github.com/bitcoin/bitcoin/pull/24132) | No |
+| [Qt](../depends/packages/qt.mk) | [link](https://download.qt.io/official_releases/qt/) | [5.15.5](https://github.com/bitcoin/bitcoin/pull/25719) | [5.11.3](https://github.com/bitcoin/bitcoin/pull/24132) | No |

 ### Networking
 | Dependency | Releases | Version used | Minimum required | Runtime |