Migrate macOS build to Qt 6.2.4.

This commit is contained in:
John Preston 2022-03-28 17:39:00 +04:00
parent 77dae3a7b6
commit 3e1cac94bf

View file

@ -400,7 +400,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 0947a28160 git checkout 43c34f586a
""") """)
stage('depot_tools', """ stage('depot_tools', """
@ -1204,28 +1204,22 @@ mac:
""") """)
if buildQt6: if buildQt6:
stage('qt_6_2_3', """ stage('qt_6_2_4', """
mac: mac:
git clone -b v6.2.3 https://code.qt.io/qt/qt5.git qt_6_2_3 git clone -b v6.2.4 https://code.qt.io/qt/qt5.git qt_6_2_4
cd qt_6_2_3 cd qt_6_2_4
perl init-repository --module-subset=qtbase,qtimageformats,qtsvg,qt5compat perl init-repository --module-subset=qtbase,qtimageformats,qtsvg,qt5compat
depends:patches/qtbase_6_2_3/*.patch depends:patches/qtbase_6_2_4/*.patch
cd qtbase cd qtbase
find ../../patches/qtbase_6_2_3 -type f -print0 | sort -z | xargs -0 git apply find ../../patches/qtbase_6_2_4 -type f -print0 | sort -z | xargs -0 git apply
cd ..
depends:patches/qt5compat_6_2_3/*.patch
cd qt5compat
find ../../patches/qt5compat_6_2_3 -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.3" \ ./configure -prefix "$USED_PREFIX/Qt-6.2.4" \
$CONFIGURATIONS \ $CONFIGURATIONS \
-force-debug-info \ -force-debug-info \
-opensource \ -opensource \