mirror of
https://github.com/telegramdesktop/tdesktop
synced 2025-02-01 12:44:31 +00:00
Update Qt to 6.4.0 beta4 on Linux
This commit is contained in:
parent
4f261ced8e
commit
86059f2b5e
@ -51,8 +51,10 @@ include(cmake/options.cmake)
|
||||
if (NOT DESKTOP_APP_USE_PACKAGED)
|
||||
if (WIN32)
|
||||
set(qt_version 5.15.4)
|
||||
else()
|
||||
elseif (APPLE)
|
||||
set(qt_version 6.3.1)
|
||||
else()
|
||||
set(qt_version 6.4.0)
|
||||
endif()
|
||||
endif()
|
||||
include(cmake/external/qt/package.cmake)
|
||||
|
@ -1,8 +1,8 @@
|
||||
{%- set GIT = "https://github.com" -%}
|
||||
{%- set GIT_FREEDESKTOP = GIT ~ "/gitlab-freedesktop-mirrors" -%}
|
||||
{%- set QT = "6_3_1" -%}
|
||||
{%- set QT_TAG = "v6.3.1" -%}
|
||||
{%- set QT_PREFIX = "/usr/local/desktop-app/Qt-6.3.1" -%}
|
||||
{%- set QT = "6_4_0" -%}
|
||||
{%- set QT_TAG = "v6.4.0-beta4" -%}
|
||||
{%- set QT_PREFIX = "/usr/local/desktop-app/Qt-6.4.0" -%}
|
||||
{%- set OPENSSL_VER = "1_1_1" -%}
|
||||
{%- set OPENSSL_PREFIX = "/usr/local/desktop-app/openssl-1.1.1" -%}
|
||||
{%- set CMAKE_VER = "3.21.3" -%}
|
||||
@ -48,7 +48,7 @@ RUN mkdir /opt/cmake \
|
||||
FROM builder AS patches
|
||||
RUN git clone {{ GIT }}/desktop-app/patches.git \
|
||||
&& cd patches \
|
||||
&& git checkout 4a5c759f8f \
|
||||
&& git checkout d939423196 \
|
||||
&& rm -rf .git
|
||||
|
||||
FROM builder AS extra-cmake-modules
|
||||
|
@ -1 +1 @@
|
||||
Subproject commit 37fab6b4da32c91bc5d049baad2e9ad51cfcd195
|
||||
Subproject commit f65e7748b14921e083076add53447f242438f250
|
@ -1 +1 @@
|
||||
Subproject commit f420e302d7992e10cae8924701c3a3a85c0aa8b9
|
||||
Subproject commit 95dd2c8465d4b5bfcbcdb47ce7a1d1e743d04477
|
2
cmake
2
cmake
@ -1 +1 @@
|
||||
Subproject commit 7b43684a1caab158ef0b8884c20fe9d1436872ab
|
||||
Subproject commit b9f1b6036329e44ec61f51f0b363fe2319158b84
|
@ -396,9 +396,9 @@ parts:
|
||||
- libxkbcommon-x11-0
|
||||
- zlib1g
|
||||
override-pull: |
|
||||
QT=6_3_1
|
||||
QT=6_4_0
|
||||
|
||||
git clone -b v6.3.1 --depth=1 git://code.qt.io/qt/qt5.git .
|
||||
git clone -b v6.4.0-beta4 --depth=1 git://code.qt.io/qt/qt5.git .
|
||||
perl init-repository --module-subset=qtbase,qtwayland,qtimageformats,qtsvg,qt5compat
|
||||
|
||||
cd qtbase
|
||||
@ -446,7 +446,7 @@ parts:
|
||||
qttools:
|
||||
source: git://code.qt.io/qt/qttools.git
|
||||
source-depth: 1
|
||||
source-tag: v6.3.1
|
||||
source-tag: v6.4.0-beta4
|
||||
plugin: cmake
|
||||
build-packages:
|
||||
- clang
|
||||
|
Loading…
Reference in New Issue
Block a user