MrBesen
/
tdesktop
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Get rid of qt5compat dependency

This commit is contained in:
Ilya Fedin 2023-05-11 06:11:07 +04:00 committed by John Preston
parent db60bee7dc
commit 627c870dd5
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/build/docker/centos_env/Dockerfile
View File

@ -727,7 +727,7 @@ ENV OPENSSL_ROOT_DIR {{ OPENSSL_PREFIX }}
RUN git clone -b {{ QT_TAG }} --depth=1 https://code.qt.io/qt/qt5.git qt_{{ QT }} \
&& cd qt_{{ QT }} \
&& git submodule update --init --recursive --depth=1 qtbase qtdeclarative qtwayland qtimageformats qtsvg qt5compat qtshadertools \
&& git submodule update --init --recursive --depth=1 qtbase qtdeclarative qtwayland qtimageformats qtsvg qtshadertools \
&& cd qtbase \
&& find ../../patches/qtbase_{{ QT }} -type f -print0 | sort -z | xargs -r0 git apply \
&& cd ../qtdeclarative \

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

@ -1302,7 +1302,7 @@ if buildQt6:
mac:
git clone -b v6.3.2 https://code.qt.io/qt/qt5.git qt_6_3_2
cd qt_6_3_2
perl init-repository --module-subset=qtbase,qtimageformats,qtsvg,qt5compat
perl init-repository --module-subset=qtbase,qtimageformats,qtsvg
depends:patches/qtbase_6.3.2/*.patch
cd qtbase

2
Telegram/lib_spellcheck

@ -1 +1 @@
Subproject commit ae89fefd239ecc47d4dab7ba29f9e230376a57d3
Subproject commit 2fd3a249a984019c79d8cbfac33ac92ed58fbf30

2
cmake

@ -1 +1 @@
Subproject commit dee3777ffd54a40e966914a2942f7cdd92b93c86
Subproject commit a7d000be71db475f034c42687e7905fc8116050f

2
snap/snapcraft.yaml
View File

@ -459,7 +459,7 @@ parts:
QT=6.5.0
git clone -b v${QT} --depth=1 https://code.qt.io/qt/qt5.git .
git submodule update --init --recursive --depth=1 qtbase qtdeclarative qtwayland qtimageformats qtsvg qt5compat qtshadertools
git submodule update --init --recursive --depth=1 qtbase qtdeclarative qtwayland qtimageformats qtsvg qtshadertools
cd qtbase
find $CRAFT_STAGE/patches/qtbase_${QT} -type f -print0 | sort -z | xargs -r0 git apply