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

Move macOS and Linux builds to Qt 6.2.2.

Browse source
This commit is contained in:
John Preston 2021-12-21 15:46:27 +00:00
parent aee11469c4
commit 999e4264c5
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -401,7 +401,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 4c21dfa0db git checkout 5368789dc7
""") """)
stage('depot_tools', """ stage('depot_tools', """
@ -1124,28 +1124,28 @@ mac:
""") """)
if buildQt6: if buildQt6:
stage('qt_6_2_0', """ stage('qt_6_2_2', """
mac: mac:
git clone -b v6.2.0 git://code.qt.io/qt/qt5.git qt_6_2_0 git clone -b v6.2.2 git://code.qt.io/qt/qt5.git qt_6_2_2
cd qt_6_2_0 cd qt_6_2_2
perl init-repository --module-subset=qtbase,qtimageformats,qtsvg,qt5compat perl init-repository --module-subset=qtbase,qtimageformats,qtsvg,qt5compat
depends:patches/qtbase_6_2_0/*.patch depends:patches/qtbase_6_2_2/*.patch
cd qtbase cd qtbase
find ../../patches/qtbase_6_2_0 -type f -print0 | sort -z | xargs -0 git apply find ../../patches/qtbase_6_2_2 -type f -print0 | sort -z | xargs -0 git apply
cd .. cd ..
depends:patches/qt5compat_6_2_0/*.patch depends:patches/qt5compat_6_2_2/*.patch
cd qt5compat cd qt5compat
find ../../patches/qt5compat_6_2_0 -type f -print0 | sort -z | xargs -0 git apply find ../../patches/qt5compat_6_2_2 -type f -print0 | sort -z | xargs -0 git apply
cd .. cd ..
CONFIGURATIONS=-debug CONFIGURATIONS=-debug
release: release:
CONFIGURATIONS=-debug-and-release CONFIGURATIONS=-debug-and-release
mac: mac:
./configure -prefix "$USED_PREFIX/Qt-6.2.0" \ ./configure -prefix "$USED_PREFIX/Qt-6.2.2" \
$CONFIGURATIONS \ $CONFIGURATIONS \
-force-debug-info \ -force-debug-info \
-opensource \ -opensource \

4
snap/snapcraft.yaml
View file

@ -377,9 +377,9 @@ parts:
- libxkbcommon-x11-0 - libxkbcommon-x11-0
- zlib1g - zlib1g
override-pull: | override-pull: |
QT=6_2_0 QT=6_2_2
git clone -b v6.2.0 --depth=1 git://code.qt.io/qt/qt5.git . git clone -b v6.2.2 --depth=1 git://code.qt.io/qt/qt5.git .
perl init-repository --module-subset=qtbase,qtwayland,qtimageformats,qtsvg,qt5compat perl init-repository --module-subset=qtbase,qtwayland,qtimageformats,qtsvg,qt5compat
cd qtbase cd qtbase