From 067ed39503180097630d993d5715e26807200548 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sat, 30 Jul 2022 18:21:58 -0700 Subject: [PATCH] build-system: try to hack around Qt 5.15.3 in Jammy The Qt Company apparently didn't feel the need to have the correct tags in all of the module directories. So this now has to manually pick the correct SHA. What a pain. Signed-off-by: Dirk Hohndel --- scripts/build.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/scripts/build.sh b/scripts/build.sh index 809412d17..f78750215 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -294,7 +294,16 @@ if [ "$PLATFORM" = Linux ] && [[ $QT_VERSION == 5* ]] ; then rm -rf "$INSTALL_ROOT"/include/QtLocation > /dev/null 2>&1 rm -rf "$INSTALL_ROOT"/include/QtPositioning > /dev/null 2>&1 - git clone --branch "v$QT_VERSION" https://code.qt.io/qt/qtlocation.git --depth=1 $QTLOC_GIT + # thanks for nothing, Qt company... + # the forced open source releases apparently don't even deserve a tag in their repos + # so the correct SHA is extracted by looking at the qtlocation change introduced by + # the -lts-lgpl tag in https://code.qt.io/cgit/qt/qt5.git + if [ "$QT_VERSION" = "5.15.3" ] ; then + git clone https://code.qt.io/qt/qtlocation.git $QTLOC_GIT + git -C $QTLOC_GIT checkout 1bf01b84e30aab2b87a19184ce42160e6c92d8b + else + git clone --branch "v$QT_VERSION" https://code.qt.io/qt/qtlocation.git --depth=1 $QTLOC_GIT + fi mkdir -p "$QTLOC_PRIVATE" cd $QTLOC_GIT/src/location