void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update Qt to 6.4.1 on Linux

Browse source
This commit is contained in:
Ilya Fedin 2022-11-16 17:43:59 +04:00 • committed by John Preston
parent 768fc9b8f6
commit 82629dd3e5
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -56,7 +56,7 @@ if (NOT DESKTOP_APP_USE_PACKAGED)
elseif (APPLE) elseif (APPLE)
set(qt_version 6.3.1) set(qt_version 6.3.1)
else() else()
set(qt_version 6.4.0) set(qt_version 6.4.1)
endif() endif()
endif() endif()
include(cmake/external/qt/package.cmake) include(cmake/external/qt/package.cmake)

8
Telegram/build/docker/centos_env/Dockerfile
View file

@ -1,8 +1,8 @@
{%- set GIT = "https://github.com" -%} {%- set GIT = "https://github.com" -%}
{%- set GIT_FREEDESKTOP = GIT ~ "/gitlab-freedesktop-mirrors" -%} {%- set GIT_FREEDESKTOP = GIT ~ "/gitlab-freedesktop-mirrors" -%}
{%- set QT = "6_4_0" -%} {%- set QT = "6_4_1" -%}
{%- set QT_TAG = "v6.4.0" -%} {%- set QT_TAG = "v6.4.1" -%}
{%- set QT_PREFIX = "/usr/local/desktop-app/Qt-6.4.0" -%} {%- set QT_PREFIX = "/usr/local/desktop-app/Qt-6.4.1" -%}
{%- set OPENSSL_VER = "1_1_1" -%} {%- set OPENSSL_VER = "1_1_1" -%}
{%- set OPENSSL_PREFIX = "/usr/local/desktop-app/openssl-1.1.1" -%} {%- set OPENSSL_PREFIX = "/usr/local/desktop-app/openssl-1.1.1" -%}
{%- set CMAKE_VER = "3.24.3" -%} {%- set CMAKE_VER = "3.24.3" -%}
@ -56,7 +56,7 @@ ENV CXXFLAGS $CFLAGS
FROM builder AS patches FROM builder AS patches
RUN git clone {{ GIT }}/desktop-app/patches.git \ RUN git clone {{ GIT }}/desktop-app/patches.git \
&& cd patches \ && cd patches \
&& git checkout b3b5f5cf92 \ && git checkout 4f755b92cb \
&& rm -rf .git && rm -rf .git
FROM builder AS nasm FROM builder AS nasm

4
snap/snapcraft.yaml
View file

@ -418,9 +418,9 @@ parts:
- libxkbcommon-x11-0 - libxkbcommon-x11-0
- zlib1g - zlib1g
override-pull: | 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 git submodule update --init --recursive --depth=1 qtbase qtdeclarative qtwayland qtimageformats qtsvg qt5compat qtshadertools
cd qtbase cd qtbase