diff options
| author | Matteo Bernardini <ponce@slackbuilds.org> | 2021-04-10 15:59:05 +0200 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2021-04-17 23:56:15 -0500 |
| commit | a8cae9024aade4b17c5107d174337925e11c9a13 (patch) | |
| tree | 4ff050b0882013b82c30b796f7bbb3b4344727bb /gis | |
| parent | 25c72e4ef12cae2818e1f6c3505b93207abdbbb3 (diff) | |
gis/qgis: Patch a cmake bug and point at current's sip3.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'gis')
| -rw-r--r-- | gis/qgis/qgis.SlackBuild | 9 | ||||
| -rw-r--r-- | gis/qgis/qgis.info | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/gis/qgis/qgis.SlackBuild b/gis/qgis/qgis.SlackBuild index ec241ab7712b1..22be7b5a43ad0 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 sed -i '43 i IF (NOT PROJ_INCLUDE_DIR)\nFIND_PATH(PROJ_INCLUDE_DIR proj.h\n"$ENV{INCLUDE}"\n"$ENV{LIB_DIR}/include"\n)\nENDIF (NOT PROJ_INCLUDE_DIR)\n' cmake/FindProj.cmake mkdir -p build @@ -93,13 +93,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 || make -j1 make install DESTDIR=$PKG cd - diff --git a/gis/qgis/qgis.info b/gis/qgis/qgis.info index 9c787e8ca7daf..05f40a3049f11 100644 --- a/gis/qgis/qgis.info +++ b/gis/qgis/qgis.info @@ -5,6 +5,6 @@ DOWNLOAD="https://qgis.org/downloads/qgis-3.18.1.tar.bz2" MD5SUM="9d71667d40aa0caf64e2ff0d6e60c5e2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="cmake-202x postgis libspatialite libspatialindex numpy3 qt5-webkit qwt-qt5 QScintilla-qt5 qtkeychain qca-qt5 protobuf3 python3-PyYAML python-requests Pygments OWSLib psycopg2 Jinja2 zstd" +REQUIRES="cmake-202x postgis libspatialite libspatialindex numpy3 qt5-webkit qwt QScintilla-qt5 qtkeychain qca-qt5 protobuf3 python3-PyYAML python-requests Pygments OWSLib psycopg2 Jinja2 zstd" MAINTAINER="Benjamin Trigona-Harany" EMAIL="slackbuilds@jaxartes.net" |