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

Browse source
This commit is contained in:
Ilya Fedin 2024-05-21 14:18:00 +04:00 • committed by John Preston
parent 7dbf8ca1f4
commit 8a5ad581b8
2 changed files with 4 additions and 4 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.7.0" -%} {%- set QT = "6.7.1" -%}
{%- set QT_TAG = "v" ~ QT -%} {%- set QT_TAG = "v" ~ QT -%}
{%- set CMAKE_VER = "3.27.6" -%} {%- set CMAKE_VER = "3.27.6" -%}
{%- set CMAKE_FILE = "cmake-" ~ CMAKE_VER ~ "-Linux-x86_64.sh" -%} {%- set CMAKE_FILE = "cmake-" ~ CMAKE_VER ~ "-Linux-x86_64.sh" -%}
@ -51,7 +51,7 @@ FROM builder AS patches
RUN git init patches \ RUN git init patches \
&& cd patches \ && cd patches \
&& git remote add origin {{ GIT }}/desktop-app/patches.git \ && git remote add origin {{ GIT }}/desktop-app/patches.git \
&& git fetch --depth=1 origin 931535985f75ca51313923d31d7924560719b3eb \ && git fetch --depth=1 origin 803f1c2630f5eb0d3b00ba3f095b3079c0533156 \
&& git reset --hard FETCH_HEAD \ && git reset --hard FETCH_HEAD \
&& rm -rf .git && rm -rf .git

4
snap/snapcraft.yaml
View file

@ -165,7 +165,7 @@ parts:
patches: patches:
source: https://github.com/desktop-app/patches.git source: https://github.com/desktop-app/patches.git
source-depth: 1 source-depth: 1
source-commit: 931535985f75ca51313923d31d7924560719b3eb source-commit: 803f1c2630f5eb0d3b00ba3f095b3079c0533156
plugin: dump plugin: dump
override-pull: | override-pull: |
craftctl default craftctl default
@ -360,7 +360,7 @@ parts:
- mesa-vulkan-drivers - mesa-vulkan-drivers
- xkb-data - xkb-data
override-pull: | override-pull: |
QT=6.7.0 QT=6.7.1
git clone -b v${QT} --depth=1 https://github.com/qt/qt5.git . git clone -b v${QT} --depth=1 https://github.com/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