mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-09-04 00:25:17 +00:00
Code Issues Releases Wiki Activity

Update Qt to 6.6.0-beta4 on Linux

Browse Source
This commit is contained in:
Ilya Fedin
2023-09-23 13:02:15 +04:00
committed by John Preston
parent 547a5a14df
commit 51ff484913
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Telegram/build/docker/centos_env/Dockerfile
View File

@@ -1,7 +1,7 @@
{%- 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.2" -%} {%- set QT = "6.6.0" -%}
{%- set QT_TAG = "v" ~ QT -%} {%- set QT_TAG = "v" ~ QT ~ "-beta4" -%}
{%- 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" -%}
{%- set OPENSSL_PREFIX = "/usr/local/desktop-app/openssl-1.1.1" -%} {%- set OPENSSL_PREFIX = "/usr/local/desktop-app/openssl-1.1.1" -%}
@@ -54,7 +54,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 2c464cfbd9fa3c1d88335cf9462c8ef96542f87c \ && git fetch --depth=1 origin 6442ae042bb6d43391747f7413c7a88a6a37c7ef \
&& git reset --hard FETCH_HEAD \ && git reset --hard FETCH_HEAD \
&& rm -rf .git && rm -rf .git

2
Telegram/lib_base

Submodule Telegram/lib_base updated: 5916b1db7c...ce8f9214ad

2
Telegram/lib_webview

Submodule Telegram/lib_webview updated: cea8958ca2...90dc3f5932

4
snap/snapcraft.yaml
View File

@@ -460,9 +460,9 @@ parts:
- libxkbcommon-x11-0 - libxkbcommon-x11-0
- zlib1g - zlib1g
override-pull: | override-pull: |
QT=6.5.2 QT=6.6.0
git clone -b v${QT} --depth=1 https://code.qt.io/qt/qt5.git . git clone -b v${QT}-beta4 --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
cd qtbase cd qtbase