Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Qt to 6.7.0 on Linux #27689

Merged
merged 2 commits into from
Apr 2, 2024
Merged

Update Qt to 6.7.0 on Linux #27689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1791fa0
Update Qt to 6.7.0 on Linux
ilya-fedin Apr 2, 2024
721220c
Update patches on Linux
ilya-fedin Apr 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Telegram/build/docker/centos_env/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{%- set GIT = "https://github.com" -%}
{%- set GIT_FREEDESKTOP = GIT ~ "/gitlab-freedesktop-mirrors" -%}
{%- set QT = "6.7.0" -%}
{%- set QT_TAG = "v" ~ QT ~ "-rc2" -%}
{%- set QT_TAG = "v" ~ QT -%}
{%- set CMAKE_VER = "3.27.6" -%}
{%- set CMAKE_FILE = "cmake-" ~ CMAKE_VER ~ "-Linux-x86_64.sh" -%}
{%- set CFLAGS_DEBUG = "-g -pipe -fPIC -fstack-protector-all -fstack-clash-protection -fcf-protection -D_GLIBCXX_ASSERTIONS" -%}
Expand Down Expand Up @@ -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 7b8f30b787691a325d17e20ddd455e87738e7432 \
&& git fetch --depth=1 origin 174d6e51435e6eab0596904f9fba80a927ef4177 \
&& git reset --hard FETCH_HEAD \
&& rm -rf .git

Expand Down
4 changes: 2 additions & 2 deletions snap/snapcraft.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ parts:
patches:
source: https://github.com/desktop-app/patches.git
source-depth: 1
source-commit: 7b8f30b787691a325d17e20ddd455e87738e7432
source-commit: 174d6e51435e6eab0596904f9fba80a927ef4177
plugin: dump
override-pull: |
craftctl default
Expand Down Expand Up @@ -440,7 +440,7 @@ parts:
override-pull: |
QT=6.7.0

git clone -b v${QT}-rc2 --depth=1 https://github.com/qt/qt5.git .
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
Expand Down
Loading