RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Updated Qt to 5.15.7 on Windows.

This commit is contained in:
23rd 2022-12-09 02:01:43 +03:00
parent 23150d4e2a
commit 5101ea2a96
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -52,7 +52,7 @@ include(cmake/options.cmake)
if (NOT DESKTOP_APP_USE_PACKAGED) if (NOT DESKTOP_APP_USE_PACKAGED)
if (WIN32) if (WIN32)
set(qt_version 5.15.4) set(qt_version 5.15.7)
elseif (APPLE) elseif (APPLE)
set(qt_version 6.3.2) set(qt_version 6.3.2)
else() else()

24
Telegram/build/prepare/prepare.py
View File

@ -397,7 +397,7 @@ if customRunCommand:
stage('patches', """ stage('patches', """
git clone https://github.com/desktop-app/patches.git git clone https://github.com/desktop-app/patches.git
cd patches cd patches
git checkout e1117dfb86 git checkout 92f4ee3867
""") """)
stage('msys64', """ stage('msys64', """
@ -471,7 +471,7 @@ release:
stage('xz', """ stage('xz', """
!win: !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 cd xz
sed -i '' '\\@check_symbol_exists(futimens "sys/types.h;sys/stat.h" HAVE_FUTIMENS)@d' CMakeLists.txt sed -i '' '\\@check_symbol_exists(futimens "sys/types.h;sys/stat.h" HAVE_FUTIMENS)@d' CMakeLists.txt
CFLAGS="$UNGUARDED" CPPFLAGS="$UNGUARDED" cmake -B build . \\ CFLAGS="$UNGUARDED" CPPFLAGS="$UNGUARDED" cmake -B build . \\
@ -1063,30 +1063,30 @@ release:
""") """)
if buildQt5: if buildQt5:
stage('qt_5_15_4', """ stage('qt_5_15_7', """
git clone https://code.qt.io/qt/qt5.git qt_5_15_4 git clone https://code.qt.io/qt/qt5.git qt_5_15_7
cd qt_5_15_4 cd qt_5_15_7
perl init-repository --module-subset=qtbase,qtimageformats,qtsvg 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 git submodule update qtbase qtimageformats qtsvg
depends:patches/qtbase_5_15_4/*.patch depends:patches/qtbase_5_15_7/*.patch
cd qtbase cd qtbase
win: 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 .. cd ..
SET CONFIGURATIONS=-debug SET CONFIGURATIONS=-debug
release: release:
SET CONFIGURATIONS=-debug-and-release SET CONFIGURATIONS=-debug-and-release
win: win:
""" + removeDir("\"%LIBS_DIR%\\Qt-5.15.4\"") + """ """ + removeDir("\"%LIBS_DIR%\\Qt-5.15.7\"") + """
SET ANGLE_DIR=%LIBS_DIR%\\tg_angle SET ANGLE_DIR=%LIBS_DIR%\\tg_angle
SET ANGLE_LIBS_DIR=%ANGLE_DIR%\\out SET ANGLE_LIBS_DIR=%ANGLE_DIR%\\out
SET MOZJPEG_DIR=%LIBS_DIR%\\mozjpeg SET MOZJPEG_DIR=%LIBS_DIR%\\mozjpeg
SET OPENSSL_DIR=%LIBS_DIR%\\openssl SET OPENSSL_DIR=%LIBS_DIR%\\openssl
SET OPENSSL_LIBS_DIR=%OPENSSL_DIR%\\out SET OPENSSL_LIBS_DIR=%OPENSSL_DIR%\\out
SET ZLIB_LIBS_DIR=%LIBS_DIR%\\zlib SET ZLIB_LIBS_DIR=%LIBS_DIR%\\zlib
configure -prefix "%LIBS_DIR%\\Qt-5.15.4" ^ configure -prefix "%LIBS_DIR%\\Qt-5.15.7" ^
%CONFIGURATIONS% ^ %CONFIGURATIONS% ^
-force-debug-info ^ -force-debug-info ^
-opensource ^ -opensource ^
@ -1117,14 +1117,14 @@ win:
jom -j16 jom -j16
jom -j16 install jom -j16 install
mac: 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 .. cd ..
CONFIGURATIONS=-debug CONFIGURATIONS=-debug
release: release:
CONFIGURATIONS=-debug-and-release CONFIGURATIONS=-debug-and-release
mac: mac:
./configure -prefix "$USED_PREFIX/Qt-5.15.4" \ ./configure -prefix "$USED_PREFIX/Qt-5.15.7" \
$CONFIGURATIONS \ $CONFIGURATIONS \
-force-debug-info \ -force-debug-info \
-opensource \ -opensource \