Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gis/qgis: Updated for version 3.40.1. #8997

Closed
wants to merge 1 commit into from
Closed

gis/qgis: Updated for version 3.40.1. #8997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions gis/qgis/qgis.SlackBuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -128,7 +142,8 @@ cd build
$OCL \
$WITHPDAL \
$WITHDRACO \
$WITHGRASS
$WITHGRASS \
$QTWEBKIT

make
make install DESTDIR=$PKG
Expand Down
6 changes: 3 additions & 3 deletions gis/qgis/qgis.info
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
13 changes: 13 additions & 0 deletions gis/qgis/qgis3d.pyi.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)