From 5d708c0d92ca0a1161f7f98edd369a60ca6a2b14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Salvador=20Cu=C3=B1at?= Date: Sat, 15 Apr 2023 18:40:19 +0200 Subject: [PATCH] Build script: Qt has tagged versions currently MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It looks like Qt company has LGPLed versions tagged wich simplifies things a bit while building, e.g. 5.15.3 current workaround matches "v5.15.3-lts-lgpl" tag. Background: Debian Sid is currently at Qt 5.15.8 which is impossible to build from scratch with current script as only a few git versions are tagged in the script format "v5.15.8". Signed-off-by: Salvador Cuñat --- scripts/build.sh | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/scripts/build.sh b/scripts/build.sh index 3e8198529..df26ca3da 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -293,16 +293,8 @@ 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 - # 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 + git clone --branch "v$QT_VERSION" https://code.qt.io/qt/qtlocation.git --depth=1 $QTLOC_GIT || + git clone --branch "v$QT_VERSION-lts-lgpl" https://code.qt.io/qt/qtlocation.git --depth=1 $QTLOC_GIT mkdir -p "$QTLOC_PRIVATE" cd $QTLOC_GIT/src/location