diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py index ca821bf61..1d638192f 100644 --- a/Telegram/build/prepare/prepare.py +++ b/Telegram/build/prepare/prepare.py @@ -400,7 +400,7 @@ if customRunCommand: stage('patches', """ git clone https://github.com/desktop-app/patches.git cd patches - git checkout 49d233d5de + git checkout 2ccddbe673 """) stage('depot_tools', """ @@ -1113,30 +1113,30 @@ release: """) if buildQt5: - stage('qt_5_15_2', """ - git clone https://code.qt.io/qt/qt5.git qt_5_15_2 - cd qt_5_15_2 + stage('qt_5_15_3', """ + git clone https://code.qt.io/qt/qt5.git qt_5_15_3 + cd qt_5_15_3 perl init-repository --module-subset=qtbase,qtimageformats,qtsvg - git checkout v5.15.2 + git checkout v5.15.3-lts-lgpl git submodule update qtbase qtimageformats qtsvg -depends:patches/qtbase_5_15_2/*.patch +depends:patches/qtbase_5_15_3/*.patch cd qtbase win: - for /r %%i in (..\\..\\patches\\qtbase_5_15_2\\*) do git apply %%i + for /r %%i in (..\\..\\patches\\qtbase_5_15_3\\*) do git apply %%i cd .. SET CONFIGURATIONS=-debug release: SET CONFIGURATIONS=-debug-and-release win: - """ + removeDir("\"%LIBS_DIR%\\Qt-5.15.2\"") + """ + """ + removeDir("\"%LIBS_DIR%\\Qt-5.15.3\"") + """ 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\\contrib\\vstudio\\vc14\\%X8664% - configure -prefix "%LIBS_DIR%\\Qt-5.15.2" ^ + configure -prefix "%LIBS_DIR%\\Qt-5.15.3" ^ %CONFIGURATIONS% ^ -force-debug-info ^ -opensource ^ @@ -1167,14 +1167,14 @@ win: jom -j16 jom -j16 install mac: - find ../../patches/qtbase_5_15_2 -type f -print0 | sort -z | xargs -0 git apply + find ../../patches/qtbase_5_15_3 -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.2" \ + ./configure -prefix "$USED_PREFIX/Qt-5.15.3" \ $CONFIGURATIONS \ -force-debug-info \ -opensource \ diff --git a/cmake b/cmake index aa71b768b..3aa9ec0ed 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit aa71b768bd6e958753a5e5ced5203d65cc93a6b1 +Subproject commit 3aa9ec0ed16b6a83bb3af14ba803ab59b512397f