Skip to content

Commit 65b495f

Browse files
committed
depends: Update Qt to 6.8.4
1 parent 907e284 commit 65b495f

8 files changed

Lines changed: 16 additions & 52 deletions

depends/packages/qt.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ $(package)_patches_path := $(qt_details_patches_path)
1313
$(package)_patches := cocoa_compat.patch
1414
$(package)_patches += dont_hardcode_pwd.patch
1515
$(package)_patches += qtbase_avoid_qmain.patch
16-
$(package)_patches += qtbase_platformsupport.patch
1716
$(package)_patches += qtbase_plugins_cocoa.patch
1817
$(package)_patches += qtbase_skip_tools.patch
1918
$(package)_patches += rcc_hardcode_timestamp.patch
@@ -273,7 +272,6 @@ define $(package)_preprocess_cmds
273272
patch -p1 -i $($(package)_patch_dir)/cocoa_compat.patch && \
274273
patch -p1 -i $($(package)_patch_dir)/dont_hardcode_pwd.patch && \
275274
patch -p1 -i $($(package)_patch_dir)/qtbase_avoid_qmain.patch && \
276-
patch -p1 -i $($(package)_patch_dir)/qtbase_platformsupport.patch && \
277275
patch -p1 -i $($(package)_patch_dir)/qtbase_plugins_cocoa.patch && \
278276
patch -p1 -i $($(package)_patch_dir)/qtbase_skip_tools.patch && \
279277
patch -p1 -i $($(package)_patch_dir)/rcc_hardcode_timestamp.patch && \

depends/packages/qt_details.mk

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
qt_details_version := 6.8.3
1+
qt_details_version := 6.8.4
22
qt_details_download_path := https://download.qt.io/archive/qt/6.8/$(qt_details_version)/submodules
3-
qt_details_suffix := everywhere-src-$(qt_details_version).tar.xz
3+
qt_details_suffix := everywhere-opensource-src-$(qt_details_version).tar.xz
44

55
qt_details_qtbase_file_name := qtbase-$(qt_details_suffix)
6-
qt_details_qtbase_sha256_hash := 56001b905601bb9023d399f3ba780d7fa940f3e4861e496a7c490331f49e0b80
6+
qt_details_qtbase_sha256_hash := 532dfbf3fa3cbc68fa37441ea9e81c5009da044eaecda78ffaeafd8bd125532f
77

88
qt_details_qttranslations_file_name := qttranslations-$(qt_details_suffix)
9-
qt_details_qttranslations_sha256_hash := c3c61d79c3d8fe316a20b3617c64673ce5b5519b2e45535f49bee313152fa531
9+
qt_details_qttranslations_sha256_hash := 33b1fd1d75598cbf54da12263957f18292c9fb01e42fcc3ab9bd2f8ac79763b7
1010

1111
qt_details_qttools_file_name := qttools-$(qt_details_suffix)
12-
qt_details_qttools_sha256_hash := 02a4e219248b94f1333df843d25763f35251c1074cdc4fb5bda67d340f8c8b3a
12+
qt_details_qttools_sha256_hash := c6030ea66d7be1ca7e3b40578beb35b0f4ff4014277d8e051d3219759f6ab399
1313

1414
qt_details_patches_path := $(PATCHES_PATH)/qt
1515

16-
qt_details_top_download_path := https://raw.githubusercontent.com/qt/qt5/refs/heads/$(qt_details_version)
16+
qt_details_top_download_path := https://raw.githubusercontent.com/qt/qt5/refs/tags/v$(qt_details_version)-lts-lgpl
1717
qt_details_top_cmakelists_file_name := CMakeLists.txt
1818
qt_details_top_cmakelists_download_file := $(qt_details_top_cmakelists_file_name)
1919
qt_details_top_cmakelists_sha256_hash := 54e9a4e554da37792446dda4f52bc308407b01a34bcc3afbad58e4e0f71fac9b

