Skip to content

Commit 5e794e6

Browse files
committed
depends: Bump qt package up to 6.7.3
1 parent 6d42149 commit 5e794e6

26 files changed

+406
-562
lines changed

depends/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ The paths are automatically configured and no other options are needed.
4747

4848
Skip the following packages if you don't intend to use the GUI and will build with [`NO_QT=1`](#dependency-options):
4949

50-
apt install bison g++ pkgconf python3 xz-utils
50+
apt install bison g++ ninja-build pkgconf python3 xz-utils
5151

5252
#### For macOS cross compilation
5353

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
package=libxcb_util_cursor
2+
$(package)_version=0.1.5
3+
$(package)_download_path=https://xcb.freedesktop.org/dist
4+
$(package)_file_name=xcb-util-cursor-$($(package)_version).tar.gz
5+
$(package)_sha256_hash=0e9c5446dc6f3beb8af6ebfcc9e27bcc6da6fe2860f7fc07b99144dfa568e93b
6+
$(package)_dependencies=libxcb libxcb_util_render libxcb_util_image
7+
8+
define $(package)_set_vars
9+
$(package)_config_opts = --disable-static
10+
$(package)_config_opts += --disable-dependency-tracking --enable-option-checking
11+
endef
12+
13+
define $(package)_preprocess_cmds
14+
cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub .
15+
endef
16+
17+
define $(package)_config_cmds
18+
$($(package)_autoconf)
19+
endef
20+
21+
define $(package)_build_cmds
22+
$(MAKE)
23+
endef
24+
25+
define $(package)_stage_cmds
26+
$(MAKE) DESTDIR=$($(package)_staging_dir) install
27+
endef
28+
29+
define $(package)_postprocess_cmds
30+
rm lib/*.la
31+
endef

depends/packages/packages.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ 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
1414

depends/packages/qt.mk

Lines changed: 116 additions & 146 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.

0 commit comments

Comments
 (0)