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

Updated Qt to 5.15.12 on Windows.

Browse source
This commit is contained in:
23rd 2023-12-28 13:57:27 +03:00 • committed by John Preston
parent 758219265a
commit c7f11eb05a
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -60,7 +60,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.11) set(qt_version 5.15.12)
elseif (APPLE) elseif (APPLE)
set(qt_version 6.2.7) set(qt_version 6.2.7)
endif() endif()

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

@ -418,7 +418,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 182c4076ab git checkout 26f2387219
""") """)
stage('msys64', """ stage('msys64', """
@ -1299,23 +1299,23 @@ release:
""") """)
if buildQt5: if buildQt5:
stage('qt_5_15_11', """ stage('qt_5_15_12', """
git clone https://github.com/qt/qt5.git qt_5_15_11 git clone https://github.com/qt/qt5.git qt_5_15_12
cd qt_5_15_11 cd qt_5_15_12
perl init-repository --module-subset=qtbase,qtimageformats,qtsvg perl init-repository --module-subset=qtbase,qtimageformats,qtsvg
git checkout v5.15.11-lts-lgpl git checkout v5.15.12-lts-lgpl
git submodule update qtbase qtimageformats qtsvg git submodule update qtbase qtimageformats qtsvg
depends:patches/qtbase_5.15.11/*.patch depends:patches/qtbase_5.15.12/*.patch
cd qtbase cd qtbase
win: win:
for /r %%i in (..\\..\\patches\\qtbase_5.15.11\\*) do git apply %%i -v for /r %%i in (..\\..\\patches\\qtbase_5.15.12\\*) do git apply %%i -v
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.11\"") + """ """ + removeDir("\"%LIBS_DIR%\\Qt-5.15.12\"") + """
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
@ -1323,7 +1323,7 @@ win:
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
SET WEBP_DIR=%LIBS_DIR%\\libwebp SET WEBP_DIR=%LIBS_DIR%\\libwebp
configure -prefix "%LIBS_DIR%\\Qt-5.15.11" ^ configure -prefix "%LIBS_DIR%\\Qt-5.15.12" ^
%CONFIGURATIONS% ^ %CONFIGURATIONS% ^
-force-debug-info ^ -force-debug-info ^
-opensource ^ -opensource ^
@ -1358,14 +1358,14 @@ win:
jom -j16 jom -j16
jom -j16 install jom -j16 install
mac: mac:
find ../../patches/qtbase_5.15.11 -type f -print0 | sort -z | xargs -0 git apply find ../../patches/qtbase_5.15.12 -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.11" \ ./configure -prefix "$USED_PREFIX/Qt-5.15.12" \
$CONFIGURATIONS \ $CONFIGURATIONS \
-force-debug-info \ -force-debug-info \
-opensource \ -opensource \