diff --git a/CMakeLists.txt b/CMakeLists.txt index abea2aaf4..dcf88602f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,7 +60,7 @@ include(cmake/options.cmake) if (NOT DESKTOP_APP_USE_PACKAGED) if (WIN32) - set(qt_version 5.15.12) + set(qt_version 5.15.13) elseif (APPLE) set(qt_version 6.2.7) endif() diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py index 727e8521b..bb63f2d62 100644 --- a/Telegram/build/prepare/prepare.py +++ b/Telegram/build/prepare/prepare.py @@ -424,7 +424,7 @@ if customRunCommand: stage('patches', """ git clone https://github.com/desktop-app/patches.git cd patches - git checkout bed08b53a3 + git checkout cc0c2f8365 """) stage('msys64', """ @@ -1400,21 +1400,21 @@ release: """) if buildQt5: - stage('qt_5_15_12', """ - git clone -b v5.15.12-lts-lgpl https://github.com/qt/qt5.git qt_5_15_12 - cd qt_5_15_12 + stage('qt_5_15_13', """ + git clone -b v5.15.13-lts-lgpl https://github.com/qt/qt5.git qt_5_15_13 + cd qt_5_15_13 perl init-repository --module-subset=qtbase,qtimageformats,qtsvg -depends:patches/qtbase_5.15.12/*.patch +depends:patches/qtbase_5.15.13/*.patch cd qtbase win: - for /r %%i in (..\\..\\patches\\qtbase_5.15.12\\*) do git apply %%i -v + for /r %%i in (..\\..\\patches\\qtbase_5.15.13\\*) do git apply %%i -v cd .. SET CONFIGURATIONS=-debug release: SET CONFIGURATIONS=-debug-and-release win: - """ + removeDir("\"%LIBS_DIR%\\Qt-5.15.12\"") + """ + """ + removeDir("\"%LIBS_DIR%\\Qt-5.15.13\"") + """ SET ANGLE_DIR=%LIBS_DIR%\\tg_angle SET ANGLE_LIBS_DIR=%ANGLE_DIR%\\out SET MOZJPEG_DIR=%LIBS_DIR%\\mozjpeg @@ -1422,7 +1422,7 @@ win: SET OPENSSL_LIBS_DIR=%OPENSSL_DIR%\\out SET ZLIB_LIBS_DIR=%LIBS_DIR%\\zlib SET WEBP_DIR=%LIBS_DIR%\\libwebp - configure -prefix "%LIBS_DIR%\\Qt-5.15.12" ^ + configure -prefix "%LIBS_DIR%\\Qt-5.15.13" ^ %CONFIGURATIONS% ^ -force-debug-info ^ -opensource ^ @@ -1457,14 +1457,14 @@ win: jom -j16 jom -j16 install mac: - find ../../patches/qtbase_5.15.12 -type f -print0 | sort -z | xargs -0 git apply + find ../../patches/qtbase_5.15.13 -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.12" \ + ./configure -prefix "$USED_PREFIX/Qt-5.15.13" \ $CONFIGURATIONS \ -force-debug-info \ -opensource \