diff options
| author | 23rd <23rd@vivaldi.net> | 2022-12-09 02:01:43 +0300 |
|---|---|---|
| committer | 23rd <23rd@vivaldi.net> | 2022-12-09 11:54:37 +0300 |
| commit | 5101ea2a9665f17ae01e00edca7bc9817f9373f4 (patch) | |
| tree | bacf1d05b19e5099f2404dadf514b25a68d23397 | |
| parent | 23150d4e2a2eb02b34949e6d574e0bdf3d271605 (diff) | |
Updated Qt to 5.15.7 on Windows.
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Telegram/build/prepare/prepare.py | 24 |
2 files changed, 13 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 728a1013b0..d81764b72c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,7 +52,7 @@ include(cmake/options.cmake) if (NOT DESKTOP_APP_USE_PACKAGED) if (WIN32) - set(qt_version 5.15.4) + set(qt_version 5.15.7) elseif (APPLE) set(qt_version 6.3.2) else() diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py index 544e37ef82..2ddda7352a 100644 --- a/Telegram/build/prepare/prepare.py +++ b/Telegram/build/prepare/prepare.py @@ -397,7 +397,7 @@ if customRunCommand: stage('patches', """ git clone https://github.com/desktop-app/patches.git cd patches - git checkout e1117dfb86 + git checkout 92f4ee3867 """) stage('msys64', """ @@ -471,7 +471,7 @@ release: stage('xz', """ !win: - git clone -b v5.2.5 https://git.tukaani.org/xz.git + git clone -b v5.2.9 https://git.tukaani.org/xz.git cd xz sed -i '' '\\@check_symbol_exists(futimens "sys/types.h;sys/stat.h" HAVE_FUTIMENS)@d' CMakeLists.txt CFLAGS="$UNGUARDED" CPPFLAGS="$UNGUARDED" cmake -B build . \\ @@ -1063,30 +1063,30 @@ release: """) if buildQt5: - stage('qt_5_15_4', """ - git clone https://code.qt.io/qt/qt5.git qt_5_15_4 - cd qt_5_15_4 + stage('qt_5_15_7', """ + git clone https://code.qt.io/qt/qt5.git qt_5_15_7 + cd qt_5_15_7 perl init-repository --module-subset=qtbase,qtimageformats,qtsvg - git checkout v5.15.4-lts-lgpl + git checkout v5.15.7-lts-lgpl git submodule update qtbase qtimageformats qtsvg -depends:patches/qtbase_5_15_4/*.patch +depends:patches/qtbase_5_15_7/*.patch cd qtbase win: - for /r %%i in (..\\..\\patches\\qtbase_5_15_4\\*) do git apply %%i + for /r %%i in (..\\..\\patches\\qtbase_5_15_7\\*) do git apply %%i cd .. SET CONFIGURATIONS=-debug release: SET CONFIGURATIONS=-debug-and-release win: - """ + removeDir("\"%LIBS_DIR%\\Qt-5.15.4\"") + """ + """ + removeDir("\"%LIBS_DIR%\\Qt-5.15.7\"") + """ 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.4" ^ + configure -prefix "%LIBS_DIR%\\Qt-5.15.7" ^ %CONFIGURATIONS% ^ -force-debug-info ^ -opensource ^ @@ -1117,14 +1117,14 @@ win: jom -j16 jom -j16 install mac: - find ../../patches/qtbase_5_15_4 -type f -print0 | sort -z | xargs -0 git apply + find ../../patches/qtbase_5_15_7 -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.4" \ + ./configure -prefix "$USED_PREFIX/Qt-5.15.7" \ $CONFIGURATIONS \ -force-debug-info \ -opensource \ |