diff --git a/deps.ffmpeg/10-zlib.ps1 b/deps.ffmpeg/10-zlib.ps1 index 2ae0966db..cf0f38291 100644 --- a/deps.ffmpeg/10-zlib.ps1 +++ b/deps.ffmpeg/10-zlib.ps1 @@ -1,8 +1,8 @@ param( [string] $Name = 'zlib', - [string] $Version = '1.3', + [string] $Version = '1.3.1', [string] $Uri = 'https://github.com/madler/zlib.git', - [string] $Hash = "09155eaa2f9270dc4ed1fa13e2b4b2613e6e4851", + [string] $Hash = "51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf", [array] $Patches = @( @{ PatchFile = "${PSScriptRoot}/patches/zlib/0001-fix-unistd-detection.patch" diff --git a/deps.ffmpeg/10-zlib.zsh b/deps.ffmpeg/10-zlib.zsh index f7b2a2630..bce12c8db 100644 --- a/deps.ffmpeg/10-zlib.zsh +++ b/deps.ffmpeg/10-zlib.zsh @@ -2,9 +2,9 @@ autoload -Uz log_debug log_error log_info log_status log_output ## Dependency Information local name='zlib' -local version='1.3' +local version='1.3.1' local url='https://github.com/madler/zlib.git' -local hash='09155eaa2f9270dc4ed1fa13e2b4b2613e6e4851' +local hash='51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf' ## Dependency Overrides local targets=('windows-x*') diff --git a/deps.ffmpeg/40-aom.ps1 b/deps.ffmpeg/40-aom.ps1 index c3bc25091..f00608413 100644 --- a/deps.ffmpeg/40-aom.ps1 +++ b/deps.ffmpeg/40-aom.ps1 @@ -1,8 +1,8 @@ param( [string] $Name = 'aom', - [string] $Version = '3.8.0', + [string] $Version = '3.8.1', [string] $Uri = 'https://aomedia.googlesource.com/aom.git', - [string] $Hash = 'b681eac83963950afc7be55df56c22fa5210aaa2', + [string] $Hash = 'bb6430482199eaefbeaaa396600935082bc43f66', [array] $FixupPatches = @( @{ PatchFile = "${PSScriptRoot}/patches/aom/0001-windows-pkg-config-fix.patch" diff --git a/deps.ffmpeg/40-aom.zsh b/deps.ffmpeg/40-aom.zsh index c9defe4fe..bd6808823 100644 --- a/deps.ffmpeg/40-aom.zsh +++ b/deps.ffmpeg/40-aom.zsh @@ -2,9 +2,9 @@ autoload -Uz log_debug log_error log_info log_status log_output ## Dependency Information local name='aom' -local version='3.8.0' +local version='3.8.1' local url='https://aomedia.googlesource.com/aom.git' -local hash='b681eac83963950afc7be55df56c22fa5210aaa2' +local hash='bb6430482199eaefbeaaa396600935082bc43f66' local -a patches=( "windows ${0:a:h}/patches/libaom/0001-force-threading-shim-usage.patch \ 6fa9ca74001c5fa3a6521a2b4944be2a8b4350d31c0234aede9a7052a8f1890b" diff --git a/deps.ffmpeg/60-mbedtls.ps1 b/deps.ffmpeg/60-mbedtls.ps1 index 430140868..2f46b7936 100644 --- a/deps.ffmpeg/60-mbedtls.ps1 +++ b/deps.ffmpeg/60-mbedtls.ps1 @@ -1,8 +1,8 @@ param( [string] $Name = 'mbedtls', - [string] $Version = '3.4.0', + [string] $Version = '3.4.1', [string] $Uri = 'https://github.com/Mbed-TLS/mbedtls.git', - [string] $Hash = '1873d3bfc2da771672bd8e7e8f41f57e0af77f33', + [string] $Hash = '72718dd87e087215ce9155a826ee5a66cfbe9631', [switch] $ForceStatic = $true, [array] $Patches = @( @{ diff --git a/deps.ffmpeg/60-mbedtls.zsh b/deps.ffmpeg/60-mbedtls.zsh index cfe8284c7..a89a12d07 100644 --- a/deps.ffmpeg/60-mbedtls.zsh +++ b/deps.ffmpeg/60-mbedtls.zsh @@ -3,15 +3,15 @@ autoload -Uz log_debug log_error log_info log_status log_output ## Dependency Information local name='mbedtls' local -A versions=( - macos 3.4.0 - linux 3.4.0 - windows 3.4.0 + macos 3.4.1 + linux 3.4.1 + windows 3.4.1 ) local url='https://github.com/Mbed-TLS/mbedtls.git' local -A hashes=( - macos 1873d3bfc2da771672bd8e7e8f41f57e0af77f33 - linux 1873d3bfc2da771672bd8e7e8f41f57e0af77f33 - windows 1873d3bfc2da771672bd8e7e8f41f57e0af77f33 + macos 72718dd87e087215ce9155a826ee5a66cfbe9631 + linux 72718dd87e087215ce9155a826ee5a66cfbe9631 + windows 72718dd87e087215ce9155a826ee5a66cfbe9631 ) local -a patches=( "macos ${0:a:h}/patches/mbedtls/0001-enable-posix-threading-support.patch \ diff --git a/deps.qt/checksums/qtbase-everywhere-src-6.6.1.tar.xz.sha256 b/deps.qt/checksums/qtbase-everywhere-src-6.6.1.tar.xz.sha256 deleted file mode 100644 index bb32c447a..000000000 --- a/deps.qt/checksums/qtbase-everywhere-src-6.6.1.tar.xz.sha256 +++ /dev/null @@ -1 +0,0 @@ -450c5b4677b2fe40ed07954d7f0f40690068e80a94c9df86c2c905ccd59d02f7 qtbase-everywhere-src-6.6.1.tar.xz diff --git a/deps.qt/checksums/qtbase-everywhere-src-6.6.2.tar.xz.sha256 b/deps.qt/checksums/qtbase-everywhere-src-6.6.2.tar.xz.sha256 new file mode 100644 index 000000000..390ff0fdc --- /dev/null +++ b/deps.qt/checksums/qtbase-everywhere-src-6.6.2.tar.xz.sha256 @@ -0,0 +1 @@ +b89b426b9852a17d3e96230ab0871346574d635c7914480a2a27f98ff942677b qtbase-everywhere-src-6.6.2.tar.xz diff --git a/deps.qt/checksums/qtbase-everywhere-src-6.6.1.zip.sha256 b/deps.qt/checksums/qtbase-everywhere-src-6.6.2.zip.sha256 similarity index 71% rename from deps.qt/checksums/qtbase-everywhere-src-6.6.1.zip.sha256 rename to deps.qt/checksums/qtbase-everywhere-src-6.6.2.zip.sha256 index ec12aace8..b20dbd944 100644 --- a/deps.qt/checksums/qtbase-everywhere-src-6.6.1.zip.sha256 +++ b/deps.qt/checksums/qtbase-everywhere-src-6.6.2.zip.sha256 @@ -7,8 +7,8 @@ Microsoft.PowerShell.Commands.FileHashInfo SHA256 - 818F92518D1A89EE98AE818891A7D2F0E41AA45B933D55215DA2DF6D5459428E - qtbase-everywhere-src-6.6.1.zip + 3582DBC46DF280365FC5D5E6CC8FCFC72DDBDDBD330A03A98EEC24B8B44FA4D0 + qtbase-everywhere-src-6.6.2.zip diff --git a/deps.qt/checksums/qtimageformats-everywhere-src-6.6.1.tar.xz.sha256 b/deps.qt/checksums/qtimageformats-everywhere-src-6.6.1.tar.xz.sha256 deleted file mode 100644 index 645066911..000000000 --- a/deps.qt/checksums/qtimageformats-everywhere-src-6.6.1.tar.xz.sha256 +++ /dev/null @@ -1 +0,0 @@ -ac4ed08950072e375be662cfa64fdb447dd6e935cf29c56a4128d1500492188f qtimageformats-everywhere-src-6.6.1.tar.xz diff --git a/deps.qt/checksums/qtimageformats-everywhere-src-6.6.2.tar.xz.sha256 b/deps.qt/checksums/qtimageformats-everywhere-src-6.6.2.tar.xz.sha256 new file mode 100644 index 000000000..1ed6460db --- /dev/null +++ b/deps.qt/checksums/qtimageformats-everywhere-src-6.6.2.tar.xz.sha256 @@ -0,0 +1 @@ +71584c9136d4983ad19fa2d017abbae57b055eb90c62a36bf3f45d6d21a87cb3 qtimageformats-everywhere-src-6.6.2.tar.xz diff --git a/deps.qt/checksums/qtimageformats-everywhere-src-6.6.1.zip.sha256 b/deps.qt/checksums/qtimageformats-everywhere-src-6.6.2.zip.sha256 similarity index 70% rename from deps.qt/checksums/qtimageformats-everywhere-src-6.6.1.zip.sha256 rename to deps.qt/checksums/qtimageformats-everywhere-src-6.6.2.zip.sha256 index 36e42c151..45edfde3f 100644 --- a/deps.qt/checksums/qtimageformats-everywhere-src-6.6.1.zip.sha256 +++ b/deps.qt/checksums/qtimageformats-everywhere-src-6.6.2.zip.sha256 @@ -7,8 +7,8 @@ Microsoft.PowerShell.Commands.FileHashInfo SHA256 - 03F01042F86B4DBF7329A179F20835817C660A183178C11570CC0535B3C3BA58 - qtimageformats-everywhere-src-6.6.1.zip + 2176B623C9141B1136D57FF9CA1ED12E3636146B53C6FEED2083E1CBECFF6454 + qtimageformats-everywhere-src-6.6.2.zip diff --git a/deps.qt/checksums/qtmultimedia-everywhere-src-6.6.1.tar.xz.sha256 b/deps.qt/checksums/qtmultimedia-everywhere-src-6.6.1.tar.xz.sha256 deleted file mode 100644 index 507faaef5..000000000 --- a/deps.qt/checksums/qtmultimedia-everywhere-src-6.6.1.tar.xz.sha256 +++ /dev/null @@ -1 +0,0 @@ -7ee4e2296f5714961692f6ded568d3e3fde3687cee48e9d717194b5d1360db4a qtmultimedia-everywhere-src-6.6.1.tar.xz diff --git a/deps.qt/checksums/qtmultimedia-everywhere-src-6.6.2.tar.xz.sha256 b/deps.qt/checksums/qtmultimedia-everywhere-src-6.6.2.tar.xz.sha256 new file mode 100644 index 000000000..4fb71e7cb --- /dev/null +++ b/deps.qt/checksums/qtmultimedia-everywhere-src-6.6.2.tar.xz.sha256 @@ -0,0 +1 @@ +e2942599ba0ae106ab3e4f82d6633e8fc1943f8a35d91f99d1fca46d251804ec qtmultimedia-everywhere-src-6.6.2.tar.xz diff --git a/deps.qt/checksums/qtmultimedia-everywhere-src-6.6.1.zip.sha256 b/deps.qt/checksums/qtmultimedia-everywhere-src-6.6.2.zip.sha256 similarity index 70% rename from deps.qt/checksums/qtmultimedia-everywhere-src-6.6.1.zip.sha256 rename to deps.qt/checksums/qtmultimedia-everywhere-src-6.6.2.zip.sha256 index 13f879abe..770c9945f 100644 --- a/deps.qt/checksums/qtmultimedia-everywhere-src-6.6.1.zip.sha256 +++ b/deps.qt/checksums/qtmultimedia-everywhere-src-6.6.2.zip.sha256 @@ -7,8 +7,8 @@ Microsoft.PowerShell.Commands.FileHashInfo SHA256 - 0038915D92E6B09350B9FB3B359341C1FBCFFF3899CCCCA299A142A6AA89B271 - qtmultimedia-everywhere-src-6.6.1.zip + 8ECCF13097528085F79904C7A3D1AF2CE484D255A596262C3994BC3C92A69214 + qtmultimedia-everywhere-src-6.6.2.zip diff --git a/deps.qt/checksums/qtshadertools-everywhere-src-6.6.1.tar.xz.sha256 b/deps.qt/checksums/qtshadertools-everywhere-src-6.6.1.tar.xz.sha256 deleted file mode 100644 index f107724c5..000000000 --- a/deps.qt/checksums/qtshadertools-everywhere-src-6.6.1.tar.xz.sha256 +++ /dev/null @@ -1 +0,0 @@ -08338fe4f54954928e41a8a5450627e61bca115039706c28161bf967785e73bb qtshadertools-everywhere-src-6.6.1.tar.xz diff --git a/deps.qt/checksums/qtshadertools-everywhere-src-6.6.2.tar.xz.sha256 b/deps.qt/checksums/qtshadertools-everywhere-src-6.6.2.tar.xz.sha256 new file mode 100644 index 000000000..3d8a2cba6 --- /dev/null +++ b/deps.qt/checksums/qtshadertools-everywhere-src-6.6.2.tar.xz.sha256 @@ -0,0 +1 @@ +628bead7ff4e7f42cb910f47d2adefbdea0d8c71a0234baef8ca709bf467b92f qtshadertools-everywhere-src-6.6.2.tar.xz diff --git a/deps.qt/checksums/qtshadertools-everywhere-src-6.6.1.zip.sha256 b/deps.qt/checksums/qtshadertools-everywhere-src-6.6.2.zip.sha256 similarity index 70% rename from deps.qt/checksums/qtshadertools-everywhere-src-6.6.1.zip.sha256 rename to deps.qt/checksums/qtshadertools-everywhere-src-6.6.2.zip.sha256 index 9aab690f5..2a1edbc4f 100644 --- a/deps.qt/checksums/qtshadertools-everywhere-src-6.6.1.zip.sha256 +++ b/deps.qt/checksums/qtshadertools-everywhere-src-6.6.2.zip.sha256 @@ -7,8 +7,8 @@ Microsoft.PowerShell.Commands.FileHashInfo SHA256 - 1659D8DF394D5695D9C5C99D71E16BB46B8DA4B9C9107D7A2F59EDBBACEBCD9B - qtshadertools-everywhere-src-6.6.1.zip + 5C2EA90BB7D2B7BE0DE508C92B13F93FCBAD2077DD1C909CD3783FEDEFF02A48 + qtshadertools-everywhere-src-6.6.2.zip diff --git a/deps.qt/checksums/qtsvg-everywhere-src-6.6.1.tar.xz.sha256 b/deps.qt/checksums/qtsvg-everywhere-src-6.6.1.tar.xz.sha256 deleted file mode 100644 index 0f274a63e..000000000 --- a/deps.qt/checksums/qtsvg-everywhere-src-6.6.1.tar.xz.sha256 +++ /dev/null @@ -1 +0,0 @@ -248deb56d26a463cf3162f530358ccf90cfb654bbf518bb35ddf81b205e09228 qtsvg-everywhere-src-6.6.1.tar.xz diff --git a/deps.qt/checksums/qtsvg-everywhere-src-6.6.2.tar.xz.sha256 b/deps.qt/checksums/qtsvg-everywhere-src-6.6.2.tar.xz.sha256 new file mode 100644 index 000000000..297c6b1b5 --- /dev/null +++ b/deps.qt/checksums/qtsvg-everywhere-src-6.6.2.tar.xz.sha256 @@ -0,0 +1 @@ +5a231d59ef1b42bfbaa5174d4ff39f8e1b4ba070ef984a70b069b4b2576d8181 qtsvg-everywhere-src-6.6.2.tar.xz diff --git a/deps.qt/checksums/qtsvg-everywhere-src-6.6.1.zip.sha256 b/deps.qt/checksums/qtsvg-everywhere-src-6.6.2.zip.sha256 similarity index 71% rename from deps.qt/checksums/qtsvg-everywhere-src-6.6.1.zip.sha256 rename to deps.qt/checksums/qtsvg-everywhere-src-6.6.2.zip.sha256 index 9667fda75..2f6fb0995 100644 --- a/deps.qt/checksums/qtsvg-everywhere-src-6.6.1.zip.sha256 +++ b/deps.qt/checksums/qtsvg-everywhere-src-6.6.2.zip.sha256 @@ -7,8 +7,8 @@ Microsoft.PowerShell.Commands.FileHashInfo SHA256 - D44D5EAD8D4682F54C91687B5E32F2735F086419E3889E05609FEAE1A7F02DA9 - qtsvg-everywhere-src-6.6.1.zip + 84BA758EF06B93532F2D098F0D08D7BBDDF6F3E6273C9E0D3A58498338F85B18 + qtsvg-everywhere-src-6.6.2.zip diff --git a/deps.qt/patches/Qt6/mac/0001-QTBUG-121351.patch b/deps.qt/patches/Qt6/mac/0001-QTBUG-121351.patch new file mode 100644 index 000000000..d1ea7a364 --- /dev/null +++ b/deps.qt/patches/Qt6/mac/0001-QTBUG-121351.patch @@ -0,0 +1,26 @@ +From 047044c1fda8515975b163f0b011da1a80191377 Mon Sep 17 00:00:00 2001 +From: Sebastian Beckmann +Date: Mon, 12 Feb 2024 20:30:54 +0100 +Subject: [PATCH] Revert "QMessageBox: don't use a native dialog if a style + sheet is active" + +This reverts commit 1b71e2d894c2be7052518cdcb96020c9950e2dc7. +--- + src/widgets/dialogs/qmessagebox.cpp | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/qtbase/src/widgets/dialogs/qmessagebox.cpp b/qtbase/src/widgets/dialogs/qmessagebox.cpp +index cc8e985caf..51a986e8aa 100644 +--- a/qtbase/src/widgets/dialogs/qmessagebox.cpp ++++ b/qtbase/src/widgets/dialogs/qmessagebox.cpp +@@ -2821,7 +2821,6 @@ bool QMessageBoxPrivate::canBeNativeDialog() const + return true; + if (QCoreApplication::testAttribute(Qt::AA_DontUseNativeDialogs) + || q->testAttribute(Qt::WA_DontShowOnScreen) +- || q->testAttribute(Qt::WA_StyleSheet) + || (options->options() & QMessageDialogOptions::Option::DontUseNativeDialog)) { + return false; + } +-- +2.37.5 + diff --git a/deps.qt/qt6.ps1 b/deps.qt/qt6.ps1 index 715f73cb8..b81594890 100644 --- a/deps.qt/qt6.ps1 +++ b/deps.qt/qt6.ps1 @@ -1,7 +1,7 @@ param( [string] $Name = 'qt6', - [string] $Version = '6.6.1', - [string] $Uri = 'https://download.qt.io/official_releases/qt/6.6/6.6.1', + [string] $Version = '6.6.2', + [string] $Uri = 'https://download.qt.io/official_releases/qt/6.6/6.6.2', [string] $Hash = "${PSScriptRoot}/checksums", [array] $Targets = @('x64', 'x86') ) diff --git a/deps.qt/qt6.zsh b/deps.qt/qt6.zsh index 749a42134..a7201d518 100644 --- a/deps.qt/qt6.zsh +++ b/deps.qt/qt6.zsh @@ -2,9 +2,13 @@ autoload -Uz log_debug log_error log_info log_status log_output ## Dependency Information local name='qt6' -local version=6.6.1 -local url='https://download.qt.io/official_releases/qt/6.6/6.6.1' +local version=6.6.2 +local url='https://download.qt.io/official_releases/qt/6.6/6.6.2' local hash="${0:a:h}/checksums" +local -a patches=( + "macos ${0:a:h}/patches/Qt6/mac/0001-QTBUG-121351.patch \ + df46dc93e874c36b2ad0da746c43585528308a7fcde60930c1ffb5e841472e7b" +) local -a qt_components=( 'qtbase'