void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-07-26 23:43:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update Qt 6.9.0 -> 6.9.1

Browse source
This commit is contained in:
Ilya Fedin 2025-06-03 14:59:02 +04:00 • committed by John Preston
parent 7246c3f304
commit 15c817dd15
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Telegram/build/docker/centos_env/Dockerfile
View file

@ -87,7 +87,7 @@ FROM builder AS patches
RUN git init patches \ RUN git init patches \
&& cd patches \ && cd patches \
&& git remote add origin https://github.com/desktop-app/patches.git \ && git remote add origin https://github.com/desktop-app/patches.git \
&& git fetch --depth=1 origin 65c6e9f8e88f37396e935dd6e6e494f512a96f99 \ && git fetch --depth=1 origin a405719f0963abf7cb93354a390617c0f0d90f17 \
&& git reset --hard FETCH_HEAD \ && git reset --hard FETCH_HEAD \
&& rm -rf .git && rm -rf .git
@ -726,7 +726,7 @@ COPY --link --from=wayland {{ LibrariesPath }}/wayland-cache /
COPY --link --from=openssl {{ LibrariesPath }}/openssl-cache / COPY --link --from=openssl {{ LibrariesPath }}/openssl-cache /
COPY --link --from=xkbcommon {{ LibrariesPath }}/xkbcommon-cache / COPY --link --from=xkbcommon {{ LibrariesPath }}/xkbcommon-cache /
ENV QT=6.9.0 ENV QT=6.9.1
RUN git clone -b v$QT --depth=1 https://github.com/qt/qt5.git \ RUN git clone -b v$QT --depth=1 https://github.com/qt/qt5.git \
&& cd qt5 \ && cd qt5 \
&& git submodule update --init --recursive --depth=1 qtbase qtdeclarative qtwayland qtimageformats qtsvg qtshadertools \ && git submodule update --init --recursive --depth=1 qtbase qtdeclarative qtwayland qtimageformats qtsvg qtshadertools \

2
Telegram/build/prepare/prepare.py
View file

@ -456,7 +456,7 @@ if customRunCommand:
stage('patches', """ stage('patches', """
git clone https://github.com/desktop-app/patches.git git clone https://github.com/desktop-app/patches.git
cd patches cd patches
git checkout 7119a74e3f git checkout a405719f0963abf7cb93354a390617c0f0d90f17
""") """)
stage('msys64', """ stage('msys64', """

2
Telegram/build/qt_version.py
View file

@ -6,7 +6,7 @@ def resolve(arch):
elif sys.platform == 'win32': elif sys.platform == 'win32':
if arch == 'arm' or 'qt6' in sys.argv: if arch == 'arm' or 'qt6' in sys.argv:
print('Choosing Qt 6.') print('Choosing Qt 6.')
os.environ['QT'] = '6.9.0' os.environ['QT'] = '6.9.1'
else: else:
print('Choosing Qt 5.') print('Choosing Qt 5.')
os.environ['QT'] = '5.15.15' os.environ['QT'] = '5.15.15'

4
snap/snapcraft.yaml
View file

@ -169,7 +169,7 @@ parts:
patches: patches:
source: https://github.com/desktop-app/patches.git source: https://github.com/desktop-app/patches.git
source-depth: 1 source-depth: 1
source-commit: 65c6e9f8e88f37396e935dd6e6e494f512a96f99 source-commit: a405719f0963abf7cb93354a390617c0f0d90f17
plugin: dump plugin: dump
override-pull: | override-pull: |
craftctl default craftctl default
@ -404,7 +404,7 @@ parts:
- mesa-vulkan-drivers - mesa-vulkan-drivers
- xkb-data - xkb-data
override-pull: | override-pull: |
QT=6.9.0 QT=6.9.1
git clone -b v${QT} --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 git submodule update --init --recursive --depth=1 qtbase qtdeclarative qtwayland qtimageformats qtsvg qtshadertools