mirror of
https://github.com/AyuGram/AyuGramDesktop.git
synced 2025-04-14 13:17:08 +02:00
Update Qt to 6.7.2 on Linux
This commit is contained in:
parent
4047f1733d
commit
b9677fe1db
2 changed files with 4 additions and 5 deletions
|
@ -1,6 +1,6 @@
|
|||
{%- set GIT = "https://github.com" -%}
|
||||
{%- set GIT_FREEDESKTOP = GIT ~ "/gitlab-freedesktop-mirrors" -%}
|
||||
{%- set QT = "6.7.1" -%}
|
||||
{%- set QT = "6.7.2" -%}
|
||||
{%- set QT_TAG = "v" ~ QT -%}
|
||||
{%- set CMAKE_VER = "3.27.6" -%}
|
||||
{%- set CMAKE_FILE = "cmake-" ~ CMAKE_VER ~ "-Linux-x86_64.sh" -%}
|
||||
|
@ -51,7 +51,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 8639205c2095a3f015449f8995fbfe16405218b8 \
|
||||
&& git fetch --depth=1 origin 20a7c5ffd8265fc6e45203ea2536f7b1965be19a \
|
||||
&& git reset --hard FETCH_HEAD \
|
||||
&& rm -rf .git
|
||||
|
||||
|
|
|
@ -165,7 +165,7 @@ parts:
|
|||
patches:
|
||||
source: https://github.com/desktop-app/patches.git
|
||||
source-depth: 1
|
||||
source-commit: 8639205c2095a3f015449f8995fbfe16405218b8
|
||||
source-commit: 20a7c5ffd8265fc6e45203ea2536f7b1965be19a
|
||||
plugin: dump
|
||||
override-pull: |
|
||||
craftctl default
|
||||
|
@ -360,7 +360,7 @@ parts:
|
|||
- mesa-vulkan-drivers
|
||||
- xkb-data
|
||||
override-pull: |
|
||||
QT=6.7.1
|
||||
QT=6.7.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
|
||||
|
@ -369,7 +369,6 @@ parts:
|
|||
find $CRAFT_STAGE/patches/qtbase_${QT} -type f -print0 | sort -z | xargs -r0 git apply
|
||||
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
|
||||
cd ..
|
||||
override-build: |
|
||||
./configure \
|
||||
|
|
Loading…
Add table
Reference in a new issue