From e8e74e7ac7b7fc221c1f73e9a66a42a04105f589 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Wed, 7 Jun 2023 16:58:09 +0300 Subject: [PATCH] Updated Qt to 5.15.10 on Windows. --- CMakeLists.txt | 2 +- Telegram/build/prepare/prepare.py | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9248d33c7..7ec62b158 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,7 +59,7 @@ include(cmake/options.cmake) if (NOT DESKTOP_APP_USE_PACKAGED) if (WIN32) - set(qt_version 5.15.9) + set(qt_version 5.15.10) elseif (APPLE) set(qt_version 6.3.2) endif() diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py index 86f88dc49..a3632d906 100644 --- a/Telegram/build/prepare/prepare.py +++ b/Telegram/build/prepare/prepare.py @@ -404,7 +404,7 @@ if customRunCommand: stage('patches', """ git clone https://github.com/desktop-app/patches.git cd patches - git checkout 3fad86d684 + git checkout b9361e74b2 """) stage('msys64', """ @@ -1234,30 +1234,30 @@ release: """) if buildQt5: - stage('qt_5_15_9', """ - git clone https://github.com/qt/qt5.git qt_5_15_9 - cd qt_5_15_9 + stage('qt_5_15_10', """ + git clone https://github.com/qt/qt5.git qt_5_15_10 + cd qt_5_15_10 perl init-repository --module-subset=qtbase,qtimageformats,qtsvg - git checkout v5.15.9-lts-lgpl + git checkout v5.15.10-lts-lgpl git submodule update qtbase qtimageformats qtsvg -depends:patches/qtbase_5.15.9/*.patch +depends:patches/qtbase_5.15.10/*.patch cd qtbase win: - for /r %%i in (..\\..\\patches\\qtbase_5.15.9\\*) do git apply %%i + for /r %%i in (..\\..\\patches\\qtbase_5.15.10\\*) do git apply %%i cd .. SET CONFIGURATIONS=-debug release: SET CONFIGURATIONS=-debug-and-release win: - """ + removeDir("\"%LIBS_DIR%\\Qt-5.15.9\"") + """ + """ + removeDir("\"%LIBS_DIR%\\Qt-5.15.10\"") + """ SET ANGLE_DIR=%LIBS_DIR%\\tg_angle SET ANGLE_LIBS_DIR=%ANGLE_DIR%\\out SET MOZJPEG_DIR=%LIBS_DIR%\\mozjpeg SET OPENSSL_DIR=%LIBS_DIR%\\openssl SET OPENSSL_LIBS_DIR=%OPENSSL_DIR%\\out SET ZLIB_LIBS_DIR=%LIBS_DIR%\\zlib - configure -prefix "%LIBS_DIR%\\Qt-5.15.9" ^ + configure -prefix "%LIBS_DIR%\\Qt-5.15.10" ^ %CONFIGURATIONS% ^ -force-debug-info ^ -opensource ^ @@ -1289,14 +1289,14 @@ win: jom -j16 jom -j16 install mac: - find ../../patches/qtbase_5.15.9 -type f -print0 | sort -z | xargs -0 git apply + find ../../patches/qtbase_5.15.10 -type f -print0 | sort -z | xargs -0 git apply cd .. CONFIGURATIONS=-debug release: CONFIGURATIONS=-debug-and-release mac: - ./configure -prefix "$USED_PREFIX/Qt-5.15.9" \ + ./configure -prefix "$USED_PREFIX/Qt-5.15.10" \ $CONFIGURATIONS \ -force-debug-info \ -opensource \