From 627c870dd5e6cecffa7153e8c0a103ac13951861 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Thu, 11 May 2023 06:11:07 +0400 Subject: [PATCH] Get rid of qt5compat dependency --- Telegram/build/docker/centos_env/Dockerfile | 2 +- Telegram/build/prepare/prepare.py | 2 +- Telegram/lib_spellcheck | 2 +- cmake | 2 +- snap/snapcraft.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile index a118f3ed3..4068f53ef 100644 --- a/Telegram/build/docker/centos_env/Dockerfile +++ b/Telegram/build/docker/centos_env/Dockerfile @@ -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 \ diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py index 183eaabd0..f01db1f26 100644 --- a/Telegram/build/prepare/prepare.py +++ b/Telegram/build/prepare/prepare.py @@ -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 diff --git a/Telegram/lib_spellcheck b/Telegram/lib_spellcheck index ae89fefd2..2fd3a249a 160000 --- a/Telegram/lib_spellcheck +++ b/Telegram/lib_spellcheck @@ -1 +1 @@ -Subproject commit ae89fefd239ecc47d4dab7ba29f9e230376a57d3 +Subproject commit 2fd3a249a984019c79d8cbfac33ac92ed58fbf30 diff --git a/cmake b/cmake index dee3777ff..a7d000be7 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit dee3777ffd54a40e966914a2942f7cdd92b93c86 +Subproject commit a7d000be71db475f034c42687e7905fc8116050f diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index c0cb0a3a4..b170f1b5e 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -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