From c39c0b59ff78d54cfa2535364e6853c169735d8f Mon Sep 17 00:00:00 2001 From: offhub <6871698+offhub@users.noreply.github.com> Date: Sun, 8 Sep 2024 19:30:36 +0300 Subject: [PATCH] Qt-5.15.15-OpenSSL-3.3.2 --- .github/workflows/main.yml | 22 +++++++++++----------- Installer/copy_build.cmd | 4 ++-- Installer/fix_qt5_languages.cmd | 2 +- Installer/get_openssl.cmd | 6 +++--- SandboxiePlus/install_qt.cmd | 10 +++++----- SandboxiePlus/qmake_plus.cmd | 2 +- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index eca905fbcb..c6219a8dfa 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -67,17 +67,17 @@ on: - '**/COPYING' env: - qt_version: 5.15.14 + qt_version: 5.15.15 qt6_version: 6.3.1 - openssl_version: 3.3.1 - ghSsl_user: xanasoft - ghSsl_repo: openssl-builds + openssl_version: 3.3.2 + ghSsl_user: offhub #xanasoft + ghSsl_repo: openssl #openssl-builds #ghQt6Win7_user: DavidXanatos #ghQt6Win7_repo: qtbase - ghQtBuilds_user: xanasoft - ghQtBuilds_repo: qt-builds - ghQtBuilds_hash_x86: bf4124046cc50ccbbeb3f786c041e884fd4205cd6e616070a75c850105cbf1db - ghQtBuilds_hash_x64: 30290d82a02bfaa24c1bf37bcb9c074aba18a673a7176628fccdf71197cee898 + ghQtBuilds_user: offhub #xanasoft + ghQtBuilds_repo: qt-sbie-builds #qt-builds + ghQtBuilds_hash_x86: 13928d0ff1bc461ef1d054aa19f1427b172277c6659d0ccf1999e6ffa850126e + ghQtBuilds_hash_x64: ebe1f2351b7313b8b0678aadf81c9edacf04af84572b72a576972ee2fb8d5aea jobs: Build_x64: @@ -86,7 +86,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v4.1.5 + uses: actions/checkout@v4.1.7 - name: Setup msbuild uses: microsoft/setup-msbuild@v2 @@ -187,7 +187,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v4.1.5 + uses: actions/checkout@v4.1.7 - name: Setup msbuild uses: microsoft/setup-msbuild@v2 @@ -281,7 +281,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v4.1.5 + uses: actions/checkout@v4.1.7 - name: Setup msbuild uses: microsoft/setup-msbuild@v2 diff --git a/Installer/copy_build.cmd b/Installer/copy_build.cmd index b18b489d3b..39cd4ff71f 100644 --- a/Installer/copy_build.cmd +++ b/Installer/copy_build.cmd @@ -1,9 +1,9 @@ REM @ECHO OFF echo %* -IF "%~4" == "" ( set "openssl_version=3.3.1" ) ELSE ( set "openssl_version=%~4" ) +IF "%~4" == "" ( set "openssl_version=3.3.2" ) ELSE ( set "openssl_version=%~4" ) IF "%~3" == "" ( set "qt6_version=6.3.1" ) ELSE ( set "qt6_version=%~3" ) -IF "%~2" == "" ( set "qt_version=5.15.14" ) ELSE ( set "qt_version=%~2" ) +IF "%~2" == "" ( set "qt_version=5.15.15" ) ELSE ( set "qt_version=%~2" ) IF "%openssl_version:~0,3%" == "1.1" ( set "sslMajorVersion=1_1" ) ELSE ( set "sslMajorVersion=3" ) diff --git a/Installer/fix_qt5_languages.cmd b/Installer/fix_qt5_languages.cmd index f8b150eaff..0ee950ec94 100644 --- a/Installer/fix_qt5_languages.cmd +++ b/Installer/fix_qt5_languages.cmd @@ -1,6 +1,6 @@ echo %* IF "%~3" == "" ( set "qt6_version=6.3.1" ) ELSE ( set "qt6_version=%~3" ) -IF "%~2" == "" ( set "qt_version=5.15.14" ) ELSE ( set "qt_version=%~2" ) +IF "%~2" == "" ( set "qt_version=5.15.15" ) ELSE ( set "qt_version=%~2" ) if %1 == x64 if exist %~dp0..\..\Qt\%qt_version%\msvc2019_64\bin\lrelease.exe set PATH=%PATH%;%~dp0..\..\Qt\%qt_version%\msvc2019_64\bin\ if %1 == Win32 if exist %~dp0..\..\Qt\%qt_version%\msvc2019\bin\lrelease.exe set PATH=%PATH%;%~dp0..\..\Qt\%qt_version%\msvc2019\bin\ diff --git a/Installer/get_openssl.cmd b/Installer/get_openssl.cmd index f8a17fd99d..850b151c50 100644 --- a/Installer/get_openssl.cmd +++ b/Installer/get_openssl.cmd @@ -1,7 +1,7 @@ echo %* -IF "%~3" == "" ( set "ghSsl_repo=openssl-builds" ) ELSE ( set "ghSsl_repo=%~3" ) -IF "%~2" == "" ( set "ghSsl_user=xanasoft" ) ELSE ( set "ghSsl_user=%~2" ) -IF "%~1" == "" ( set "openssl_version=3.3.1" ) ELSE ( set "openssl_version=%~1" ) +IF "%~3" == "" ( set "ghSsl_repo=openssl" ) ELSE ( set "ghSsl_repo=%~3" ) +IF "%~2" == "" ( set "ghSsl_user=offhub" ) ELSE ( set "ghSsl_user=%~2" ) +IF "%~1" == "" ( set "openssl_version=3.3.2" ) ELSE ( set "openssl_version=%~1" ) set "openssl_version_underscore=%openssl_version:.=_%" diff --git a/SandboxiePlus/install_qt.cmd b/SandboxiePlus/install_qt.cmd index 993ea4e531..e22f7033d1 100644 --- a/SandboxiePlus/install_qt.cmd +++ b/SandboxiePlus/install_qt.cmd @@ -1,10 +1,10 @@ echo %* -IF "%~7" == "" ( set "ghQtBuilds_hash_x64=30290d82a02bfaa24c1bf37bcb9c074aba18a673a7176628fccdf71197cee898" ) ELSE ( set "ghQtBuilds_hash_x64=%~7" ) -IF "%~6" == "" ( set "ghQtBuilds_hash_x86=bf4124046cc50ccbbeb3f786c041e884fd4205cd6e616070a75c850105cbf1db" ) ELSE ( set "ghQtBuilds_hash_x86=%~6" ) -IF "%~5" == "" ( set "ghQtBuilds_repo=qt-builds" ) ELSE ( set "ghQtBuilds_repo=%~5" ) -IF "%~4" == "" ( set "ghQtBuilds_user=xanasoft" ) ELSE ( set "ghQtBuilds_user=%~4" ) +IF "%~7" == "" ( set "ghQtBuilds_hash_x64=ebe1f2351b7313b8b0678aadf81c9edacf04af84572b72a576972ee2fb8d5aea" ) ELSE ( set "ghQtBuilds_hash_x64=%~7" ) +IF "%~6" == "" ( set "ghQtBuilds_hash_x86=13928d0ff1bc461ef1d054aa19f1427b172277c6659d0ccf1999e6ffa850126e" ) ELSE ( set "ghQtBuilds_hash_x86=%~6" ) +IF "%~5" == "" ( set "ghQtBuilds_repo=qt-sbie-builds" ) ELSE ( set "ghQtBuilds_repo=%~5" ) +IF "%~4" == "" ( set "ghQtBuilds_user=offhub" ) ELSE ( set "ghQtBuilds_user=%~4" ) IF "%~3" == "" ( set "qt6_version=6.3.1" ) ELSE ( set "qt6_version=%~3" ) -IF "%~2" == "" ( set "qt_version=5.15.14" ) ELSE ( set "qt_version=%~2" ) +IF "%~2" == "" ( set "qt_version=5.15.15" ) ELSE ( set "qt_version=%~2" ) if %1 == Win32 ( if exist %~dp0..\..\Qt\%qt_version%\msvc2019\bin\qmake.exe goto done diff --git a/SandboxiePlus/qmake_plus.cmd b/SandboxiePlus/qmake_plus.cmd index bf7ca5479d..5b767a190a 100644 --- a/SandboxiePlus/qmake_plus.cmd +++ b/SandboxiePlus/qmake_plus.cmd @@ -7,7 +7,7 @@ REM echo qt6_version: %3 echo %* IF "%~3" == "" ( set "qt6_version=6.3.1" ) ELSE ( set "qt6_version=%~3" ) -IF "%~2" == "" ( set "qt_version=5.15.14" ) ELSE ( set "qt_version=%~2" ) +IF "%~2" == "" ( set "qt_version=5.15.15" ) ELSE ( set "qt_version=%~2" ) IF %1 == Win32 ( set qt_path=%~dp0..\..\Qt\%qt_version%\msvc2019