diff options
| author |   Giancarlo Dessi <slack@giand.it> | 2024-12-04 12:11:47 +0700 |
|---|---|---|
| committer |   Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2024-12-04 13:04:25 +0700 |
| commit | f95cb5de1ce610d75d77c6e9b7a5116f5117b4cc (patch) | |
| tree | 980cf72f1854aa49303d02e5ed44e1c2ba96321b /gis | |
| parent | a50756c958bc47ddaedc858f130ed95051977f22 (diff) | |
| download | slackbuilds-f95cb5de1ce610d75d77c6e9b7a5116f5117b4cc.tar.gz slackbuilds-f95cb5de1ce610d75d77c6e9b7a5116f5117b4cc.tar.xz | |
gis/qgis: Updated for version 3.40.1.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'gis')
| -rw-r--r-- | gis/qgis/qgis.SlackBuild | 19 | ||||
| -rw-r--r-- | gis/qgis/qgis.info | 6 | ||||
| -rw-r--r-- | gis/qgis/qgis3d.pyi.patch | 13 |
3 files changed, 33 insertions, 5 deletions
diff --git a/gis/qgis/qgis.SlackBuild b/gis/qgis/qgis.SlackBuild index c7a277fe75..609eafa277 100644 --- a/gis/qgis/qgis.SlackBuild +++ b/gis/qgis/qgis.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=qgis -VERSION=${VERSION:-3.38.2} +VERSION=${VERSION:-3.40.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -68,6 +68,14 @@ fi set -e +# We have to disable WITH_QTWEBKIT in current +# because it is not more available +if [ -d "/usr/include/qt5/QtWebKit" ]; then + QTWEBKIT="" +else + QTWEBKIT="-DWITH_QTWEBKIT=OFF " +fi + rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP @@ -105,6 +113,12 @@ else WITHGRASS="" fi +# Patch to solve install failure in stable +if [ -x /usr/bin/python3.9 ]; then + patch -p1 < $CWD/qgis3d.pyi.patch +fi + + 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 @@ -128,7 +142,8 @@ cd build $OCL \ $WITHPDAL \ $WITHDRACO \ - $WITHGRASS + $WITHGRASS \ + $QTWEBKIT make make install DESTDIR=$PKG diff --git a/gis/qgis/qgis.info b/gis/qgis/qgis.info index a773924e42..afa71234b9 100644 --- a/gis/qgis/qgis.info +++ b/gis/qgis/qgis.info @@ -1,8 +1,8 @@ PRGNAM="qgis" -VERSION="3.38.2" +VERSION="3.40.1" HOMEPAGE="https://qgis.org/" -DOWNLOAD="https://qgis.org/downloads/qgis-3.38.2.tar.bz2" -MD5SUM="d7efcbf60e29e9143fe6c889b98f8c5e" +DOWNLOAD="https://qgis.org/downloads/qgis-3.40.1.tar.bz2" +MD5SUM="e76f8fff808e83c629316286516d03c9" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libspatialite libspatialindex OWSLib postgis protobuf3 python3-numpy python3-psycopg2 qwt termcolor" diff --git a/gis/qgis/qgis3d.pyi.patch b/gis/qgis/qgis3d.pyi.patch new file mode 100644 index 0000000000..8c1c7bef51 --- /dev/null +++ b/gis/qgis/qgis3d.pyi.patch @@ -0,0 +1,13 @@ +--- ./python/CMakeLists.txt 2024-11-22 13:07:29.000000000 +0100 ++++ ./python/CMakeLists-fix.txt 2024-12-03 19:43:25.208140208 +0100 +@@ -258,8 +258,8 @@ + if(SIP_BUILD_EXECUTABLE) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/3d/build/_3d_p/_3d_p.pyi DESTINATION ${QGIS_PYTHON_DIR}) + elseif((${SIP_VERSION_STR} VERSION_EQUAL 4.18) OR (${SIP_VERSION_STR} VERSION_GREATER 4.18)) +- set(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -y ${QGIS_PYTHON_OUTPUT_DIRECTORY}/3d_p.pyi) +- install(FILES ${QGIS_PYTHON_OUTPUT_DIRECTORY}/_3d_p.pyi DESTINATION ${QGIS_PYTHON_DIR}) ++ set(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -y ${QGIS_PYTHON_OUTPUT_DIRECTORY}/_qgis3d.pyi) ++ install(FILES ${QGIS_PYTHON_OUTPUT_DIRECTORY}/_qgis3d.pyi DESTINATION ${QGIS_PYTHON_DIR}) + endif() + + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/3d/project.py.in ${CMAKE_CURRENT_BINARY_DIR}/3d/project.py @ONLY) |