diff --git a/CMakeLists.txt b/CMakeLists.txt index 43026876d..46f6a576f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,7 +56,7 @@ include(cmake/options.cmake) if (NOT DESKTOP_APP_USE_PACKAGED) if (WIN32) - set(qt_version 5.15.7) + set(qt_version 5.15.8) elseif (APPLE) set(qt_version 6.3.2) else() diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py index 39d3066cc..c95d69c81 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 9e04e2eb9c + git checkout 8a361a1307 """) stage('msys64', """ @@ -1210,30 +1210,30 @@ release: """) if buildQt5: - stage('qt_5_15_7', """ - git clone https://code.qt.io/qt/qt5.git qt_5_15_7 - cd qt_5_15_7 + stage('qt_5_15_8', """ + git clone https://code.qt.io/qt/qt5.git qt_5_15_8 + cd qt_5_15_8 perl init-repository --module-subset=qtbase,qtimageformats,qtsvg - git checkout v5.15.7-lts-lgpl + git checkout v5.15.8-lts-lgpl git submodule update qtbase qtimageformats qtsvg -depends:patches/qtbase_5_15_7/*.patch +depends:patches/qtbase_5_15_8/*.patch cd qtbase win: - for /r %%i in (..\\..\\patches\\qtbase_5_15_7\\*) do git apply %%i + for /r %%i in (..\\..\\patches\\qtbase_5_15_8\\*) do git apply %%i cd .. SET CONFIGURATIONS=-debug release: SET CONFIGURATIONS=-debug-and-release win: - """ + removeDir("\"%LIBS_DIR%\\Qt-5.15.7\"") + """ + """ + removeDir("\"%LIBS_DIR%\\Qt-5.15.8\"") + """ 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.7" ^ + configure -prefix "%LIBS_DIR%\\Qt-5.15.8" ^ %CONFIGURATIONS% ^ -force-debug-info ^ -opensource ^ @@ -1264,14 +1264,14 @@ win: jom -j16 jom -j16 install mac: - find ../../patches/qtbase_5_15_7 -type f -print0 | sort -z | xargs -0 git apply + find ../../patches/qtbase_5_15_8 -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.7" \ + ./configure -prefix "$USED_PREFIX/Qt-5.15.8" \ $CONFIGURATIONS \ -force-debug-info \ -opensource \