Qt6 update:

    Add required new build files
    Update some qt patch files
    Update makefile and packages
    Update qt makefile
    Fix x86_64-linux-gnu, aarch64-linux-gnu and x86_64-w64-mingw32
    Fix not recognizing compiler problem
    Test for cross compilation on CI
    Reafctor: deprecated QRegExp  -> QRegularExpression
    Refactor: replace the function in QDataTime to compatible with Qt6:
    - Add qtcompat header file to better maintainability
    - Replace deprecated QDateTime::fromTime_t() with fromSecsSinceEpoch()
    - Replace deprecated QDateTime::toTime_t() with toSecsSinceEpoch()
    - Add QT_DATETIME_FROM_TIME_T() and QT_DATETIME_TO_TIME_T() macros
    Refactor: update key combination handling for Qt 6 compatibility
    Refactor: deprecated QDesktopWidget -> QScreen
    Refactor: add Qt::ItemFlag compatibility for Qt 6
    Refactor: remove Qt compatibility layer and update to Qt 6 APIs
    Refactor:  rename the functions and structure to avoid the conflict (Qt6+ use blake2 withing itself)
    Refactor: replace copy constructor with constructor (copy constructor is protected in Qt6)
    Add translation file generation and dependencies for firoqt
    Refactor: add some include header and some minor changes
    Remove skiping rpath in cmake
    Refactor: change parameter type from long to qintptr in nativeEventFilter method
    Add patch file for native_qt to resolve native f16 issue on apple targets
    Refactor: enhance the toolchain file (according to Bitcoin toolchain)
    Fix a definition of env in zeromq.mk
    Update the funcs to be like Bitcoin
    Pass pkg_config_path in CI + install binutils for windows target
    Add some flags for cross-compiling for apple targets
    Pass pkg_config_path and unset some env variables for apple targets in build.sh
    Update qt.mk:
    . Pass the compilers and flags as basic flags.
    . Pass windres for mingw target.

Author: aleflm

.github/workflows/ci-master.yml

@@ -245,7 +245,7 @@ if(BUILD_GUI)
   if(BUILD_GUI_TESTS)
     list(APPEND qt_components Test)
   endif()
-  find_package(Qt 5.11.3 MODULE REQUIRED
+  find_package(Qt 6.7.3 MODULE REQUIRED
     COMPONENTS ${qt_components}
   )
   unset(qt_components)
@@ -831,15 +831,6 @@ if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.29)
   set(CMAKE_SKIP_TEST_ALL_DEPENDENCY FALSE)
 endif()
 
-# TODO: The `CMAKE_SKIP_BUILD_RPATH` variable setting can be deleted
-#       in the future after reordering Guix script commands to
-#       perform binary checks after the installation step.
-# Relevant discussions:
-# - https://github.com/hebasto/firo/pull/236#issuecomment-2183120953
-# - https://github.com/firo/firo/pull/30312#issuecomment-2191235833
-set(CMAKE_SKIP_BUILD_RPATH TRUE)
-set(CMAKE_SKIP_INSTALL_RPATH TRUE)
-
 if(BUILD_TESTS)
   # Create test configuration file
   # This file is used by the test framework to configure the tests.

CMakeLists.txt

@@ -121,7 +121,7 @@ If you use a later version of Ubuntu, you may need to replace `python` with `pyt
 sudo dnf update
 sudo dnf install bzip2 perl-lib perl-FindBin gcc-c++ make cmake patch which
 # Also needed for GUI wallet only:
-sudo dnf install qt5-qttools-devel qt5-qtbase-devel xz bison
+sudo dnf install qt6-qttools-devel qt6-qtbase-devel xz bison
 sudo ln /usr/bin/bison /usr/bin/yacc
 ```
 - Arch:

README.md

@@ -27,34 +27,13 @@ if(CMAKE_HOST_APPLE)
   endif()
 endif()
 
-# Save CMAKE_FIND_ROOT_PATH_MODE_LIBRARY state.
-unset(_qt_find_root_path_mode_library_saved)
-if(DEFINED CMAKE_FIND_ROOT_PATH_MODE_LIBRARY)
-  set(_qt_find_root_path_mode_library_saved ${CMAKE_FIND_ROOT_PATH_MODE_LIBRARY})
-endif()
-
-# The Qt config files internally use find_library() calls for all
-# dependencies to ensure their availability. In turn, the find_library()
-# inspects the well-known locations on the file system; therefore, it must
-# be able to find platform-specific system libraries, for example:
-# /usr/x86_64-w64-mingw32/lib/libm.a or /usr/arm-linux-gnueabihf/lib/libm.a.
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)
-
 find_package(Qt${Qt_FIND_VERSION_MAJOR} ${Qt_FIND_VERSION}
   COMPONENTS ${Qt_FIND_COMPONENTS}
   HINTS ${_qt_homebrew_prefix}
   PATH_SUFFIXES Qt${Qt_FIND_VERSION_MAJOR}  # Required on OpenBSD systems.
 )
 unset(_qt_homebrew_prefix)
 
