diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile index cb89f005d9..a9c567f441 100644 --- a/Telegram/build/docker/centos_env/Dockerfile +++ b/Telegram/build/docker/centos_env/Dockerfile @@ -91,7 +91,7 @@ FROM builder AS patches RUN git init patches \ && cd patches \ && git remote add origin https://github.com/desktop-app/patches.git \ - && git fetch --depth=1 origin a25a212644a8e42d9a5b1c7ba6489e11e92df813 \ + && git fetch --depth=1 origin 435c8d69dd651357da120c0f14f77fd712919335 \ && git reset --hard FETCH_HEAD \ && rm -rf .git @@ -731,7 +731,7 @@ COPY --link --from=xcb-cursor /usr/src/xcb-cursor-cache / COPY --link --from=openssl /usr/src/openssl-cache / COPY --link --from=xkbcommon /usr/src/xkbcommon-cache / -ENV QT=6.9.2 +ENV QT=6.10.0 RUN git clone -b v$QT --depth=1 https://github.com/qt/qt5.git \ && cd qt5 \ && git submodule update --init --recursive --depth=1 qtbase qtdeclarative qtwayland qtimageformats qtsvg qtshadertools \ @@ -747,6 +747,7 @@ RUN git clone -b v$QT --depth=1 https://github.com/qt/qt5.git \ -DFEATURE_sanitize_address=ON \ {%- endif %} -DQT_QPA_PLATFORMS="wayland;xcb" \ + -DFEATURE_copy_file_range=OFF \ -DINPUT_libpng=qt \ -DINPUT_harfbuzz=qt \ -DINPUT_pcre=qt \ diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py index 4ac043dbdc..d5f6f000e8 100644 --- a/Telegram/build/prepare/prepare.py +++ b/Telegram/build/prepare/prepare.py @@ -456,7 +456,7 @@ if customRunCommand: stage('patches', """ git clone https://github.com/desktop-app/patches.git cd patches - git checkout a25a212644a8e42d9a5b1c7ba6489e11e92df813 + git checkout 435c8d69dd651357da120c0f14f77fd712919335 """) stage('msys64', """ diff --git a/Telegram/build/qt_version.py b/Telegram/build/qt_version.py index 329a746c9d..4efce94a1b 100644 --- a/Telegram/build/qt_version.py +++ b/Telegram/build/qt_version.py @@ -6,7 +6,7 @@ def resolve(arch): elif sys.platform == 'win32': if arch == 'arm' or 'qt6' in sys.argv: print('Choosing Qt 6.') - os.environ['QT'] = '6.9.2' + os.environ['QT'] = '6.10.0' else: print('Choosing Qt 5.') os.environ['QT'] = '5.15.17' diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index ce634f1f1a..106765f359 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -122,7 +122,7 @@ parts: patches: source: https://github.com/desktop-app/patches.git source-depth: 1 - source-commit: a25a212644a8e42d9a5b1c7ba6489e11e92df813 + source-commit: 435c8d69dd651357da120c0f14f77fd712919335 plugin: nil override-pull: | craftctl default @@ -399,7 +399,7 @@ parts: qt: source: https://github.com/qt/qt5.git source-depth: 1 - source-tag: v6.9.2 + source-tag: v6.10.0 source-submodules: - qtbase - qtdeclarative @@ -432,6 +432,7 @@ parts: - -DINSTALL_LIBDIR=/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR - -DBUILD_SHARED_LIBS=OFF - -DQT_QPA_PLATFORMS="wayland;xcb" + - -DFEATURE_copy_file_range=OFF - -DFEATURE_eglfs=OFF - -DINPUT_openssl=linked override-pull: |