mirror of
https://git.freebsd.org/ports.git
synced 2025-05-30 18:06:27 -04:00
graphics/qgis-ltr: Update to 3.34.4
Major update of the long-term-release Changelog: https://github.com/qgis/QGIS/compare/final-3_34_3%5E...final-3_34_4 Reported by: portscout, Repology
This commit is contained in:
Rainer Hurling
parent
29c816e912
commit
0b0ca63d45
7 changed files with 619 additions and 602 deletions
|
|
@ -1,6 +1,5 @@
|
|||
PORTNAME= qgis
|
||||
DISTVERSION= 3.28.15
|
||||
PORTREVISION= 2
|
||||
DISTVERSION= 3.34.4
|
||||
CATEGORIES= graphics geography
|
||||
MASTER_SITES= https://qgis.org/downloads/
|
||||
PKGNAMESUFFIX= -ltr
|
||||
|
|
@ -34,13 +33,17 @@ BUILD_DEPENDS= gpsbabel>=1.7.0:astro/gpsbabel \
|
|||
${PYTHON_PKGNAMEPREFIX}six>=1.16.0:devel/py-six@${PY_FLAVOR} \
|
||||
${PYTHON_PKGNAMEPREFIX}sqlite3>=3.7.16:databases/py-sqlite3@${PY_FLAVOR} \
|
||||
${PYTHON_PKGNAMEPREFIX}yaml>=5.4.1:devel/py-yaml@${PY_FLAVOR}
|
||||
LIB_DEPENDS= libexiv2.so:graphics/exiv2 \
|
||||
LIB_DEPENDS= libabsl_log_internal_check_op.so:devel/abseil \
|
||||
libdraco.so:archivers/draco \
|
||||
libexiv2.so:graphics/exiv2 \
|
||||
libexpat.so:textproc/expat2 \
|
||||
libfreexl.so:textproc/freexl \
|
||||
libgdal.so:graphics/gdal \
|
||||
libgeos.so:graphics/geos \
|
||||
libgsl.so:math/gsl \
|
||||
libhdf5.so:science/hdf5 \
|
||||
libmdal.so:math/mdal \
|
||||
libminizip.so:archivers/minizip \
|
||||
libnetcdf.so:science/netcdf \
|
||||
libOpenCL.so:devel/ocl-icd \
|
||||
libpdalcpp.so:math/pdal \
|
||||
|
|
@ -50,6 +53,7 @@ LIB_DEPENDS= libexiv2.so:graphics/exiv2 \
|
|||
libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
|
||||
libqt5keychain.so:security/qtkeychain@qt5 \
|
||||
libqwt.so:x11-toolkits/qwt6@qt5 \
|
||||
librttopo.so:devel/librttopo \
|
||||
libspatialindex.so:devel/spatialindex \
|
||||
libspatialite.so:databases/spatialite \
|
||||
libsz.so:science/libaec \
|
||||
|
|
@ -69,6 +73,7 @@ RUN_DEPENDS= astyle:devel/astyle \
|
|||
${PYTHON_PKGNAMEPREFIX}httplib2>=0.20.2:www/py-httplib2@${PY_FLAVOR} \
|
||||
${PYTHON_PKGNAMEPREFIX}jedi>=0.18.1:devel/py-jedi@${PY_FLAVOR} \
|
||||
${PYTHON_PKGNAMEPREFIX}Jinja2>=3.1.2:devel/py-Jinja2@${PY_FLAVOR} \
|
||||
${PYTHON_PKGNAMEPREFIX}laspy>=2.5.1:misc/py-laspy@${PY_FLAVOR} \
|
||||
${PYTHON_PKGNAMEPREFIX}markupsafe>=2.1.1:textproc/py-markupsafe@${PY_FLAVOR} \
|
||||
${PYTHON_PKGNAMEPREFIX}matplotlib>=3.4.3:math/py-matplotlib@${PY_FLAVOR} \
|
||||
${PYTHON_PKGNAMEPREFIX}mock>=4.0.3:devel/py-mock@${PY_FLAVOR} \
|
||||
|
|
@ -103,7 +108,7 @@ RUN_DEPENDS= astyle:devel/astyle \
|
|||
|
||||
### Fortran is needed by numpy, GRASS, etc.
|
||||
USES= bison cmake compiler:features desktop-file-utils \
|
||||
fortran gl gmake gnome pgsql pyqt:5 python qca qt:5 \
|
||||
fortran gl gmake gnome iconv pgsql pyqt:5 python qca qt:5 \
|
||||
shebangfix sqlite:3 tar:bz2
|
||||
USE_GL= gl
|
||||
USE_GNOME= libxml2
|
||||
|
|
@ -111,8 +116,8 @@ USE_LDCONFIG= yes
|
|||
USE_PYQT= pyqt5 qscintilla2 pysip sip
|
||||
USE_QT= 3d buildtools:build core concurrent dbus declarative \
|
||||
designer:build qdoc:build gamepad gui linguist:build location \
|
||||
network printsupport qmake:build script serialport \
|
||||
sql sql-pgsql sql-sqlite3 svg uitools:build \
|
||||
multimedia network printsupport qmake:build script serialport \
|
||||
sql sql-pgsql sql-sqlite3 svg testlib uitools:build \
|
||||
webengine widgets xml
|
||||
|
||||
SHEBANG_FILES= src/plugins/grass/scripts/*.py
|
||||
|
|
@ -120,7 +125,6 @@ SHEBANG_FILES= src/plugins/grass/scripts/*.py
|
|||
# Python_EXECUTABLE: Use the default version if multiple Pythons are available
|
||||
CMAKE_ARGS+= -DCMAKE_BUILD_TYPE:STRING=Release \
|
||||
-DHAVE_PGCONFIG=1 \
|
||||
-DWITH_INTERNAL_MDAL:BOOL=false \
|
||||
-DPYRCC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyrcc5-${PYTHON_VER} \
|
||||
-DPYUIC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyuic5-${PYTHON_VER} \
|
||||
-DPython_EXECUTABLE=${PYTHON_CMD} \
|
||||
|
|
@ -128,15 +132,17 @@ CMAKE_ARGS+= -DCMAKE_BUILD_TYPE:STRING=Release \
|
|||
-DQWT_INCLUDE_DIR:PATH=${LOCALBASE}/include/qt5/qwt6 \
|
||||
-DQWT_LIBRARY:FILEPATH=${LOCALBASE}/lib/qt5/libqwt.so \
|
||||
-DQGIS_MANUAL_SUBDIR:PATH=share/man
|
||||
CMAKE_ON= USE_OPENCL WITH_3D WITH_ASTYLE WITH_BINDINGS WITH_COPC \
|
||||
WITH_CUSTOM_WIDGETS WITH_EPT WITH_PDAL WITH_POSTGRESQL
|
||||
CMAKE_OFF= ENABLE_TESTS WITH_QTWEBKIT WITH_QWTPOLAR
|
||||
CMAKE_ON= USE_OPENCL WITH_ASTYLE WITH_BINDINGS WITH_COPC \
|
||||
WITH_CUSTOM_WIDGETS WITH_DRACO WITH_EPT \
|
||||
WITH_INTERNAL_LAZPERF WITH_POSTGRESQL
|
||||
CMAKE_OFF= ENABLE_TESTS WITH_INTERNAL_MDAL WITH_QTWEBKIT WITH_QWTPOLAR
|
||||
|
||||
# math/pdal fails in pdal_wrench() with "undefined reference to symbol 'pthread_create@@FBSD_1.0'"
|
||||
CXXFLAGS+= -pthread
|
||||
#CXXFLAGS+= -pthread
|
||||
|
||||
CONFLICTS_INSTALL= qgis
|
||||
|
||||
PLIST_SUB= DISTVERSION=${DISTVERSION}
|
||||
PLIST_SUB= DISTVERSION=${PORTVERSION}
|
||||
|
||||
.if !defined(MAINTAINER_MODE)
|
||||
CMAKE_ARGS+= -Wno-dev
|
||||
|
|
@ -147,7 +153,7 @@ OPTIONS_DEFINE= SERVER
|
|||
OPTIONS_DEFAULT= SERVER GRASS8
|
||||
OPTIONS_RADIO= GRASS
|
||||
OPTIONS_RADIO_GRASS= GRASS7 GRASS8
|
||||
#NO_OPTIONS_SORT= yes
|
||||
NO_OPTIONS_SORT= yes
|
||||
OPTIONS_SUB= yes
|
||||
|
||||
GRASS_DESC= Add GRASS GIS to processing tools
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1705744584
|
||||
SHA256 (qgis-3.28.15.tar.bz2) = 217342ba2232cc8fe5bf8f3671c2b3d6daf5504c33006b67424373e70d568dfa
|
||||
SIZE (qgis-3.28.15.tar.bz2) = 159738057
|
||||
TIMESTAMP = 1708717911
|
||||
SHA256 (qgis-3.34.4.tar.bz2) = 7d1c5fafff13f508a9bcf6244c9666f891351deb1ace2aedcc63504f070c5ce4
|
||||
SIZE (qgis-3.34.4.tar.bz2) = 170134098
|
||||
|
|
|
|||
|
|
@ -1,33 +1,17 @@
|
|||
--- cmake/FindGRASS.cmake.orig 2023-12-22 12:04:30 UTC
|
||||
--- cmake/FindGRASS.cmake.orig 2023-10-29 01:48:21 UTC
|
||||
+++ cmake/FindGRASS.cmake
|
||||
@@ -158,19 +158,17 @@ IF (UNIX)
|
||||
ENDIF (WIN32)
|
||||
@@ -159,11 +159,9 @@ IF (UNIX)
|
||||
|
||||
IF (UNIX)
|
||||
- IF (GRASS_FIND_VERSION EQUAL 7)
|
||||
- IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
|
||||
- FOREACH (VERSION_MINOR 9 8 7 6 5 4 3 2 1 0)
|
||||
- LIST (APPEND GRASS_PATHS /usr/local/grass${GRASS_FIND_VERSION}${VERSION_MINOR})
|
||||
- ENDFOREACH(VERSION_MINOR)
|
||||
- ELSE (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
|
||||
- FOREACH (PATH /usr/lib64 /usr/lib)
|
||||
- FOREACH (VERSION grass76, grass74, grass72, grass70)
|
||||
- LIST(APPEND GRASS_PATHS "${PATH}/${VERSION}")
|
||||
- ENDFOREACH (VERSION)
|
||||
- ENDFOREACH (PATH)
|
||||
- ENDIF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
|
||||
- ENDIF (GRASS_FIND_VERSION EQUAL 7)
|
||||
+ IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
|
||||
+ FOREACH (VERSION_MINOR 9 8 7 6 5 4 3 2 1 0)
|
||||
+ LIST (APPEND GRASS_PATHS %%LOCALBASE%%/grass${GRASS_FIND_VERSION}${VERSION_MINOR})
|
||||
+ ENDFOREACH(VERSION_MINOR)
|
||||
+ ELSE (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
|
||||
+ FOREACH (VERSION_MINOR 9 8 7 6 5 4 3 2 1 0)
|
||||
+ FOREACH (PATH /usr/lib64 /usr/lib)
|
||||
+ LIST(APPEND GRASS_PATHS "${PATH}/grass${GRASS_FIND_VERSION}${VERSION_MINOR}")
|
||||
+ ENDFOREACH (PATH)
|
||||
+ ENDFOREACH (VERSION_MINOR)
|
||||
+ ENDIF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
|
||||
ENDIF (UNIX)
|
||||
|
||||
IF (APPLE)
|
||||
IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
|
||||
- IF (GRASS_FIND_VERSION EQUAL 7)
|
||||
- FOREACH (VERSION_MINOR 9 8 7 6 5 4 3 2 1 0)
|
||||
- LIST (APPEND GRASS_PATHS /usr/local/grass${GRASS_FIND_VERSION}${VERSION_MINOR})
|
||||
- ENDFOREACH(VERSION_MINOR)
|
||||
- ENDIF (GRASS_FIND_VERSION EQUAL 7)
|
||||
+ FOREACH (VERSION_MINOR 9 8 7 6 5 4 3 2 1 0)
|
||||
+ LIST (APPEND GRASS_PATHS %%LOCALBASE%%/grass${GRASS_FIND_VERSION}${VERSION_MINOR})
|
||||
+ ENDFOREACH(VERSION_MINOR)
|
||||
ELSE (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
|
||||
FOREACH (VERSION_MINOR 9 8 7 6 5 4 3 2 1 0)
|
||||
FOREACH (PATH /usr/lib64 /usr/lib)
|
||||
|
|
|
|||
|
|
@ -1,83 +0,0 @@
|
|||
--- cmake/FindPDAL.cmake.orig 2024-02-22 21:12:12 UTC
|
||||
+++ cmake/FindPDAL.cmake
|
||||
@@ -7,8 +7,7 @@
|
||||
# CMake module to search for PDAL library
|
||||
#
|
||||
# If it's found it sets PDAL_FOUND to TRUE
|
||||
-# and following variables are set:
|
||||
-# PDAL_INCLUDE_DIR
|
||||
+# and adds the following variable containing library target(s):
|
||||
# PDAL_LIBRARIES
|
||||
|
||||
# FIND_PATH and FIND_LIBRARY normally search standard locations
|
||||
@@ -18,6 +17,28 @@
|
||||
# locations. When an earlier FIND_* succeeds, subsequent FIND_*s
|
||||
# searching for the same item do nothing.
|
||||
|
||||
+find_package(PDAL CONFIG)
|
||||
+
|
||||
+if(PDAL_FOUND)
|
||||
+ if(NOT PDAL_FIND_QUIETLY)
|
||||
+ message(STATUS "Found PDAL: ${PDAL_LIBRARIES} (${PDAL_VERSION})")
|
||||
+ endif()
|
||||
+
|
||||
+ if(PDAL_VERSION VERSION_LESS "1.7.0")
|
||||
+ message(FATAL_ERROR "PDAL version is too old (${PDAL_VERSION}). Use 1.7 or higher.")
|
||||
+ endif()
|
||||
+
|
||||
+ if(MSVC)
|
||||
+ foreach(PDAL_TARG ${PDAL_LIBRARIES})
|
||||
+ target_compile_definitions(${PDAL_TARG} INTERFACE WIN32_LEAN_AND_MEAN)
|
||||
+ endforeach()
|
||||
+ endif()
|
||||
+
|
||||
+ return()
|
||||
+endif()
|
||||
+
|
||||
+# Fallback for systems where PDAL's config-file package is not present.
|
||||
+# It is not adapted for PDAL 2.6+ (where pdal_util library is removed).
|
||||
FIND_PATH(PDAL_INCLUDE_DIR pdal/pdal.hpp
|
||||
"$ENV{LIB_DIR}/include"
|
||||
"/usr/include"
|
||||
@@ -50,7 +71,7 @@ IF (PDAL_INCLUDE_DIR AND PDAL_CPP_LIBRARY AND PDAL_UTI
|
||||
|
||||
IF (PDAL_INCLUDE_DIR AND PDAL_CPP_LIBRARY AND PDAL_UTIL_LIBRARY AND PDAL_BIN)
|
||||
SET(PDAL_FOUND TRUE)
|
||||
- SET(PDAL_LIBRARIES ${PDAL_CPP_LIBRARY} ${PDAL_UTIL_LIBRARY})
|
||||
+ SET(PDAL_LIBRARIES pdalcpp pdal_util)
|
||||
ENDIF (PDAL_INCLUDE_DIR AND PDAL_CPP_LIBRARY AND PDAL_UTIL_LIBRARY AND PDAL_BIN)
|
||||
|
||||
IF (PDAL_FOUND)
|
||||
@@ -60,8 +81,8 @@ IF (PDAL_FOUND)
|
||||
OUTPUT_VARIABLE PDAL_VERSION_OUT )
|
||||
STRING(REGEX REPLACE "^.*([0-9]+)\\.([0-9]+)\\.([0-9]+).*$" "\\1" PDAL_VERSION_MAJOR "${PDAL_VERSION_OUT}")
|
||||
STRING(REGEX REPLACE "^.*([0-9]+)\\.([0-9]+)\\.([0-9]+).*$" "\\2" PDAL_VERSION_MINOR "${PDAL_VERSION_OUT}")
|
||||
- STRING(REGEX REPLACE "^.*([0-9]+)\\.([0-9]+)\\.([0-9]+).*$" "\\3" PDAL_VERSION_MICRO "${PDAL_VERSION_OUT}")
|
||||
- STRING(CONCAT PDAL_VERSION ${PDAL_VERSION_MAJOR} "." ${PDAL_VERSION_MINOR} "." ${PDAL_VERSION_MICRO})
|
||||
+ STRING(REGEX REPLACE "^.*([0-9]+)\\.([0-9]+)\\.([0-9]+).*$" "\\3" PDAL_VERSION_PATCH "${PDAL_VERSION_OUT}")
|
||||
+ STRING(CONCAT PDAL_VERSION ${PDAL_VERSION_MAJOR} "." ${PDAL_VERSION_MINOR} "." ${PDAL_VERSION_PATCH})
|
||||
|
||||
IF (NOT PDAL_FIND_QUIETLY)
|
||||
MESSAGE(STATUS "Found PDAL: ${PDAL_LIBRARIES} (${PDAL_VERSION})")
|
||||
@@ -70,6 +91,21 @@ IF (PDAL_FOUND)
|
||||
IF ((PDAL_VERSION_MAJOR EQUAL 1) AND (PDAL_VERSION_MINOR LESS 7))
|
||||
MESSAGE (FATAL_ERROR "PDAL version is too old (${PDAL_VERSION}). Use 1.7 or higher.")
|
||||
ENDIF()
|
||||
+
|
||||
+ add_library(pdalcpp UNKNOWN IMPORTED)
|
||||
+ target_link_libraries(pdalcpp INTERFACE ${PDAL_CPP_LIBRARY})
|
||||
+ target_include_directories(pdalcpp INTERFACE ${PDAL_INCLUDE_DIR})
|
||||
+ set_target_properties(pdalcpp PROPERTIES IMPORTED_LOCATION ${PDAL_CPP_LIBRARY})
|
||||
+
|
||||
+ add_library(pdal_util UNKNOWN IMPORTED)
|
||||
+ target_link_libraries(pdal_util INTERFACE ${PDAL_UTIL_LIBRARY})
|
||||
+ target_include_directories(pdal_util INTERFACE ${PDAL_INCLUDE_DIR})
|
||||
+ set_target_properties(pdal_util PROPERTIES IMPORTED_LOCATION ${PDAL_UTIL_LIBRARY})
|
||||
+
|
||||
+ if(MSVC)
|
||||
+ target_compile_definitions(pdalcpp INTERFACE WIN32_LEAN_AND_MEAN)
|
||||
+ target_compile_definitions(pdal_util INTERFACE WIN32_LEAN_AND_MEAN)
|
||||
+ endif()
|
||||
|
||||
ELSE (PDAL_FOUND)
|
||||
IF (PDAL_FIND_REQUIRED)
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
--- python/plugins/sagaprovider/SagaAlgorithmProvider.py.orig 2021-06-21 15:09:09 UTC
|
||||
+++ python/plugins/sagaprovider/SagaAlgorithmProvider.py
|
||||
@@ -78,13 +78,13 @@ class SagaAlgorithmProvider(QgsProcessingProvider):
|
||||
version is not None
|
||||
and (
|
||||
version.startswith(REQUIRED_VERSION)
|
||||
- or version.startswith(BETA_SUPPORT_VERSION)
|
||||
+ or version >= BETA_SUPPORT_VERSION
|
||||
)
|
||||
)
|
||||
|
||||
def warningMessage(self):
|
||||
version = SagaUtils.getInstalledVersion(True)
|
||||
- if version is not None and version.startswith(BETA_SUPPORT_VERSION):
|
||||
+ if version is not None and version >= BETA_SUPPORT_VERSION:
|
||||
return self.tr('SAGA version {} is not officially supported - algorithms may encounter issues').format(version)
|
||||
return ''
|
||||
|
||||
@@ -95,7 +95,7 @@ class SagaAlgorithmProvider(QgsProcessingProvider):
|
||||
self.tr('Processing'), Qgis.Critical)
|
||||
return
|
||||
|
||||
- if not version.startswith(REQUIRED_VERSION) and not version.startswith(BETA_SUPPORT_VERSION):
|
||||
+ if not version.startswith(REQUIRED_VERSION) and not version >= BETA_SUPPORT_VERSION:
|
||||
QgsMessageLog.logMessage(self.tr('Problem with SAGA installation: unsupported SAGA version (found: {}, required: {}).').format(version, REQUIRED_VERSION),
|
||||
self.tr('Processing'),
|
||||
Qgis.Critical)
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
--- src/core/raster/qgsexiftools.cpp.orig 2023-05-26 12:01:31 UTC
|
||||
+++ src/core/raster/qgsexiftools.cpp
|
||||
@@ -94,7 +94,7 @@ QVariant decodeExifData( const QString &key, Exiv2::Ex
|
||||
case Exiv2::signedLong:
|
||||
case Exiv2::unsignedLongLong:
|
||||
case Exiv2::signedLongLong:
|
||||
- val = QVariant::fromValue( it->toLong() );
|
||||
+ val = QVariant::fromValue( it->toInt64() );
|
||||
break;
|
||||
|
||||
case Exiv2::tiffDouble:
|
||||
@@ -108,7 +108,7 @@ QVariant decodeExifData( const QString &key, Exiv2::Ex
|
||||
case Exiv2::signedByte:
|
||||
case Exiv2::tiffIfd:
|
||||
case Exiv2::tiffIfd8:
|
||||
- val = QVariant::fromValue( static_cast< int >( it->toLong() ) );
|
||||
+ val = QVariant::fromValue( static_cast< int >( it->toInt64() ) );
|
||||
break;
|
||||
|
||||
case Exiv2::date:
|
||||
File diff suppressed because it is too large
Load diff
Loading…
Add table
Reference in a new issue