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.5.1 on Linux

Browse source
This commit is contained in:
Ilya Fedin 2023-05-25 00:12:44 +04:00 • committed by John Preston
parent d57aa2a1f6
commit e9787170d5
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,6 @@
{%- 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.5.0" -%} {%- set QT = "6.5.1" -%}
{%- set QT_TAG = "v" ~ QT -%} {%- set QT_TAG = "v" ~ QT -%}
{%- set QT_PREFIX = "/usr/local/desktop-app/Qt-" ~ QT -%} {%- set QT_PREFIX = "/usr/local/desktop-app/Qt-" ~ QT -%}
{%- set OPENSSL_VER = "1_1_1" -%} {%- set OPENSSL_VER = "1_1_1" -%}
@ -58,7 +58,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 3fad86d684 \ && git checkout 1d72fdb335 \
&& rm -rf .git && rm -rf .git
FROM builder AS nasm FROM builder AS nasm

2
snap/snapcraft.yaml
View file

@ -460,7 +460,7 @@ parts:
- libxkbcommon-x11-0 - libxkbcommon-x11-0
- zlib1g - zlib1g
override-pull: | override-pull: |
QT=6.5.0 QT=6.5.1
git clone -b v${QT} --depth=1 https://code.qt.io/qt/qt5.git . 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 qtshadertools git submodule update --init --recursive --depth=1 qtbase qtdeclarative qtwayland qtimageformats qtsvg qtshadertools