Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 29 May 2023 14:25:18 GMT
From:      Rainer Hurling <rhurlin@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: 8c0e5d75e9f0 - 2023Q2 - graphics/qgis: Update to 3.30.3
Message-ID:  <202305291425.34TEPIF1072874@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch 2023Q2 has been updated by rhurlin:

URL: https://cgit.FreeBSD.org/ports/commit/?id=8c0e5d75e9f056f5752e9d0716ab2bc12bb9d5c4

commit 8c0e5d75e9f056f5752e9d0716ab2bc12bb9d5c4
Author:     Rainer Hurling <rhurlin@FreeBSD.org>
AuthorDate: 2023-05-29 14:11:28 +0000
Commit:     Rainer Hurling <rhurlin@FreeBSD.org>
CommitDate: 2023-05-29 14:24:48 +0000

    graphics/qgis: Update to 3.30.3
    
    Bugfix release. While here, also
    - Add USE_QT=multimedia, testlib
    - Add CMAKE_ARGS+=-DPG_CONFIG=1
    - Fix cmake configure: If PostgreSQL server and client are present,
      the 'About' dialog does not show the PostgreSQL version any more
    
    Changelog: https://github.com/qgis/QGIS/compare/final-3_30_2%5E...final-3_30_3
    
    Reported by:    portscout, Repology
    MFH:            2023Q2
    
    (cherry picked from commit d2acce4664ce682d83cec435e394987ce76461f8)
---
 graphics/qgis/Makefile | 13 +++++++++----
 graphics/qgis/distinfo |  6 +++---
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile
index e213c7ac6204..42565e23be9a 100644
--- a/graphics/qgis/Makefile
+++ b/graphics/qgis/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	qgis
-DISTVERSION=	3.30.2
+DISTVERSION=	3.30.3
 CATEGORIES=	graphics geography
 MASTER_SITES=	https://qgis.org/downloads/
 
@@ -109,13 +109,14 @@ 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 webkit widgets xml
 
 SHEBANG_FILES=	src/plugins/grass/scripts/*.py
 
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE:STRING=Release \
+		-DHAVE_PGCONFIG=1 \
 		-DPYRCC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyrcc5-${PYTHON_VER} \
 		-DPYUIC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyuic5-${PYTHON_VER} \
 		-DQSCI_SIP_DIR:PATH=${PYQT_SIPDIR}/Qsci \
@@ -125,7 +126,7 @@ CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE:STRING=Release \
 CMAKE_ON=	USE_OPENCL WITH_3D WITH_ASTYLE WITH_BINDINGS \
 		WITH_COPC WITH_CUSTOM_WIDGETS WITH_EPT  WITH_INTERNAL_LAZPERF \
 		WITH_POSTGRESQL WITH_PDAL
-CMAKE_OFF=	ENABLE_TESTS WITH_INTERNAL_MDAL WITH_QWTPOLAR
+CMAKE_OFF=	ENABLE_TESTING WITH_INTERNAL_MDAL WITH_QWTPOLAR
 
 CONFLICTS_INSTALL=	qgis-ltr
 
@@ -158,6 +159,10 @@ BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:textproc/flex
 CMAKE_ARGS+=	-DFLEX_EXECUTABLE:FILEPATH=${LOCALBASE}/bin/flex
 .endif
 
+pre-patch:
+	@${REINPLACE_CMD} -e 's|set(POSTGRES_INCLUDE_DIR \$${PostgreSQL_INCLUDE_DIRS})|set(POSTGRES_INCLUDE ${LOCALBASE}/include)|g' \
+		${WRKSRC}/cmake/FindPostgres.cmake
+
 post-patch:
 # On i386, '-mllvm -inline-threshold=128' does not build under all circumstances
 # See bugs 242557 and 241687.
diff --git a/graphics/qgis/distinfo b/graphics/qgis/distinfo
index f36d74bb3a04..02d0d3da69e4 100644
--- a/graphics/qgis/distinfo
+++ b/graphics/qgis/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1682787039
-SHA256 (qgis-3.30.2.tar.bz2) = 996e50561ba2c9234b99f19df512b98549203723da8b3856dd7eb091a60e4272
-SIZE (qgis-3.30.2.tar.bz2) = 158617634
+TIMESTAMP = 1685296606
+SHA256 (qgis-3.30.3.tar.bz2) = e291cb7c74fd44bfebf8ac3738490e185ab8e64b3e45bbec769b4b14c2f82687
+SIZE (qgis-3.30.3.tar.bz2) = 159193615



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202305291425.34TEPIF1072874>