Skip to content

Commit a680f10

Browse files
committed
build: upgrade depends to Qt6
1 parent 2054bd2 commit a680f10

18 files changed

+213
-608
lines changed

depends/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ libevent_packages_$(NO_LIBEVENT) = $(libevent_packages)
160160
qrencode_packages_$(NO_QR) = $(qrencode_$(host_os)_packages)
161161

162162
qt_packages_$(NO_QT) = $(qt_packages) $(qt_$(host_os)_packages) $(qt_$(host_arch)_$(host_os)_packages) $(qrencode_packages_)
163+
qt_native_packages_$(NO_QT) = $(qt_native_packages)
163164

164165
bdb_packages_$(NO_BDB) = $(bdb_packages)
165166
sqlite_packages_$(NO_SQLITE) = $(sqlite_packages)
@@ -172,7 +173,7 @@ multiprocess_packages_$(MULTIPROCESS) = $(multiprocess_packages)
172173
usdt_packages_$(NO_USDT) = $(usdt_$(host_os)_packages)
173174

174175
packages += $($(host_arch)_$(host_os)_packages) $($(host_os)_packages) $(boost_packages_) $(libevent_packages_) $(qt_packages_) $(wallet_packages_) $(upnp_packages_) $(usdt_packages_)
175-
native_packages += $($(host_arch)_$(host_os)_native_packages) $($(host_os)_native_packages)
176+
native_packages += $($(host_arch)_$(host_os)_native_packages) $($(host_os)_native_packages) $(qt_native_packages_)
176177

177178
ifneq ($(zmq_packages_),)
178179
packages += $(zmq_packages)

depends/packages/packages.mk

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,12 @@ qrencode_linux_packages = qrencode
88
qrencode_darwin_packages = qrencode
99
qrencode_mingw32_packages = qrencode
1010

11-
qt_linux_packages:=qt expat libxcb xcb_proto libXau xproto freetype fontconfig libxkbcommon libxcb_util libxcb_util_render libxcb_util_keysyms libxcb_util_image libxcb_util_wm
11+
qt_linux_packages:=qt expat libxcb xcb_proto libXau xproto freetype fontconfig libxkbcommon libxcb_util libxcb_util_cursor libxcb_util_render libxcb_util_keysyms libxcb_util_image libxcb_util_wm
1212
qt_darwin_packages=qt
1313
qt_mingw32_packages=qt
14+
ifneq ($(host),$(build))
15+
qt_native_packages := native_qt
16+
endif
1417

1518
bdb_packages=bdb
1619
sqlite_packages=sqlite

depends/packages/qt.mk

Lines changed: 176 additions & 173 deletions
Large diffs are not rendered by default.

depends/patches/qt/clang_18_libpng.patch

Lines changed: 0 additions & 40 deletions
This file was deleted.

depends/patches/qt/darwin_no_libm.patch

Lines changed: 0 additions & 17 deletions
This file was deleted.

depends/patches/qt/dont_hardcode_pwd.patch

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,39 @@ diff --git a/qtbase/configure b/qtbase/configure
1313
index 08b49a8d..faea5b55 100755
1414
--- a/qtbase/configure
1515
+++ b/qtbase/configure
16-
@@ -36,9 +36,9 @@
17-
relconf=`basename $0`
16+
@@ -9,9 +9,9 @@
17+
1818
# the directory of this script is the "source tree"
19-
relpath=`dirname $0`
19+
relpath=`dirname "$0"`
2020
-relpath=`(cd "$relpath"; /bin/pwd)`
2121
+relpath=`(cd "$relpath"; pwd)`
2222
# the current directory is the "build tree" or "object tree"
2323
-outpath=`/bin/pwd`
2424
+outpath=`pwd`
25+
outpathPrefix=$outpath
26+
27+
# do this early so we don't store it in config.status
2528

26-
WHICH="which"
29+
--- a/qtbase/bin/qt-cmake.in
30+
+++ b/qtbase/bin/qt-cmake.in
31+
@@ -2,7 +2,7 @@
32+
33+
# The directory of this script is the expanded absolute path of the "$qt_prefix/bin" directory.
34+
script_dir_path=`dirname $0`
35+
-script_dir_path=`(cd "$script_dir_path"; /bin/pwd)`
36+
+script_dir_path=`(cd "$script_dir_path"; pwd)`
37+
38+
# Try to use original cmake, otherwise to make it relocatable, use any cmake found in PATH.
39+
original_cmake_path="@CMAKE_COMMAND@"
2740

41+
--- a/qtbase/bin/qt-configure-module.in
42+
+++ b/qtbase/bin/qt-configure-module.in
43+
@@ -2,7 +2,7 @@
44+
set -eu
45+
46+
script_dir_path=`dirname $0`
47+
-script_dir_path=`(cd "$script_dir_path"; /bin/pwd)`
48+
+script_dir_path=`(cd "$script_dir_path"; pwd)`
49+
50+
printUsage()
51+
{

depends/patches/qt/duplicate_lcqpafonts.patch

Lines changed: 0 additions & 104 deletions
This file was deleted.

depends/patches/qt/guix_cross_lib_path.patch

Lines changed: 0 additions & 17 deletions
This file was deleted.

depends/patches/qt/mac-qmake.conf

Lines changed: 0 additions & 23 deletions
This file was deleted.

depends/patches/qt/no-xlib.patch

Lines changed: 0 additions & 61 deletions
This file was deleted.

0 commit comments

Comments
 (0)