Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies #239

Merged
merged 6 commits into from
Feb 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions deps.ffmpeg/10-zlib.ps1
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 2 additions & 2 deletions deps.ffmpeg/10-zlib.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -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*')
Expand Down
4 changes: 2 additions & 2 deletions deps.ffmpeg/40-aom.ps1
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 2 additions & 2 deletions deps.ffmpeg/40-aom.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions deps.ffmpeg/60-mbedtls.ps1
Original file line number Diff line number Diff line change
@@ -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 = @(
@{
Expand Down
12 changes: 6 additions & 6 deletions deps.ffmpeg/60-mbedtls.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b89b426b9852a17d3e96230ab0871346574d635c7914480a2a27f98ff942677b qtbase-everywhere-src-6.6.2.tar.xz
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<ToString>Microsoft.PowerShell.Commands.FileHashInfo</ToString>
<Props>
<S N="Algorithm">SHA256</S>
<S N="Hash">818F92518D1A89EE98AE818891A7D2F0E41AA45B933D55215DA2DF6D5459428E</S>
<S N="Path">qtbase-everywhere-src-6.6.1.zip</S>
<S N="Hash">3582DBC46DF280365FC5D5E6CC8FCFC72DDBDDBD330A03A98EEC24B8B44FA4D0</S>
<S N="Path">qtbase-everywhere-src-6.6.2.zip</S>
</Props>
</Obj>
</Objs>

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
71584c9136d4983ad19fa2d017abbae57b055eb90c62a36bf3f45d6d21a87cb3 qtimageformats-everywhere-src-6.6.2.tar.xz
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<ToString>Microsoft.PowerShell.Commands.FileHashInfo</ToString>
<Props>
<S N="Algorithm">SHA256</S>
<S N="Hash">03F01042F86B4DBF7329A179F20835817C660A183178C11570CC0535B3C3BA58</S>
<S N="Path">qtimageformats-everywhere-src-6.6.1.zip</S>
<S N="Hash">2176B623C9141B1136D57FF9CA1ED12E3636146B53C6FEED2083E1CBECFF6454</S>
<S N="Path">qtimageformats-everywhere-src-6.6.2.zip</S>
</Props>
</Obj>
</Objs>

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
e2942599ba0ae106ab3e4f82d6633e8fc1943f8a35d91f99d1fca46d251804ec qtmultimedia-everywhere-src-6.6.2.tar.xz
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<ToString>Microsoft.PowerShell.Commands.FileHashInfo</ToString>
<Props>
<S N="Algorithm">SHA256</S>
<S N="Hash">0038915D92E6B09350B9FB3B359341C1FBCFFF3899CCCCA299A142A6AA89B271</S>
<S N="Path">qtmultimedia-everywhere-src-6.6.1.zip</S>
<S N="Hash">8ECCF13097528085F79904C7A3D1AF2CE484D255A596262C3994BC3C92A69214</S>
<S N="Path">qtmultimedia-everywhere-src-6.6.2.zip</S>
</Props>
</Obj>
</Objs>

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
628bead7ff4e7f42cb910f47d2adefbdea0d8c71a0234baef8ca709bf467b92f qtshadertools-everywhere-src-6.6.2.tar.xz
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<ToString>Microsoft.PowerShell.Commands.FileHashInfo</ToString>
<Props>
<S N="Algorithm">SHA256</S>
<S N="Hash">1659D8DF394D5695D9C5C99D71E16BB46B8DA4B9C9107D7A2F59EDBBACEBCD9B</S>
<S N="Path">qtshadertools-everywhere-src-6.6.1.zip</S>
<S N="Hash">5C2EA90BB7D2B7BE0DE508C92B13F93FCBAD2077DD1C909CD3783FEDEFF02A48</S>
<S N="Path">qtshadertools-everywhere-src-6.6.2.zip</S>
</Props>
</Obj>
</Objs>
1 change: 0 additions & 1 deletion deps.qt/checksums/qtsvg-everywhere-src-6.6.1.tar.xz.sha256

This file was deleted.

1 change: 1 addition & 0 deletions deps.qt/checksums/qtsvg-everywhere-src-6.6.2.tar.xz.sha256
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5a231d59ef1b42bfbaa5174d4ff39f8e1b4ba070ef984a70b069b4b2576d8181 qtsvg-everywhere-src-6.6.2.tar.xz
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<ToString>Microsoft.PowerShell.Commands.FileHashInfo</ToString>
<Props>
<S N="Algorithm">SHA256</S>
<S N="Hash">D44D5EAD8D4682F54C91687B5E32F2735F086419E3889E05609FEAE1A7F02DA9</S>
<S N="Path">qtsvg-everywhere-src-6.6.1.zip</S>
<S N="Hash">84BA758EF06B93532F2D098F0D08D7BBDDF6F3E6273C9E0D3A58498338F85B18</S>
<S N="Path">qtsvg-everywhere-src-6.6.2.zip</S>
</Props>
</Obj>
</Objs>
26 changes: 26 additions & 0 deletions deps.qt/patches/Qt6/mac/0001-QTBUG-121351.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
From 047044c1fda8515975b163f0b011da1a80191377 Mon Sep 17 00:00:00 2001
From: Sebastian Beckmann <beckmann.sebastian@outlook.de>
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

4 changes: 2 additions & 2 deletions deps.qt/qt6.ps1
Original file line number Diff line number Diff line change
@@ -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')
)
Expand Down
8 changes: 6 additions & 2 deletions deps.qt/qt6.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down