Update Qt to 6.6.2 on Linux

This commit is contained in:
Ilya Fedin 2024-02-15 07:22:58 +04:00 committed by John Preston
parent f1b7d9ebba
commit e31704d01e
2 changed files with 4 additions and 3 deletions

View file

@ -1,6 +1,6 @@
{%- set GIT = "https://github.com" -%}
{%- set GIT_FREEDESKTOP = GIT ~ "/gitlab-freedesktop-mirrors" -%}
{%- set QT = "6.6.1" -%}
{%- set QT = "6.6.2" -%}
{%- set QT_TAG = "v" ~ QT -%}
{%- set QT_PREFIX = "/usr/local/desktop-app/Qt-" ~ QT -%}
{%- set OPENSSL_VER = "1_1_1" -%}
@ -54,7 +54,7 @@ FROM builder AS patches
RUN git init patches \
&& cd patches \
&& git remote add origin {{ GIT }}/desktop-app/patches.git \
&& git fetch --depth=1 origin 7f880df36a926fa2eeb4ef473261f2ca09d3c135 \
&& git fetch --depth=1 origin 0edd8a93409ca24e215fc8ba1e98814893ad05cf \
&& git reset --hard FETCH_HEAD \
&& rm -rf .git

View file

@ -168,6 +168,7 @@ parts:
patches:
source: https://github.com/desktop-app/patches.git
source-depth: 1
source-commit: 0edd8a93409ca24e215fc8ba1e98814893ad05cf
plugin: dump
override-pull: |
craftctl default
@ -493,7 +494,7 @@ parts:
- zlib1g
- mesa-vulkan-drivers
override-pull: |
QT=6.6.1
QT=6.6.2
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