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

Update Qt to 5.15.4 and 6.3.1.

Browse source
This commit is contained in:
John Preston 2022-06-14 18:34:09 +04:00
parent 707359e371
commit 326304ca48
5 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Telegram/build/docker/centos_env/Dockerfile
View file

@ -4,9 +4,9 @@ FROM centos:7 AS builder
ENV GIT https://github.com
ENV GIT_FREEDESKTOP ${GIT}/gitlab-freedesktop-mirrors
ENV PKG_CONFIG_PATH /usr/local/lib64/pkgconfig:/usr/local/lib/pkgconfig:/usr/local/share/pkgconfig
ENV QT 6_3_0
ENV QT_TAG v6.3.0
ENV QT_PREFIX /usr/local/desktop-app/Qt-6.3.0
ENV QT 6_3_1
ENV QT_TAG v6.3.1
ENV QT_PREFIX /usr/local/desktop-app/Qt-6.3.1
ENV OPENSSL_VER 1_1_1
ENV OPENSSL_PREFIX /usr/local/desktop-app/openssl-1.1.1
ENV OPENSSL_ROOT_DIR ${OPENSSL_PREFIX}
@ -47,7 +47,7 @@ RUN mkdir /opt/cmake \
FROM builder AS patches
RUN git clone $GIT/desktop-app/patches.git \
&& cd patches \
&& git checkout 3be70fc6b5 \
&& git checkout 4a5c759f8f \
&& rm -rf .git
FROM builder AS libffi

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

@ -399,7 +399,7 @@ if customRunCommand:
stage('patches', """
git clone https://github.com/desktop-app/patches.git
cd patches
git checkout 5a7ba9ae3e
git checkout 4a5c759f8f
""")
stage('depot_tools', """
@ -1127,30 +1127,30 @@ release:
""")
if buildQt5:
stage('qt_5_15_3', """
git clone https://code.qt.io/qt/qt5.git qt_5_15_3
cd qt_5_15_3
stage('qt_5_15_4', """
git clone https://code.qt.io/qt/qt5.git qt_5_15_4
cd qt_5_15_4
perl init-repository --module-subset=qtbase,qtimageformats,qtsvg
git checkout v5.15.3-lts-lgpl
git checkout v5.15.4-lts-lgpl
git submodule update qtbase qtimageformats qtsvg
depends:patches/qtbase_5_15_3/*.patch
depends:patches/qtbase_5_15_4/*.patch
cd qtbase
win:
for /r %%i in (..\\..\\patches\\qtbase_5_15_3\\*) do git apply %%i
for /r %%i in (..\\..\\patches\\qtbase_5_15_4\\*) do git apply %%i
cd ..
SET CONFIGURATIONS=-debug
release:
SET CONFIGURATIONS=-debug-and-release
win:
""" + removeDir("\"%LIBS_DIR%\\Qt-5.15.3\"") + """
""" + removeDir("\"%LIBS_DIR%\\Qt-5.15.4\"") + """
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.3" ^
configure -prefix "%LIBS_DIR%\\Qt-5.15.4" ^
%CONFIGURATIONS% ^
-force-debug-info ^
-opensource ^
@ -1181,14 +1181,14 @@ win:
jom -j16
jom -j16 install
mac:
find ../../patches/qtbase_5_15_3 -type f -print0 | sort -z | xargs -0 git apply
find ../../patches/qtbase_5_15_4 -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.3" \
./configure -prefix "$USED_PREFIX/Qt-5.15.4" \
$CONFIGURATIONS \
-force-debug-info \
-opensource \

2
Telegram/codegen

@ -1 +1 @@
Subproject commit 125b2c57063a1c2e1a0ff970e41afee0f83fa4ad
Subproject commit 762500d143448189ee5c06239b52268ca1b6b74a

2
cmake

@ -1 +1 @@
Subproject commit 320fa8f2f83ac9a9c4ca0434311d80f2f114e24f
Subproject commit 1263bf734acbb8e2e42c80717bae891e050c28ed

4
snap/snapcraft.yaml
View file

@ -344,9 +344,9 @@ parts:
- libxkbcommon-x11-0
- zlib1g
override-pull: |
QT=6_3_0
QT=6_3_1
git clone -b v6.3.0 --depth=1 git://code.qt.io/qt/qt5.git .
git clone -b v6.3.1 --depth=1 git://code.qt.io/qt/qt5.git .
perl init-repository --module-subset=qtbase,qtwayland,qtimageformats,qtsvg,qt5compat
cd qtbase