-# Restore CMAKE_FIND_ROOT_PATH_MODE_LIBRARY state.
-if(DEFINED _qt_find_root_path_mode_library_saved)
-  set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ${_qt_find_root_path_mode_library_saved})
-  unset(_qt_find_root_path_mode_library_saved)
-else()
-  unset(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY)
-endif()
-
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(Qt
   REQUIRED_VARS Qt${Qt_FIND_VERSION_MAJOR}_DIR
@@ -64,130 +43,3 @@ find_package_handle_standard_args(Qt
 foreach(component IN LISTS Qt_FIND_COMPONENTS ITEMS "")
   mark_as_advanced(Qt${Qt_FIND_VERSION_MAJOR}${component}_DIR)
 endforeach()
-
-# Prioritize finding static libraries
-set(_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
-set(CMAKE_FIND_LIBRARY_SUFFIXES .a ${_CMAKE_FIND_LIBRARY_SUFFIXES})
-
-find_library(LIB_QTLIBPNG NAMES qtlibpng REQUIRED)
-message(STATUS "Found Qt5 dependency: qtlibpng : ${LIB_QTLIBPNG}")
-
-if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT MINGW)
-  find_library(LIB_FONTCONFIG NAMES fontconfig REQUIRED)
-  message(STATUS "Found Qt5 dependency: fontconfig : ${LIB_FONTCONFIG}")
-
-  find_library(LIB_EXPAT NAMES expat REQUIRED)
-  message(STATUS "Found Qt5 dependency: expat : ${LIB_EXPAT}")
-  
-  find_library(LIB_FREETYPE NAMES freetype REQUIRED)
-  message(STATUS "Found Qt5 dependency: freetype : ${LIB_FREETYPE}")
-  
-  find_library(LIB_XCB_EWMH NAMES xcb-ewmh REQUIRED)
-  message(STATUS "Found Qt5 dependency: xcb-ewmh : ${LIB_XCB_EWMH}")
-  
-  find_library(LIB_XCB_ICCCM NAMES xcb-icccm REQUIRED)
-  message(STATUS "Found Qt5 dependency: xcb-icccm : ${LIB_XCB_ICCCM}")
-  
-  find_library(LIB_XCB_IMAGE NAMES xcb-image REQUIRED)
-  message(STATUS "Found Qt5 dependency: xcb-image : ${LIB_XCB_IMAGE}")
-  
-  find_library(LIB_XCB_KEYSYMS NAMES xcb-keysyms REQUIRED)
-  message(STATUS "Found Qt5 dependency: xcb-keysyms : ${LIB_XCB_KEYSYMS}")
-  
-  find_library(LIB_XCB_RANDR NAMES xcb-randr REQUIRED)
-  message(STATUS "Found Qt5 dependency: xcb-randr : ${LIB_XCB_RANDR}")
-  
-  find_library(LIB_XCB_RENDER_UTIL NAMES xcb-render-util REQUIRED)
-  message(STATUS "Found Qt5 dependency: xcb-render-util : ${LIB_XCB_RENDER_UTIL}")
-  
-  find_library(LIB_XCB_RENDER NAMES xcb-render REQUIRED)
-  message(STATUS "Found Qt5 dependency: xcb-render : ${LIB_XCB_RENDER}")
-  
-  find_library(LIB_XCB_SHAPE NAMES xcb-shape REQUIRED)
-  message(STATUS "Found Qt5 dependency: xcb-shape : ${LIB_XCB_SHAPE}")
-  
-  find_library(LIB_XCB_SHM NAMES xcb-shm REQUIRED)
-  message(STATUS "Found Qt5 dependency: xcb-shm : ${LIB_XCB_SHM}")
-  
-  find_library(LIB_XCB_SYNC NAMES xcb-sync REQUIRED)
-  message(STATUS "Found Qt5 dependency: xcb-sync : ${LIB_XCB_SYNC}")
-  
-  find_library(LIB_XCB_UTIL NAMES xcb-util REQUIRED)
-  message(STATUS "Found Qt5 dependency: xcb-util : ${LIB_XCB_UTIL}")
-  
-  find_library(LIB_XCB_XFIXES NAMES xcb-xfixes REQUIRED)
-  message(STATUS "Found Qt5 dependency: xcb-xfixes : ${LIB_XCB_XFIXES}")
-  
-  find_library(LIB_XCB_XINERAMA NAMES xcb-xinerama REQUIRED)
-  message(STATUS "Found Qt5 dependency: xcb-xinerama : ${LIB_XCB_XINERAMA}")
-  
-  find_library(LIB_XCB_XKB NAMES xcb-xkb REQUIRED)
-  message(STATUS "Found Qt5 dependency: xcb-xkb : ${LIB_XCB_XKB}")
-  
-  find_library(LIB_XCB NAMES xcb REQUIRED)
-  message(STATUS "Found Qt5 dependency: xcb : ${LIB_XCB}")
-
-  find_library(LIB_XKBCOMMON_X11 NAMES xkbcommon-x11 REQUIRED)
-  message(STATUS "Found Qt5 dependency: xkbcommon-x11 : ${LIB_XKBCOMMON_X11}")
-  
-  find_library(LIB_XKBCOMMON NAMES xkbcommon REQUIRED)
-  message(STATUS "Found Qt5 dependency: xkbcommon : ${LIB_XKBCOMMON}")
-  
-  find_library(LIB_XAU NAMES Xau REQUIRED)
-  message(STATUS "Found Qt5 dependency: Xau : ${LIB_XAU}")
-
-endif()
-  
-find_library(LIB_QTHARFBUZZ NAMES qtharfbuzz REQUIRED)
-message(STATUS "Found Qt5 dependency: qtharfbuzz : ${LIB_QTHARFBUZZ}")
-
-find_library(LIB_QTPCR2 NAMES qtpcre2 REQUIRED)
-message(STATUS "Found Qt5 dependency: qtpcre2 : ${LIB_QTPCR2}")
-
-find_library(LIB_Z NAMES z REQUIRED)
-message(STATUS "Found Qt5 dependency: z : ${LIB_Z}")
-
-# Qt5 dependencies libraries, order is important, should be last
-add_library(Qt5_Dependencies
-  INTERFACE
-)
-target_link_libraries(Qt5_Dependencies
-  INTERFACE
-  ${LIB_QTLIBPNG}
-  ${LIB_QTHARFBUZZ}
-  ${LIB_QTPCR2}
-  $<$<PLATFORM_ID:Linux>:${LIB_FONTCONFIG}>
-  $<$<PLATFORM_ID:Linux>:${LIB_FREETYPE}>
-  $<$<PLATFORM_ID:Linux>:${LIB_EXPAT}>
-  $<$<PLATFORM_ID:Linux>:${LIB_XCB_EWMH}>
-  $<$<PLATFORM_ID:Linux>:${LIB_XCB_ICCCM}>
-  $<$<PLATFORM_ID:Linux>:${LIB_XCB_IMAGE}>
-  $<$<PLATFORM_ID:Linux>:${LIB_XCB_KEYSYMS}>
-  $<$<PLATFORM_ID:Linux>:${LIB_XCB_RANDR}>
-  $<$<PLATFORM_ID:Linux>:${LIB_XCB_RENDER_UTIL}>
-  $<$<PLATFORM_ID:Linux>:${LIB_XCB_RENDER}>
-  $<$<PLATFORM_ID:Linux>:${LIB_XCB_SHAPE}>
-  $<$<PLATFORM_ID:Linux>:${LIB_XCB_SHM}>
-  $<$<PLATFORM_ID:Linux>:${LIB_XCB_SYNC}>
-  $<$<PLATFORM_ID:Linux>:${LIB_XCB_UTIL}>
-  $<$<PLATFORM_ID:Linux>:${LIB_XCB_XFIXES}>
-  $<$<PLATFORM_ID:Linux>:${LIB_XCB_XINERAMA}>
-  $<$<PLATFORM_ID:Linux>:${LIB_XCB_XKB}>
-  $<$<PLATFORM_ID:Linux>:${LIB_XCB}>
-  $<$<PLATFORM_ID:Linux>:${LIB_XKBCOMMON_X11}>
-  $<$<PLATFORM_ID:Linux>:${LIB_XKBCOMMON}>
-  $<$<PLATFORM_ID:Linux>:${LIB_XAU}>
-  ${LIB_Z}
-)
-
-if(NOT WIN32 AND NOT MINGW)
-  target_link_libraries(Qt5_Dependencies
-    INTERFACE
-    ${CMAKE_DL_LIBS}  # Ensure dynamic loading is available.
-  )
-endif()
-
-add_library(Qt5::Dependencies ALIAS Qt5_Dependencies)
-
-# Restore CMAKE_FIND_LIBRARY_SUFFIXES state.
-set(CMAKE_FIND_LIBRARY_SUFFIXES ${_CMAKE_FIND_LIBRARY_SUFFIXES})

cmake/module/FindQt.cmake

@@ -45,7 +45,7 @@ bitcoin (0.13.1-trusty1) trusty; urgency=medium
   * New upstream release.
   * Backport updated bitcoin-qt.desktop from upstream master
   * Add zmq dependency
-  * Switch to Qt5 (breaks precise, but that was already broken by C++11)
+  * Switch to Qt6 (breaks precise, but that was already broken by C++11)
 
  -- Matt Corallo (BlueMatt) <[email protected]>  Thu, 27 Oct 2016 17:32:00 -0400
 

contrib/debian/changelog

@@ -12,7 +12,7 @@ override_dh_auto_clean:
 	if [ -f Makefile ]; then $(MAKE) distclean; fi
 	rm -rf Makefile.in aclocal.m4 configure src/Makefile.in src/bitcoin-config.h.in src/build-aux src/qt/Makefile.in src/qt/test/Makefile.in src/test/Makefile.in
 
-QT=$(shell dpkg-vendor --derives-from Ubuntu && echo qt4 || echo qt5)
+QT=$(shell dpkg-vendor --derives-from Ubuntu && echo qt4 || echo qt6)
 
 # Yea, autogen should be run on the source archive, but I like doing git archive
 override_dh_auto_configure:

contrib/debian/rules

@@ -365,20 +365,22 @@ mkdir -p "$DISTSRC"
             ;;
     esac
 
-    # Empty environment variables for x86_64-apple-darwin
-    if [[ "$HOST" == "x86_64-apple-darwin"* ]]; then
-        unset LIBRARY_PATH
+    # Empty environment variables for all Darwin builds to prevent GCC header conflicts
+    if [[ "$HOST" == *"darwin"* ]]; then
         unset CPATH
         unset C_INCLUDE_PATH
         unset CPLUS_INCLUDE_PATH
         unset OBJC_INCLUDE_PATH
         unset OBJCPLUS_INCLUDE_PATH
+        unset CC
+        unset CXX
+        unset CPP
     fi
 
 
     # Configure this DISTSRC for $HOST
     # shellcheck disable=SC2086
-    env CFLAGS="${HOST_CFLAGS}" CXXFLAGS="${HOST_CXXFLAGS}" OBJCXXFLAGS="${HOST_OBJCXXFLAGS}" \
+    env PKG_CONFIG_PATH="${BASEPREFIX}/${HOST}/lib/pkgconfig:$PKG_CONFIG_PATH" CFLAGS="${HOST_CFLAGS}" CXXFLAGS="${HOST_CXXFLAGS}" OBJCXXFLAGS="${HOST_OBJCXXFLAGS}" LDFLAGS="${HOST_LDFLAGS}" \
     cmake --toolchain "${BASEPREFIX}/${HOST}/toolchain.cmake" -S . -B build \
       -DCMAKE_INSTALL_PREFIX="${INSTALLPATH}" \
       -DCMAKE_EXE_LINKER_FLAGS="${HOST_LDFLAGS}" \

contrib/guix/libexec/build.sh

@@ -72,7 +72,7 @@ difficult for a user to recover from backup in the event of a system failure.
 
 ## Graphical User Interface and Qt Version
 
-The RPM spec file will by default build the GUI client linked against the Qt5
+The RPM spec file will by default build the GUI client linked against the Qt6
 libraries. If you wish instead to link against the Qt4 libraries you need to
 pass the switch `-D '_use_qt4 1'` at build time to the `rpmbuild` or `mock`
 command used to build the packages.

contrib/rpm/README.md

@@ -9,7 +9,7 @@
 %if 0%{?_use_qt4}
 %define buildargs --with-qrencode --with-gui=qt4
 %else
-%define buildargs --with-qrencode --with-gui=qt5
+%define buildargs --with-qrencode --with-gui=qt6
 %endif
 %endif
 
@@ -67,9 +67,9 @@ Provides:	%{name} = %{version}-%{release}
 %if 0%{?_use_qt4}
 BuildRequires:	qt-devel
 %else
-BuildRequires:	qt5-qtbase-devel
-# for /usr/bin/lrelease-qt5
-BuildRequires:	qt5-linguist
+BuildRequires:	qt6-qtbase-devel
+# for /usr/bin/lrelease-qt6
+BuildRequires:	qt6-linguist
 %endif
 BuildRequires:	protobuf-devel
 BuildRequires:	qrencode-devel
@@ -429,7 +429,7 @@ rm -rf %{buildroot}
 * Fri Feb 26 2016 Alice Wonder <[email protected]> - 0.12.0-2
 - Rename Qt package from bitcoin to bitcoin-core
 - Make building of the Qt package optional
-- When building the Qt package, default to Qt5 but allow building
+- When building the Qt package, default to Qt6 but allow building
 -  against Qt4
 - Only run SELinux stuff in post scripts if it is not set to disabled
 

contrib/rpm/bitcoin.spec

@@ -47,7 +47,7 @@ FALLBACK_DOWNLOAD_PATH ?= https://firo.org/depends-sources
 FALLBACK_DOWNLOAD_PATH_ALTERNATIVE ?= https://bitcoincore.org/depends-sources
 
 C_STANDARD ?= c11
-CXX_STANDARD ?= c++17
+CXX_STANDARD ?= c++20
 
 BUILD = $(shell ./config.guess)
 PATCHES_PATH = $(BASEDIR)/patches
@@ -169,7 +169,7 @@ zmq_packages_$(NO_ZMQ) = $(zmq_packages)
 multiprocess_packages_$(MULTIPROCESS) = $(multiprocess_packages)
 
 packages += $($(host_arch)_$(host_os)_packages) $($(host_os)_packages) $(boost_packages_) $(libevent_packages_) $(qt_packages_) $(wallet_packages_)
-native_packages += $($(host_arch)_$(host_os)_native_packages) $($(host_os)_native_packages)
+native_packages += $($(host_arch)_$(host_os)_native_packages) $($(host_os)_native_packages) $(qt_native_packages_)
 
 ifneq ($(zmq_packages_),)
 packages += $(zmq_packages)
@@ -203,32 +203,6 @@ else
   crosscompiling=TRUE
 endif
 
-$(host_prefix)/share/config.site : config.site.in $(host_prefix)/.stamp_$(final_build_id)
-	$(AT)@mkdir -p $(@D)Add commentMore actions
-	$(AT)sed -e 's|@HOST@|$(host)|' \
-            -e 's|@CC@|$(host_CC)|' \
-            -e 's|@CXX@|$(host_CXX)|' \
-            -e 's|@AR@|$(host_AR)|' \
-            -e 's|@RANLIB@|$(host_RANLIB)|' \
-            -e 's|@NM@|$(host_NM)|' \
-            -e 's|@STRIP@|$(host_STRIP)|' \
-            -e 's|@build_os@|$(build_os)|' \
-            -e 's|@host_os@|$(host_os)|' \
-            -e 's|@CFLAGS@|$(strip $(host_CFLAGS) $(host_$(release_type)_CFLAGS))|' \
-            -e 's|@CXXFLAGS@|$(strip $(host_CXXFLAGS) $(host_$(release_type)_CXXFLAGS))|' \
-            -e 's|@CPPFLAGS@|$(strip $(host_CPPFLAGS) $(host_$(release_type)_CPPFLAGS))|' \
-            -e 's|@LDFLAGS@|$(strip $(host_LDFLAGS) $(host_$(release_type)_LDFLAGS))|' \
-            -e 's|@allow_host_packages@|$(ALLOW_HOST_PACKAGES)|' \
-            -e 's|@no_qt@|$(NO_QT)|' \
-            -e 's|@no_qr@|$(NO_QR)|' \
-            -e 's|@no_zmq@|$(NO_ZMQ)|' \
-            -e 's|@no_wallet@|$(NO_WALLET)|' \
-            -e 's|@no_bdb@|$(NO_BDB)|' \
-            -e 's|@no_sqlite@|$(NO_SQLITE)|' \
-            -e 's|@debug@|$(DEBUG)|' \
-            $< > $@
-	$(AT)touch $@
-
 $(host_prefix)/toolchain.cmake : toolchain.cmake.in $(host_prefix)/.stamp_$(final_build_id)
 	@mkdir -p $(@D)
 	sed -e 's|@depends_crosscompiling@|$(crosscompiling)|' \
@@ -298,7 +272,7 @@ clean-all: clean
 clean:
 	@rm -rf $(WORK_PATH) $(BASE_CACHE) $(BUILD) *.log
 
-install: check-packages $(host_prefix)/toolchain.cmake $(host_prefix)/share/config.site
+install: check-packages $(host_prefix)/toolchain.cmake
 
 
 download-one: check-sources $(all_sources)