Skip to content

Commit

Permalink
graphics/qgis-ltr: Update to 3.34.4
Browse files Browse the repository at this point in the history
Major update of the long-term-release

Changelog: qgis/QGIS@final-3_34_3^...final-3_34_4

Reported by:	portscout, Repology
  • Loading branch information
rhurlin committed Feb 27, 2024
1 parent 29c816e commit 0b0ca63
Show file tree
Hide file tree
Showing 7 changed files with 619 additions and 602 deletions.
32 changes: 19 additions & 13 deletions graphics/qgis-ltr/Makefile
@@ -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
Expand Down Expand Up @@ -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 \
Expand All @@ -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 \
Expand All @@ -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} \
Expand Down Expand Up @@ -103,40 +108,41 @@ 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
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

# 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} \
-DQSCI_SIP_DIR:PATH=${PYQT_SIPDIR}/Qsci \
-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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions graphics/qgis-ltr/distinfo
@@ -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
44 changes: 14 additions & 30 deletions graphics/qgis-ltr/files/patch-cmake_FindGRASS.cmake
@@ -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)
83 changes: 0 additions & 83 deletions graphics/qgis-ltr/files/patch-cmake_FindPDAL.cmake

This file was deleted.

This file was deleted.

20 changes: 0 additions & 20 deletions graphics/qgis-ltr/files/patch-src_core_raster_qgsexiftools.cpp

This file was deleted.

0 comments on commit 0b0ca63

Please sign in to comment.