From 0ef54aa4c8c3860a04d2f6276730c7abd27981eb Mon Sep 17 00:00:00 2001 From: tobtoht Date: Tue, 10 Oct 2023 11:58:07 +0200 Subject: [PATCH] depends: qt: update to 6.6.0 --- contrib/depends/packages/native_qt.mk | 14 +- contrib/depends/packages/qt.mk | 16 +- .../native_qt/rcc_hardcode_timestamp.patch | 11 +- .../patches/qt/qtmultimedia-fixes.patch | 159 ------------------ .../patches/qt/rcc_hardcode_timestamp.patch | 11 +- 5 files changed, 27 insertions(+), 184 deletions(-) diff --git a/contrib/depends/packages/native_qt.mk b/contrib/depends/packages/native_qt.mk index d200eb44..60058bd7 100644 --- a/contrib/depends/packages/native_qt.mk +++ b/contrib/depends/packages/native_qt.mk @@ -1,9 +1,9 @@ package=native_qt -$(package)_version=6.5.3 -$(package)_download_path=https://download.qt.io/official_releases/qt/6.5/$($(package)_version)/submodules +$(package)_version=6.6.0 +$(package)_download_path=https://download.qt.io/official_releases/qt/6.6/$($(package)_version)/submodules $(package)_suffix=everywhere-src-$($(package)_version).tar.xz $(package)_file_name=qtbase-$($(package)_suffix) -$(package)_sha256_hash=df2f4a230be4ea04f9798f2c19ab1413a3b8ec6a80bef359f50284235307b546 +$(package)_sha256_hash=039d53312acb5897a9054bd38c9ccbdab72500b71fdccdb3f4f0844b0dd39e0e $(package)_qt_libs=corelib network widgets gui plugins testlib $(package)_patches = dont_hardcode_pwd.patch $(package)_patches += fast_fixed_dtoa_no_optimize.patch @@ -13,16 +13,16 @@ $(package)_patches += rcc_hardcode_timestamp.patch $(package)_patches += root_CMakeLists.txt $(package)_qttools_file_name=qttools-$($(package)_suffix) -$(package)_qttools_sha256_hash=fc91d32b3f696725bbb48b0df240c25b606bbee3bd22627cfcbee876a6405e37 +$(package)_qttools_sha256_hash=4e9feebc142bbb6e453e1dc3277e09ec45c8ef081b5ee2a029e6684b5905ba99 $(package)_qtsvg_file_name=qtsvg-$($(package)_suffix) -$(package)_qtsvg_sha256_hash=fc41c47b69ca1f80473cd4b11996394155781105345392961d064d04f95d5bef +$(package)_qtsvg_sha256_hash=33da25fef51102f564624a7ea3e57cb4a0a31b7b44783d1af5749ac36d3c72de $(package)_qtmultimedia_file_name=qtmultimedia-$($(package)_suffix) -$(package)_qtmultimedia_sha256_hash=ed64f3d2bb98c20cd12df19dbf84dc0233d9fcb2078fea812adf42eef9a0ff27 +$(package)_qtmultimedia_sha256_hash=ba4b236ca3ec118841b7f5ba87797e24a8c5cbef9ba973fe219fbfc310d38782 $(package)_qtshadertools_file_name=qtshadertools-$($(package)_suffix) -$(package)_qtshadertools_sha256_hash=201b7b3a409f048e78c5defb90a70af423166313ad4386f8e6b83990ae0f3573 +$(package)_qtshadertools_sha256_hash=3690327dc550144b8102be2bb7f6dc995ccbe3584041094ad021a83737ef9875 $(package)_extra_sources += $($(package)_qttools_file_name) $(package)_extra_sources += $($(package)_qtsvg_file_name) diff --git a/contrib/depends/packages/qt.mk b/contrib/depends/packages/qt.mk index f54173d0..dd440c76 100644 --- a/contrib/depends/packages/qt.mk +++ b/contrib/depends/packages/qt.mk @@ -1,9 +1,9 @@ package=qt -$(package)_version=6.5.3 -$(package)_download_path=https://download.qt.io/official_releases/qt/6.5/$($(package)_version)/submodules +$(package)_version=6.6.0 +$(package)_download_path=https://download.qt.io/official_releases/qt/6.6/$($(package)_version)/submodules $(package)_suffix=everywhere-src-$($(package)_version).tar.xz $(package)_file_name=qtbase-$($(package)_suffix) -$(package)_sha256_hash=df2f4a230be4ea04f9798f2c19ab1413a3b8ec6a80bef359f50284235307b546 +$(package)_sha256_hash=039d53312acb5897a9054bd38c9ccbdab72500b71fdccdb3f4f0844b0dd39e0e $(package)_darwin_dependencies=native_cctools native_qt openssl $(package)_mingw32_dependencies=openssl native_qt $(package)_linux_dependencies=openssl native_qt freetype fontconfig libxcb libxkbcommon libxcb_util libxcb_util_render libxcb_util_keysyms libxcb_util_image libxcb_util_wm libxcb_util_cursor dbus @@ -22,19 +22,19 @@ $(package)_patches += toolchain.cmake #$(package)_patches += fix-static-fontconfig-static-linking.patch $(package)_qttools_file_name=qttools-$($(package)_suffix) -$(package)_qttools_sha256_hash=fc91d32b3f696725bbb48b0df240c25b606bbee3bd22627cfcbee876a6405e37 +$(package)_qttools_sha256_hash=4e9feebc142bbb6e453e1dc3277e09ec45c8ef081b5ee2a029e6684b5905ba99 $(package)_qtsvg_file_name=qtsvg-$($(package)_suffix) -$(package)_qtsvg_sha256_hash=fc41c47b69ca1f80473cd4b11996394155781105345392961d064d04f95d5bef +$(package)_qtsvg_sha256_hash=33da25fef51102f564624a7ea3e57cb4a0a31b7b44783d1af5749ac36d3c72de $(package)_qtwebsockets_file_name=qtwebsockets-$($(package)_suffix) -$(package)_qtwebsockets_sha256_hash=04e2ae17594d56cf2930c99dbd2a97eb88ff514b445c17ff7b86e8978fc7a7c3 +$(package)_qtwebsockets_sha256_hash=2e05b15c0c6e82c484cf3a4a39a3e3e484a6c8f72bc31ee5cf615d52d07df30e $(package)_qtmultimedia_file_name=qtmultimedia-$($(package)_suffix) -$(package)_qtmultimedia_sha256_hash=ed64f3d2bb98c20cd12df19dbf84dc0233d9fcb2078fea812adf42eef9a0ff27 +$(package)_qtmultimedia_sha256_hash=ba4b236ca3ec118841b7f5ba87797e24a8c5cbef9ba973fe219fbfc310d38782 $(package)_qtshadertools_file_name=qtshadertools-$($(package)_suffix) -$(package)_qtshadertools_sha256_hash=201b7b3a409f048e78c5defb90a70af423166313ad4386f8e6b83990ae0f3573 +$(package)_qtshadertools_sha256_hash=3690327dc550144b8102be2bb7f6dc995ccbe3584041094ad021a83737ef9875 $(package)_extra_sources += $($(package)_qttools_file_name) $(package)_extra_sources += $($(package)_qtsvg_file_name) diff --git a/contrib/depends/patches/native_qt/rcc_hardcode_timestamp.patch b/contrib/depends/patches/native_qt/rcc_hardcode_timestamp.patch index 63791123..591ecaa6 100644 --- a/contrib/depends/patches/native_qt/rcc_hardcode_timestamp.patch +++ b/contrib/depends/patches/native_qt/rcc_hardcode_timestamp.patch @@ -3,14 +3,15 @@ Hardcode last modified timestamp in Qt RCC This change allows the already built qt package to be reused even with the SOURCE_DATE_EPOCH variable set, e.g., for Guix builds. - ---- old/qtbase/src/tools/rcc/rcc.cpp -+++ new/qtbase/src/tools/rcc/rcc.cpp -@@ -229,14 +229,7 @@ void RCCFileInfo::writeDataInfo(RCCResourceLibrary &lib) +diff --git a/qtbase/src/tools/rcc/rcc.cpp b/qtbase/src/tools/rcc/rcc.cpp +index e461ab6294..256dc0ba29 100644 +--- a/qtbase/src/tools/rcc/rcc.cpp ++++ b/qtbase/src/tools/rcc/rcc.cpp +@@ -201,14 +201,7 @@ void RCCFileInfo::writeDataInfo(RCCResourceLibrary &lib) if (lib.formatVersion() >= 2) { // last modified time stamp -- const QDateTime lastModified = m_fileInfo.lastModified(); +- const QDateTime lastModified = m_fileInfo.lastModified(QTimeZone::UTC); - quint64 lastmod = quint64(lastModified.isValid() ? lastModified.toMSecsSinceEpoch() : 0); - static const quint64 sourceDate = 1000 * qgetenv("QT_RCC_SOURCE_DATE_OVERRIDE").toULongLong(); - if (sourceDate != 0) diff --git a/contrib/depends/patches/qt/qtmultimedia-fixes.patch b/contrib/depends/patches/qt/qtmultimedia-fixes.patch index 86264d8f..a49dd435 100644 --- a/contrib/depends/patches/qt/qtmultimedia-fixes.patch +++ b/contrib/depends/patches/qt/qtmultimedia-fixes.patch @@ -4,7 +4,6 @@ Date: Tue, 3 Jan 2023 13:00:51 +0100 Subject: [PATCH] qtmultimedia fixes --- - cmake/FindWMF.cmake | 10 +++++----- src/multimedia/configure.cmake | 3 +-- src/multimedia/windows/qwindowsmediadevices.cpp | 2 +- src/multimedia/windows/qwindowsresampler.cpp | 2 +- @@ -19,27 +18,6 @@ Subject: [PATCH] qtmultimedia fixes .../multimedia/windows/qwindowsvideodevices.cpp | 4 ++-- 13 files changed, 19 insertions(+), 21 deletions(-) -diff --git a/cmake/FindWMF.cmake b/cmake/FindWMF.cmake -index 2f4633c34..35a276cb4 100644 ---- a/cmake/FindWMF.cmake -+++ b/cmake/FindWMF.cmake -@@ -25,11 +25,11 @@ find_library(WMF_UUID_LIBRARY uuid HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) - find_library(WMF_MSDMO_LIBRARY msdmo HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) - find_library(WMF_OLE32_LIBRARY ole32 HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) - find_library(WMF_OLEAUT32_LIBRARY oleaut32 HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) --find_library(WMF_MF_LIBRARY Mf HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) --find_library(WMF_MFUUID_LIBRARY Mfuuid HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) --find_library(WMF_MFPLAT_LIBRARY Mfplat HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) --find_library(WMF_MFCORE_LIBRARY Mfcore HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) --find_library(WMF_PROPSYS_LIBRARY Propsys HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) -+find_library(WMF_MF_LIBRARY mf HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) -+find_library(WMF_MFUUID_LIBRARY mfuuid HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) -+find_library(WMF_MFPLAT_LIBRARY mfplat HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) -+find_library(WMF_MFCORE_LIBRARY mfcore HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) -+find_library(WMF_PROPSYS_LIBRARY propsys HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) - - - set(WMF_LIBRARIES ${WMF_STRMIIDS_LIBRARY} ${WMF_AMSTRMID_LIBRARY} ${WMF_DMOGUIDS_LIBRARY} ${WMF_UUID_LIBRARY} diff --git a/src/multimedia/configure.cmake b/src/multimedia/configure.cmake index 609806507..40b1b9b36 100644 --- a/src/multimedia/configure.cmake @@ -61,32 +39,6 @@ index 609806507..40b1b9b36 100644 ) qt_feature("alsa" PUBLIC PRIVATE LABEL "ALSA (experimental)" -diff --git a/src/multimedia/windows/qwindowsmediadevices.cpp b/src/multimedia/windows/qwindowsmediadevices.cpp -index fcad8bab7..110d84c82 100644 ---- a/src/multimedia/windows/qwindowsmediadevices.cpp -+++ b/src/multimedia/windows/qwindowsmediadevices.cpp -@@ -13,7 +13,7 @@ - #include - #include - #include --#include -+#include - #include - #include - -diff --git a/src/multimedia/windows/qwindowsresampler.cpp b/src/multimedia/windows/qwindowsresampler.cpp -index 9e76c9159..f78628c91 100644 ---- a/src/multimedia/windows/qwindowsresampler.cpp -+++ b/src/multimedia/windows/qwindowsresampler.cpp -@@ -7,7 +7,7 @@ - #include - #include - --#include -+#include - #include - #include - diff --git a/src/plugins/multimedia/darwin/qdarwinintegration.mm b/src/plugins/multimedia/darwin/qdarwinintegration.mm index 5e26fe5c4..3e82655b0 100644 --- a/src/plugins/multimedia/darwin/qdarwinintegration.mm @@ -101,117 +53,6 @@ index 5e26fe5c4..3e82655b0 100644 #endif m_videoDevices = new QAVFVideoDevices(this); } -diff --git a/src/plugins/multimedia/windows/common/mfmetadata_p.h b/src/plugins/multimedia/windows/common/mfmetadata_p.h -index 81a03b126..9ff196240 100644 ---- a/src/plugins/multimedia/windows/common/mfmetadata_p.h -+++ b/src/plugins/multimedia/windows/common/mfmetadata_p.h -@@ -16,7 +16,7 @@ - // - - #include --#include "Mfidl.h" -+#include "mfidl.h" - - QT_USE_NAMESPACE - -diff --git a/src/plugins/multimedia/windows/decoder/mfaudiodecodercontrol.cpp b/src/plugins/multimedia/windows/decoder/mfaudiodecodercontrol.cpp -index a82b5ef30..49aa64b25 100644 ---- a/src/plugins/multimedia/windows/decoder/mfaudiodecodercontrol.cpp -+++ b/src/plugins/multimedia/windows/decoder/mfaudiodecodercontrol.cpp -@@ -4,7 +4,7 @@ - #include - #include - #include --#include "Wmcodecdsp.h" -+#include "wmcodecdsp.h" - #include "mfaudiodecodercontrol_p.h" - #include - -diff --git a/src/plugins/multimedia/windows/mediacapture/qwindowsmediadevicereader_p.h b/src/plugins/multimedia/windows/mediacapture/qwindowsmediadevicereader_p.h -index 0205eafe2..4699a463a 100644 ---- a/src/plugins/multimedia/windows/mediacapture/qwindowsmediadevicereader_p.h -+++ b/src/plugins/multimedia/windows/mediacapture/qwindowsmediadevicereader_p.h -@@ -17,8 +17,8 @@ - - #include - #include --#include --#include -+#include -+#include - - #include - #include -diff --git a/src/plugins/multimedia/windows/mediacapture/qwindowsmediaencoder.cpp b/src/plugins/multimedia/windows/mediacapture/qwindowsmediaencoder.cpp -index 4a031043d..1d901c036 100644 ---- a/src/plugins/multimedia/windows/mediacapture/qwindowsmediaencoder.cpp -+++ b/src/plugins/multimedia/windows/mediacapture/qwindowsmediaencoder.cpp -@@ -8,7 +8,7 @@ - #include "mfmetadata_p.h" - #include - #include --#include -+#include - #include - #include - #include -diff --git a/src/plugins/multimedia/windows/player/mfplayercontrol_p.h b/src/plugins/multimedia/windows/player/mfplayercontrol_p.h -index ac60e8c29..78ff71439 100644 ---- a/src/plugins/multimedia/windows/player/mfplayercontrol_p.h -+++ b/src/plugins/multimedia/windows/player/mfplayercontrol_p.h -@@ -15,7 +15,7 @@ - // We mean it. - // - --#include "QUrl.h" -+#include "qurl.h" - #include "private/qplatformmediaplayer_p.h" - - #include -diff --git a/src/plugins/multimedia/windows/player/mfplayersession.cpp b/src/plugins/multimedia/windows/player/mfplayersession.cpp -index 2084a168a..1aa25317f 100644 ---- a/src/plugins/multimedia/windows/player/mfplayersession.cpp -+++ b/src/plugins/multimedia/windows/player/mfplayersession.cpp -@@ -32,7 +32,7 @@ - - #include - #include --#include -+#include - - //#define DEBUG_MEDIAFOUNDATION - -diff --git a/src/plugins/multimedia/windows/player/mftvideo.cpp b/src/plugins/multimedia/windows/player/mftvideo.cpp -index a2ef1db0b..4cb5d2c9d 100644 ---- a/src/plugins/multimedia/windows/player/mftvideo.cpp -+++ b/src/plugins/multimedia/windows/player/mftvideo.cpp -@@ -7,7 +7,7 @@ - #include - #include - #include --#include -+#include - #include - #include - -diff --git a/src/plugins/multimedia/windows/qwindowsvideodevices.cpp b/src/plugins/multimedia/windows/qwindowsvideodevices.cpp -index 878c4730b..41ccb4733 100644 ---- a/src/plugins/multimedia/windows/qwindowsvideodevices.cpp -+++ b/src/plugins/multimedia/windows/qwindowsvideodevices.cpp -@@ -8,11 +8,11 @@ - #include - #include - --#include -+#include - - #include - #include --#include -+#include - - QT_BEGIN_NAMESPACE - -- 2.39.0 diff --git a/contrib/depends/patches/qt/rcc_hardcode_timestamp.patch b/contrib/depends/patches/qt/rcc_hardcode_timestamp.patch index 63791123..591ecaa6 100644 --- a/contrib/depends/patches/qt/rcc_hardcode_timestamp.patch +++ b/contrib/depends/patches/qt/rcc_hardcode_timestamp.patch @@ -3,14 +3,15 @@ Hardcode last modified timestamp in Qt RCC This change allows the already built qt package to be reused even with the SOURCE_DATE_EPOCH variable set, e.g., for Guix builds. - ---- old/qtbase/src/tools/rcc/rcc.cpp -+++ new/qtbase/src/tools/rcc/rcc.cpp -@@ -229,14 +229,7 @@ void RCCFileInfo::writeDataInfo(RCCResourceLibrary &lib) +diff --git a/qtbase/src/tools/rcc/rcc.cpp b/qtbase/src/tools/rcc/rcc.cpp +index e461ab6294..256dc0ba29 100644 +--- a/qtbase/src/tools/rcc/rcc.cpp ++++ b/qtbase/src/tools/rcc/rcc.cpp +@@ -201,14 +201,7 @@ void RCCFileInfo::writeDataInfo(RCCResourceLibrary &lib) if (lib.formatVersion() >= 2) { // last modified time stamp -- const QDateTime lastModified = m_fileInfo.lastModified(); +- const QDateTime lastModified = m_fileInfo.lastModified(QTimeZone::UTC); - quint64 lastmod = quint64(lastModified.isValid() ? lastModified.toMSecsSinceEpoch() : 0); - static const quint64 sourceDate = 1000 * qgetenv("QT_RCC_SOURCE_DATE_OVERRIDE").toULongLong(); - if (sourceDate != 0) -- 2.52.0