depends/patches/qt/fix-gcc16-qcompare.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ index d82cf5ab4a4e..7eee69db66a3 100644
105105
namespace Qt {
106106

107107
class weak_ordering;
108-
@@ -157,12 +183,18 @@ public:
108+
@@ -156,12 +182,18 @@ public:
109109
constexpr Q_IMPLICIT operator std::partial_ordering() const noexcept
110110
{
111111
static_assert(sizeof(*this) == sizeof(std::partial_ordering));
@@ -127,15 +127,15 @@ index d82cf5ab4a4e..7eee69db66a3 100644
127127
switch (m_order) {
128128
case qToUnderlying(O::Less): return R::less;
129129
case qToUnderlying(O::Greater): return R::greater;
130-
@@ -170,7 +202,6 @@ public:
130+
@@ -169,7 +201,6 @@ public:
131131
case qToUnderlying(U::Unordered): return R::unordered;
132132
}
133133
Q_UNREACHABLE_RETURN(R::unordered);
134134
-#endif // __cpp_lib_bit_cast
135135
}
136136

137137
friend constexpr bool operator==(partial_ordering lhs, std::partial_ordering rhs) noexcept
138-
@@ -349,18 +380,18 @@ public:
138+
@@ -347,18 +378,18 @@ public:
139139
constexpr Q_IMPLICIT operator std::weak_ordering() const noexcept
140140
{
141141
static_assert(sizeof(*this) == sizeof(std::weak_ordering));
@@ -158,7 +158,7 @@ index d82cf5ab4a4e..7eee69db66a3 100644
158158
}
159159

160160
friend constexpr bool operator==(weak_ordering lhs, std::weak_ordering rhs) noexcept
161-
@@ -547,18 +578,18 @@ public:
161+
@@ -542,18 +573,18 @@ public:
162162
constexpr Q_IMPLICIT operator std::strong_ordering() const noexcept
163163
{
164164
static_assert(sizeof(*this) == sizeof(std::strong_ordering));
@@ -181,7 +181,7 @@ index d82cf5ab4a4e..7eee69db66a3 100644
181181
}
182182

183183
friend constexpr bool operator==(strong_ordering lhs, std::strong_ordering rhs) noexcept
184-
@@ -625,6 +656,8 @@ inline constexpr strong_ordering strong_ordering::greater(QtPrivate::Ordering::G
184+
@@ -620,6 +651,8 @@ inline constexpr strong_ordering strong_ordering::greater(QtPrivate::Ordering::G
185185

186186
} // namespace Qt
187187

depends/patches/qt/fix-gcc16-sfinae-qanystringview.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ diff --git a/qtbase/src/corelib/text/qanystringview.cpp b/qtbase/src/corelib/tex
1919
index 7bf8a3fa1fd..3c993ff1da0 100644
2020
--- a/qtbase/src/corelib/text/qanystringview.cpp
2121
+++ b/qtbase/src/corelib/text/qanystringview.cpp
22-
@@ -243,6 +243,10 @@ QT_BEGIN_NAMESPACE
22+
@@ -355,6 +355,10 @@ QT_BEGIN_NAMESPACE
2323
\sa isNull(), isEmpty()
2424
*/
2525

depends/patches/qt/fix-gcc16-sfinae-qchar.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ diff --git a/qtbase/src/corelib/kernel/qmetatype.cpp b/qtbase/src/corelib/kernel
3737
index e70583404a46..54a0fe671fe0 100644
3838
--- a/qtbase/src/corelib/kernel/qmetatype.cpp
3939
+++ b/qtbase/src/corelib/kernel/qmetatype.cpp
40-
@@ -1212,7 +1212,7 @@ QT_WARNING_DISABLE_CLANG("-Wtautological-compare")
40+
@@ -1230,7 +1230,7 @@ QT_WARNING_DISABLE_CLANG("-Wtautological-compare")
4141
return true;
4242
);
4343
QMETATYPE_CONVERTER(QString, Char32,

depends/patches/qt/qtbase_platformsupport.patch

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

depends/patches/qt/qtbase_plugins_cocoa.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ See: https://codereview.qt-project.org/c/qt/qtbase/+/634002
88

99
--- a/qtbase/src/plugins/platforms/cocoa/CMakeLists.txt
1010
+++ b/qtbase/src/plugins/platforms/cocoa/CMakeLists.txt
11-
@@ -107,3 +107,10 @@ qt_internal_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_sessionma
11+
@@ -108,3 +108,10 @@ qt_internal_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_sessionma
1212
SOURCES
1313
qcocoasessionmanager.cpp qcocoasessionmanager.h
1414
)

depends/patches/qt/qtbase_skip_tools.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Skip building/installing unneeded tools:
99

1010
--- a/qtbase/cmake/QtBaseGlobalTargets.cmake
1111
+++ b/qtbase/cmake/QtBaseGlobalTargets.cmake
12-
@@ -118,9 +118,6 @@ qt_generate_global_module_pri_file()
12+
@@ -128,9 +128,6 @@ qt_generate_global_module_pri_file()
1313
qt_generate_global_device_pri_file()
1414
qt_generate_qmake_and_qtpaths_wrapper_for_target()
1515

@@ -19,7 +19,7 @@ Skip building/installing unneeded tools:
1919

2020
qt_internal_add_platform_internal_target(GlobalConfigPrivate)
2121
target_link_libraries(GlobalConfigPrivate INTERFACE GlobalConfig)
22-
@@ -390,12 +387,3 @@ elseif(WASM)
22+
@@ -400,12 +397,3 @@ elseif(WASM)
2323
qt_install(PROGRAMS "${QT_BUILD_DIR}/${INSTALL_LIBEXECDIR}/qt-wasmtestrunner.py"
2424
DESTINATION "${INSTALL_LIBEXECDIR}")
2525
endif()

0 commit comments

Comments
 (0)