diff --git a/CMakeLists.txt b/CMakeLists.txt index 47d227efca..2c0f325b43 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,7 +56,7 @@ if (NOT DESKTOP_APP_USE_PACKAGED) elseif (APPLE) set(qt_version 6.3.1) else() - set(qt_version 6.4.0) + set(qt_version 6.4.1) 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 38acfd6b1b..32eedeaa7a 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_0" -%} -{%- set QT_TAG = "v6.4.0" -%} -{%- set QT_PREFIX = "/usr/local/desktop-app/Qt-6.4.0" -%} +{%- set QT = "6_4_1" -%} +{%- set QT_TAG = "v6.4.1" -%} +{%- set QT_PREFIX = "/usr/local/desktop-app/Qt-6.4.1" -%} {%- set OPENSSL_VER = "1_1_1" -%} {%- set OPENSSL_PREFIX = "/usr/local/desktop-app/openssl-1.1.1" -%} {%- set CMAKE_VER = "3.24.3" -%} @@ -56,7 +56,7 @@ ENV CXXFLAGS $CFLAGS FROM builder AS patches RUN git clone {{ GIT }}/desktop-app/patches.git \ && cd patches \ - && git checkout b3b5f5cf92 \ + && git checkout 4f755b92cb \ && rm -rf .git FROM builder AS nasm diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 96ff9f46a7..08713dee21 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -418,9 +418,9 @@ parts: - libxkbcommon-x11-0 - zlib1g override-pull: | - QT=6_4_0 + QT=6_4_1 - git clone -b v6.4.0 --depth=1 git://code.qt.io/qt/qt5.git . + git clone -b v6.4.1 --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