diff --git a/CMakeLists.txt b/CMakeLists.txt index 46f6a576f..af94de3c0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,8 +59,6 @@ if (NOT DESKTOP_APP_USE_PACKAGED) set(qt_version 5.15.8) elseif (APPLE) set(qt_version 6.3.2) - else() - set(qt_version 6.4.2) endif() endif() include(cmake/external/qt/package.cmake) diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile index a765f35c5..30a871589 100644 --- a/Telegram/build/docker/centos_env/Dockerfile +++ b/Telegram/build/docker/centos_env/Dockerfile @@ -1,8 +1,8 @@ {%- set GIT = "https://github.com" -%} {%- set GIT_FREEDESKTOP = GIT ~ "/gitlab-freedesktop-mirrors" -%} -{%- set QT = "6_4_2" -%} -{%- set QT_TAG = "v6.4.2" -%} -{%- set QT_PREFIX = "/usr/local/desktop-app/Qt-6.4.2" -%} +{%- set QT = "6.4.2" -%} +{%- set QT_TAG = "v" ~ QT -%} +{%- set QT_PREFIX = "/usr/local/desktop-app/Qt-" ~ QT -%} {%- set OPENSSL_VER = "1_1_1" -%} {%- set OPENSSL_PREFIX = "/usr/local/desktop-app/openssl-1.1.1" -%} {%- set CMAKE_VER = "3.24.3" -%} @@ -834,6 +834,7 @@ COPY --link --from=webrtc_debug {{ LibrariesPath }}/tg_owt/out/Debug tg_owt/out/ {%- endif %} WORKDIR ../tdesktop +ENV QT {{ QT }} VOLUME [ "/usr/src/tdesktop" ] ENTRYPOINT [ "scl", "enable", "rh-python38", "--", "scl", "enable", "llvm-toolset-7.0", "--", "scl", "enable", "devtoolset-10", "--" ] CMD [ "/usr/src/tdesktop/Telegram/build/docker/centos_env/build.sh" ] diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py index de2fd25df..738c16843 100644 --- a/Telegram/build/prepare/prepare.py +++ b/Telegram/build/prepare/prepare.py @@ -404,7 +404,7 @@ if customRunCommand: stage('patches', """ git clone https://github.com/desktop-app/patches.git cd patches - git checkout 53214c8a8a + git checkout 73f5d4762f """) stage('msys64', """ @@ -1216,7 +1216,7 @@ if buildQt5: perl init-repository --module-subset=qtbase,qtimageformats,qtsvg git checkout v5.15.8-lts-lgpl git submodule update qtbase qtimageformats qtsvg -depends:patches/qtbase_5_15_8/*.patch +depends:patches/qtbase_5.15.8/*.patch cd qtbase win: for /r %%i in (..\\..\\patches\\qtbase_5_15_8\\*) do git apply %%i @@ -1264,7 +1264,7 @@ win: jom -j16 jom -j16 install mac: - find ../../patches/qtbase_5_15_8 -type f -print0 | sort -z | xargs -0 git apply + find ../../patches/qtbase_5.15.8 -type f -print0 | sort -z | xargs -0 git apply cd .. CONFIGURATIONS=-debug @@ -1297,10 +1297,10 @@ 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 -depends:patches/qtbase_6_3_2/*.patch +depends:patches/qtbase_6.3.2/*.patch cd qtbase - find ../../patches/qtbase_6_3_2 -type f -print0 | sort -z | xargs -0 git apply + find ../../patches/qtbase_6.3.2 -type f -print0 | sort -z | xargs -0 git apply cd .. CONFIGURATIONS=-debug diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index cace87c57..162b4c15b 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -486,9 +486,9 @@ parts: - libxkbcommon-x11-0 - zlib1g override-pull: | - QT=6_4_2 + QT=6.4.2 - git clone -b v6.4.2 --depth=1 git://code.qt.io/qt/qt5.git . + git clone -b v${QT} --depth=1 git://code.qt.io/qt/qt5.git . git submodule update --init --recursive --depth=1 qtbase qtdeclarative qtwayland qtimageformats qtsvg qt5compat qtshadertools cd qtbase