mirror of
https://github.com/AyuGram/AyuGramDesktop.git
synced 2025-04-17 22:57:11 +02:00
Update Qt to 6.6.1 on Linux
This commit is contained in:
parent
467a6c25a8
commit
e8c9cb7d2a
2 changed files with 3 additions and 6 deletions
|
@ -1,6 +1,6 @@
|
|||
{%- set GIT = "https://github.com" -%}
|
||||
{%- set GIT_FREEDESKTOP = GIT ~ "/gitlab-freedesktop-mirrors" -%}
|
||||
{%- set QT = "6.6.0" -%}
|
||||
{%- set QT = "6.6.1" -%}
|
||||
{%- 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 90a7f1b55da69c99699e6b6776268184c20387f8 \
|
||||
&& git fetch --depth=1 origin 92ef11b7e32a835408b484f844b88ed6a9309f89 \
|
||||
&& git reset --hard FETCH_HEAD \
|
||||
&& rm -rf .git
|
||||
|
||||
|
|
|
@ -478,16 +478,13 @@ parts:
|
|||
- libxkbcommon-x11-0
|
||||
- zlib1g
|
||||
override-pull: |
|
||||
QT=6.6.0
|
||||
QT=6.6.1
|
||||
|
||||
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
|
||||
|
||||
cd qtbase
|
||||
find $CRAFT_STAGE/patches/qtbase_${QT} -type f -print0 | sort -z | xargs -r0 git apply
|
||||
cd ../qtsvg
|
||||
git fetch origin v6.5.3
|
||||
git checkout FETCH_HEAD
|
||||
cd ../qtwayland
|
||||
find $CRAFT_STAGE/patches/qtwayland_${QT} -type f -print0 | sort -z | xargs -r0 git apply
|
||||
sed -i 's/qMin(version, 8)/qMin(version, 7)/' src/client/qwaylandinputdevice.cpp
|
||||
|
|
Loading…
Add table
Reference in a new issue