void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move Qt 5 version to 5.15.3 open source.

Browse source
This commit is contained in:
John Preston 2022-03-08 22:24:31 +04:00
parent 1bdada3cfc
commit 6e00b4636b
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Telegram/build/prepare/prepare.py
View file

@ -400,7 +400,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 49d233d5de git checkout 2ccddbe673
""") """)
stage('depot_tools', """ stage('depot_tools', """
@ -1113,30 +1113,30 @@ release:
""") """)
if buildQt5: if buildQt5:
stage('qt_5_15_2', """ stage('qt_5_15_3', """
git clone https://code.qt.io/qt/qt5.git qt_5_15_2 git clone https://code.qt.io/qt/qt5.git qt_5_15_3
cd qt_5_15_2 cd qt_5_15_3
perl init-repository --module-subset=qtbase,qtimageformats,qtsvg 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 git submodule update qtbase qtimageformats qtsvg
depends:patches/qtbase_5_15_2/*.patch depends:patches/qtbase_5_15_3/*.patch
cd qtbase cd qtbase
win: 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 .. 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.2\"") + """ """ + removeDir("\"%LIBS_DIR%\\Qt-5.15.3\"") + """
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\\contrib\\vstudio\\vc14\\%X8664% 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% ^ %CONFIGURATIONS% ^
-force-debug-info ^ -force-debug-info ^
-opensource ^ -opensource ^
@ -1167,14 +1167,14 @@ win:
jom -j16 jom -j16
jom -j16 install jom -j16 install
mac: 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 .. cd ..
CONFIGURATIONS=-debug CONFIGURATIONS=-debug
release: release:
CONFIGURATIONS=-debug-and-release CONFIGURATIONS=-debug-and-release
mac: mac:
./configure -prefix "$USED_PREFIX/Qt-5.15.2" \ ./configure -prefix "$USED_PREFIX/Qt-5.15.3" \
$CONFIGURATIONS \ $CONFIGURATIONS \
-force-debug-info \ -force-debug-info \
-opensource \ -opensource \

2
cmake

@ -1 +1 @@
Subproject commit aa71b768bd6e958753a5e5ced5203d65cc93a6b1 Subproject commit 3aa9ec0ed16b6a83bb3af14ba803ab59b512397f