From c92ee29b17ad2239ce11ddd76134b199ef5a3ed2 Mon Sep 17 00:00:00 2001 From: Matteo Bernardini Date: Sat, 30 Jan 2021 16:23:40 +0100 Subject: 20210130.1 global branch merge. Signed-off-by: Matteo Bernardini --- gis/qgis/qgis.SlackBuild | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'gis/qgis/qgis.SlackBuild') diff --git a/gis/qgis/qgis.SlackBuild b/gis/qgis/qgis.SlackBuild index 066c0cf2bf..59a21c2b60 100644 --- a/gis/qgis/qgis.SlackBuild +++ b/gis/qgis/qgis.SlackBuild @@ -76,7 +76,7 @@ else WITHGRASS="" fi -sed -i 's|${SIP_BINARY_PATH}|/usr/bin/python3-sip|' cmake/SIPMacros.cmake +sed -i 's|${SIP_BINARY_PATH}|/usr/bin/sip3|' cmake/SIPMacros.cmake mkdir -p build cd build @@ -92,13 +92,18 @@ cd build -DWITH_QWTPOLAR=TRUE \ -DWITH_CUSTOM_WIDGETS=FALSE \ -DBINDINGS_GLOBAL_INSTALL=TRUE \ - -DQWT_INCLUDE_DIR=/usr/include/qt5/qwt \ + -DQWT_INCLUDE_DIR=/usr/include/qwt \ -DQSCINTILLA_INCLUDE_DIR=/usr/include/qt5 \ -DENABLE_TESTS=FALSE \ -DWITH_3D=TRUE \ -Wno-dev \ $WITHGRASS + # Workaround a cmake bug (?) + sed -i "s/\\$\\$\\$\\$/\$\$/" \ + src/core/CMakeFiles/qgis_core.dir/build.make \ + src/core/CMakeFiles/qgis_core_autogen.dir/build.make || exit 1 + make install DESTDIR=$PKG cd - -- cgit v1.2.3