Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 20 Dec 2019 16:40:10 +0000 (UTC)
From:      Raphael Kubo da Costa <rakuco@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r520519 - in head/graphics/qgis: . files
Message-ID:  <201912201640.xBKGeAnk026269@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rakuco
Date: Fri Dec 20 16:40:10 2019
New Revision: 520519
URL: https://svnweb.freebsd.org/changeset/ports/520519

Log:
  Update to 3.10.1.
  
  For some months now, the build process of graphics/qgis 3.8.2 had problems
  while using the QT5 QMap() function with large list like for proj6[1].
  Compiling such long QMap() list with clang takes several hours instead of
  some seconds or minutes[2], often it breaks the build.
  
  It turns out that building that QMap() code with clang takes exhaustive
  memory[3], for which a nice patch already exists on OpenBSD[4]. While this
  OpenBSD patch builds fine on amd64, it needs another patch on i386 (usage of
  '-O1' instead the clang specific patch '-mllvm -inline-threshold=128').
  
  After we found a solution for the QMap problem, it was necessary to wait for
  the release of QGIS 3.10.1 because of some tricky problems with proj6 / gdal
  combinations[5] that should be avoided.
  
  [1] https://github.com/qgis/QGIS/blob/master/src/core/qgscoordinatereferencesystem_legacy.h#L23
  [2] http://osgeo-org.1560.x6.nabble.com/QGIS-Developer-QGIS-3-8-0-on-FreeBSD-build-takes-several-hours-td5408676.html
  [3] https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=241687
  [4] https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/geo/qgis/patches/patch-src_core_CMakeLists_txt?rev=1.22&content-type=text/x-cvsweb-markup&hideattic=1
  [5] https://www.mail-archive.com/qgis-developer@lists.osgeo.org/msg48670.html
  
  Changes in the port:
  - Update from 3.8.2 to 3.10.1
  - Allow using default clang again
  - Update several Python dependencies
  - Add textproc/py-nltk, math/py-pandas, sysutils/py-psutil,
    graphics/py-pyrsgis, x11-toolkits/py-qt5-quick for Python extensions
  - Add USES=gl and USE_GL=gl
  - Add USE_PYQT=quickwidgets
  - Add several CMAKE ARGS
  - Add files/patch-src_core_CMakeLists.txt for QMap problem
  - Change above patch into '-O1' for i386
  - Update pkg-plist
  
  PR:		242557
  PR:		241687
  Submitted by:	Rainer Hurling <rhurlin@gwdg.de> (maintainer)

Added:
  head/graphics/qgis/files/patch-src_core_CMakeLists.txt   (contents, props changed)
Modified:
  head/graphics/qgis/Makefile
  head/graphics/qgis/distinfo
  head/graphics/qgis/pkg-plist

Modified: head/graphics/qgis/Makefile
==============================================================================
--- head/graphics/qgis/Makefile	Fri Dec 20 16:37:49 2019	(r520518)
+++ head/graphics/qgis/Makefile	Fri Dec 20 16:40:10 2019	(r520519)
@@ -3,8 +3,7 @@
 
 PORTNAME=	qgis
 DISTVERSIONPREFIX=	final-
-DISTVERSION=	3_8_2
-PORTREVISION=	1
+DISTVERSION=	3_10_1
 CATEGORIES=	graphics geography
 
 MAINTAINER=	rhurlin@gwdg.de
@@ -12,8 +11,7 @@ COMMENT=	Free and Open Source Geographic Information S
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	clang${LLVM_VER}:devel/llvm${LLVM_VER} \
-		gpsbabel>=1.5.4:astro/gpsbabel \
+BUILD_DEPENDS=	gpsbabel>=1.5.4:astro/gpsbabel \
 		txt2tags:textproc/txt2tags \
 		${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.0:devel/py-dateutil@${PY_FLAVOR} \
@@ -23,7 +21,7 @@ BUILD_DEPENDS=	clang${LLVM_VER}:devel/llvm${LLVM_VER} 
 		${PYTHON_PKGNAMEPREFIX}MarkupSafe>=1.1.1:textproc/py-MarkupSafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.4:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}OWSLib>=0.17.1:graphics/py-OWSLib@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}OWSLib>=0.18.0:graphics/py-OWSLib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pip>=9.0.3:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \
@@ -47,16 +45,21 @@ RUN_DEPENDS=	astyle:devel/astyle \
 		${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nbformat>=4.4.0:devel/py-nbformat@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>=2.1:math/py-networkx@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}numpy>=1.16.1:math/py-numpy@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}OWSLib>=0.17.1:graphics/py-OWSLib@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}nltk>=3.4.1:textproc/py-nltk@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}numpy>=1.16.5:math/py-numpy@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}OWSLib>=0.18.0:graphics/py-OWSLib@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pandas>=0.24.2:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pillow>=6.0.0:graphics/py-pillow@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pip>=9.0.3:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}psutil>=5.6.3:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psycopg2>=2.8.3:databases/py-psycopg2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=2.4.1:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyproj>=2.1.3:graphics/py-pyproj@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyrsgis>=0.2.4:graphics/py-pyrsgis@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2019.1:devel/py-pytz@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}qt5-quick>=5.12.2:x11-toolkits/py-qt5-quick@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.21.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-image>=0.14.2_2:graphics/py-scikit-image@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Shapely>=1.6.4:devel/py-shapely@${PY_FLAVOR} \
@@ -85,16 +88,17 @@ LIB_DEPENDS=	libexiv2.so:graphics/exiv2 \
 
 ### Fortran is needed by numpy, GRASS, etc.
 USES=		bison cmake compiler:features cpe desktop-file-utils \
-		fortran gmake gnome pgsql pyqt:5 python:3.6+ qt:5 \
+		fortran gl gmake gnome pgsql pyqt:5 python:3.6+ qt:5 \
 		shebangfix sqlite:3
 USE_GNOME=	libxml2
+USE_GL=		gl
 USE_QT=		3d buildtools_build core concurrent dbus declarative \
 		designer doc gamepad gui linguist_build location \
 		network printsupport qmake_build script serialport \
 		sql sql-pgsql sql-sqlite3 svg testlib uitools \
 		webengine widgets webkit xml
-USE_PYQT=	core gui network qml qscintilla2 sip sql svg xml \
-		webkit_run webkitwidgets_run
+USE_PYQT=	core gui network qml quickwidgets qscintilla2 \
+		sip sql svg webkit_run webkitwidgets_run xml
 USE_LDCONFIG=	yes
 
 CONFLICTS_INSTALL=	qgis-ltr
@@ -108,9 +112,11 @@ CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE:STRING=Release \
 		-DQSCI_SIP_DIR:PATH=${PYQT_SIPDIR}/Qsci \
 		-DQWT_INCLUDE_DIR:PATH=${LOCALBASE}/include/qt5/qwt6 \
 		-DQWT_LIBRARY:FILEPATH=${LOCALBASE}/lib/qt5/libqwt6.so \
-		-DCMAKE_POLICY_DEFAULT_CMP0056:STRING=NEW
+		-DCMAKE_POLICY_DEFAULT_CMP0056:STRING=NEW \
+		-DUSE_OPENCL:BOOL=FALSE
 CMAKE_ON=	BUILD_TESTING ENABLE_TESTS WITH_3D WITH_ASTYLE \
-		WITH_BINDINGS WITH_CUSTOM_WIDGETS WITH_POSTGRESQL
+		WITH_BINDINGS WITH_CUSTOM_WIDGETS WITH_INTERNAL_MDAL \
+		WITH_POSTGRESQL
 CMAKE_OFF=	WITH_GLOBE WITH_QWTPOLAR
 
 .if !defined(MAINTAINER_MODE)
@@ -130,25 +136,22 @@ SERVER_DESC=		Enable QGIS server
 GRASS_BUILD_DEPENDS=	grass7:databases/grass7
 GRASS_RUN_DEPENDS=	${GRASS_BUILD_DEPENDS}
 GRASS_CMAKE_BOOL=	WITH_GRASS7
-GRASS_FORCE_MAKE_JOBS=	NO
-
 SERVER_LIB_DEPENDS=	libfcgi.so:www/fcgi
-SERVER_CMAKE_BOOL=	WITH_SERVER
+SERVER_CMAKE_BOOL=	WITH_SERVER WITH_SERVER_PLUGINS WITH_QSPATIALITE
 
 PLIST_SUB=	DISTVERSION=${PORTVERSION}
 
 .include <bsd.port.pre.mk>
 
-# make describe needs them here, after bsd.port.pre.mk
-# clang 7.x and 8.x do not build properly
-LLVM_VER=	90
-CPP=		clang-cpp${LLVM_VER}
-CC=		clang${LLVM_VER}
-CXX=		clang++${LLVM_VER}
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|markupsafe ||g' \
 		${WRKSRC}/python/ext-libs/CMakeLists.txt
+# On i386, '-mllvm -inline-threshold=128' does not build under all circumstances
+# See bugs 242557 and 241687.
+.if ${OPSYS} == FreeBSD && ${ARCH} == "i386"
+	@${REINPLACE_CMD} -e 's|"-mllvm -inline-threshold=128"|"-O1"|g' \
+		${WRKSRC}/src/core/CMakeLists.txt
+.endif
 
 pre-configure:
 	${MKDIR} ${CONFIGURE_WRKSRC}/bin && ${LN} -s ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/bin/python3

Modified: head/graphics/qgis/distinfo
==============================================================================
--- head/graphics/qgis/distinfo	Fri Dec 20 16:37:49 2019	(r520518)
+++ head/graphics/qgis/distinfo	Fri Dec 20 16:40:10 2019	(r520519)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1566761570
-SHA256 (qgis-QGIS-final-3_8_2_GH0.tar.gz) = 85be6520cf4dd35f2f5e6dd43f7fb56ff4ffa9bd00fca734433c31f0fe9e67bd
-SIZE (qgis-QGIS-final-3_8_2_GH0.tar.gz) = 99980486
+TIMESTAMP = 1575643297
+SHA256 (qgis-QGIS-final-3_10_1_GH0.tar.gz) = 1f63a3010a2ef0faf1098b448dfefb8468912cd688738a7fbf57de5f9a04af07
+SIZE (qgis-QGIS-final-3_10_1_GH0.tar.gz) = 117585660

Added: head/graphics/qgis/files/patch-src_core_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/qgis/files/patch-src_core_CMakeLists.txt	Fri Dec 20 16:40:10 2019	(r520519)
@@ -0,0 +1,10 @@
+--- src/core/CMakeLists.txt.orig	2019-10-28 04:34:30 UTC
++++ src/core/CMakeLists.txt
+@@ -889,6 +889,7 @@ ELSE(MSVC)
+   SET_SOURCE_FILES_PROPERTIES(${QGIS_CORE_MOC_SRCS} PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations" )
+   IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" AND (CMAKE_BUILD_TYPE MATCHES Release OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo))
+     SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/qgsexpression_texts.cpp PROPERTIES COMPILE_FLAGS "-O1")
++    SET_SOURCE_FILES_PROPERTIES(qgscoordinatereferencesystem.cpp PROPERTIES COMPILE_FLAGS "-mllvm -inline-threshold=128")
+   ENDIF ()
+ ENDIF(MSVC)
+ 

Modified: head/graphics/qgis/pkg-plist
==============================================================================
--- head/graphics/qgis/pkg-plist	Fri Dec 20 16:37:49 2019	(r520518)
+++ head/graphics/qgis/pkg-plist	Fri Dec 20 16:40:10 2019	(r520519)
@@ -16,8 +16,7 @@ include/qgis/TriangleInterpolator.h
 include/qgis/Triangulation.h
 include/qgis/Vector3D.h
 include/qgis/characterwidget.h
-include/qgis/mersenne-twister.h
-include/qgis/nlohmann/json_fwd.hpp
+include/qgis/json_fwd.hpp
 include/qgis/qgis.h
 include/qgis/qgis_3d.h
 include/qgis/qgis_analysis.h
@@ -42,10 +41,13 @@ include/qgis/qgsabstract3dengine.h
 include/qgis/qgsabstract3drenderer.h
 include/qgis/qgsabstract3dsymbol.h
 include/qgis/qgsabstractcontentcache.h
+include/qgis/qgsabstractdatabaseproviderconnection.h
 include/qgis/qgsabstractdatasourcewidget.h
 include/qgis/qgsabstractgeometry.h
+include/qgis/qgsabstractgeopdfexporter.h
 include/qgis/qgsabstractlayoutiterator.h
 include/qgis/qgsabstractmetadatabase.h
+include/qgis/qgsabstractproviderconnection.h
 include/qgis/qgsabstractreportsection.h
 include/qgis/qgsabstractvaliditycheck.h
 include/qgis/qgsaction.h
@@ -67,6 +69,7 @@ include/qgis/qgsannotationmanager.h
 include/qgis/qgsannotationregistry.h
 include/qgis/qgsapplication.h
 include/qgis/qgsarchive.h
+include/qgis/qgsarrowsymbollayer.h
 include/qgis/qgsarrowsymbollayerwidget.h
 include/qgis/qgsaspectfilter.h
 include/qgis/qgsattributedialog.h
@@ -95,6 +98,7 @@ include/qgis/qgsauthconfigedit.h
 include/qgis/qgsauthconfigeditor.h
 include/qgis/qgsauthconfigidedit.h
 include/qgis/qgsauthconfigselect.h
+include/qgis/qgsauthconfigselectplugin.h
 include/qgis/qgsauthcrypto.h
 include/qgis/qgsautheditorwidgets.h
 include/qgis/qgsauthguiutils.h
@@ -121,10 +125,13 @@ include/qgis/qgsbinarywidgetwrapper.h
 include/qgis/qgsblendmodecombobox.h
 include/qgis/qgsblockingnetworkrequest.h
 include/qgis/qgsblureffect.h
+include/qgis/qgsbookmarkmanager.h
+include/qgis/qgsbookmarkmodel.h
 include/qgis/qgsbox3d.h
 include/qgis/qgsbrightnesscontrastfilter.h
 include/qgis/qgsbrowserdockwidget.h
 include/qgis/qgsbrowserdockwidget_p.h
+include/qgis/qgsbrowserguimodel.h
 include/qgis/qgsbrowsermodel.h
 include/qgis/qgsbrowserproxymodel.h
 include/qgis/qgsbrowsertreeview.h
@@ -134,6 +141,9 @@ include/qgis/qgscachedfeatureiterator.h
 include/qgis/qgscacheindex.h
 include/qgis/qgscacheindexfeatureid.h
 include/qgis/qgscadutils.h
+include/qgis/qgscallout.h
+include/qgis/qgscalloutsregistry.h
+include/qgis/qgscalloutwidget.h
 include/qgis/qgscameracontroller.h
 include/qgis/qgscamerapose.h
 include/qgis/qgscategorizedsymbolrenderer.h
@@ -142,6 +152,7 @@ include/qgis/qgscharacterselectordialog.h
 include/qgis/qgscheckablecombobox.h
 include/qgis/qgscheckablecomboboxplugin.h
 include/qgis/qgscheckboxconfigdlg.h
+include/qgis/qgscheckboxfieldformatter.h
 include/qgis/qgscheckboxsearchwidgetwrapper.h
 include/qgis/qgscheckboxwidgetfactory.h
 include/qgis/qgscheckboxwidgetwrapper.h
@@ -152,6 +163,15 @@ include/qgis/qgschunknode_p.h
 include/qgis/qgschunkqueuejob_p.h
 include/qgis/qgscircle.h
 include/qgis/qgscircularstring.h
+include/qgis/qgsclassificationcustom.h
+include/qgis/qgsclassificationequalinterval.h
+include/qgis/qgsclassificationjenks.h
+include/qgis/qgsclassificationlogarithmic.h
+include/qgis/qgsclassificationmethod.h
+include/qgis/qgsclassificationmethodregistry.h
+include/qgis/qgsclassificationprettybreaks.h
+include/qgis/qgsclassificationquantile.h
+include/qgis/qgsclassificationstandarddeviation.h
 include/qgis/qgsclassificationwidgetwrapper.h
 include/qgis/qgsclassificationwidgetwrapperfactory.h
 include/qgis/qgsclipper.h
@@ -347,6 +367,11 @@ include/qgis/qgsfontbutton.h
 include/qgis/qgsfontbuttonplugin.h
 include/qgis/qgsfontutils.h
 include/qgis/qgsformannotation.h
+include/qgis/qgsgdaldataitems.h
+include/qgis/qgsgdalguiprovider.h
+include/qgis/qgsgdalprovider.h
+include/qgis/qgsgdalsourceselect.h
+include/qgis/qgsgdalutils.h
 include/qgis/qgsgenericfeatureselectionmanager.h
 include/qgis/qgsgeometry.h
 include/qgis/qgsgeometryanglecheck.h
@@ -390,6 +415,13 @@ include/qgis/qgsgeometryutils.h
 include/qgis/qgsgeometryvalidator.h
 include/qgis/qgsgeonodeconnection.h
 include/qgis/qgsgeonoderequest.h
+include/qgis/qgsgeopackagedataitems.h
+include/qgis/qgsgeopackageitemguiprovider.h
+include/qgis/qgsgeopackageprojectstorage.h
+include/qgis/qgsgeopackageprojectstoragedialog.h
+include/qgis/qgsgeopackageprojectstorageguiprovider.h
+include/qgis/qgsgeopackageproviderconnection.h
+include/qgis/qgsgeopackagerasterwritertask.h
 include/qgis/qgsgeos.h
 include/qgis/qgsgloweffect.h
 include/qgis/qgsgml.h
@@ -448,6 +480,7 @@ include/qgis/qgskeyvaluewidgetwrapper.h
 include/qgis/qgslabelfeature.h
 include/qgis/qgslabelingengine.h
 include/qgis/qgslabelingenginesettings.h
+include/qgis/qgslabelinggui.h
 include/qgis/qgslabelsearchtree.h
 include/qgis/qgslayerdefinition.h
 include/qgis/qgslayermetadata.h
@@ -479,6 +512,7 @@ include/qgis/qgslayoutdesignerinterface.h
 include/qgis/qgslayouteffect.h
 include/qgis/qgslayoutexporter.h
 include/qgis/qgslayoutframe.h
+include/qgis/qgslayoutgeopdfexporter.h
 include/qgis/qgslayoutgridsettings.h
 include/qgis/qgslayoutguidecollection.h
 include/qgis/qgslayoutitem.h
@@ -606,6 +640,7 @@ include/qgis/qgsmaprenderercustompainterjob.h
 include/qgis/qgsmaprendererjob.h
 include/qgis/qgsmaprendererparalleljob.h
 include/qgis/qgsmaprenderersequentialjob.h
+include/qgis/qgsmaprendererstagedrenderjob.h
 include/qgis/qgsmaprenderertask.h
 include/qgis/qgsmapsettings.h
 include/qgis/qgsmapsettingsutils.h
@@ -614,6 +649,7 @@ include/qgis/qgsmaptip.h
 include/qgis/qgsmaptool.h
 include/qgis/qgsmaptooladvanceddigitizing.h
 include/qgis/qgsmaptoolcapture.h
+include/qgis/qgsmaptooldigitizefeature.h
 include/qgis/qgsmaptooledit.h
 include/qgis/qgsmaptoolemitpoint.h
 include/qgis/qgsmaptoolextent.h
@@ -682,6 +718,8 @@ include/qgis/qgsnewhttpconnection.h
 include/qgis/qgsnewmemorylayerdialog.h
 include/qgis/qgsnewnamedialog.h
 include/qgis/qgsnewogrconnection.h
+include/qgis/qgsnewsfeedmodel.h
+include/qgis/qgsnewsfeedparser.h
 include/qgis/qgsnewvectorlayerdialog.h
 include/qgis/qgsninecellfilter.h
 include/qgis/qgsnmeaconnection.h
@@ -692,7 +730,18 @@ include/qgis/qgsobjectcustomproperties.h
 include/qgis/qgsofflineediting.h
 include/qgis/qgsoffscreen3dengine.h
 include/qgis/qgsogcutils.h
+include/qgis/qgsogrconnpool.h
+include/qgis/qgsogrdataitems.h
+include/qgis/qgsogrdbconnection.h
+include/qgis/qgsogrdbsourceselect.h
+include/qgis/qgsogrdbtablemodel.h
+include/qgis/qgsogrguiprovider.h
 include/qgis/qgsogrhelperfunctions.h
+include/qgis/qgsogritemguiprovider.h
+include/qgis/qgsogrprovider.h
+include/qgis/qgsogrsourceselect.h
+include/qgis/qgsogrtransaction.h
+include/qgis/qgsogrutils.h
 include/qgis/qgsonlineterraingenerator.h
 include/qgis/qgsopacitywidget.h
 include/qgis/qgsopacitywidgetplugin.h
@@ -742,6 +791,7 @@ include/qgis/qgspointxy.h
 include/qgis/qgspolygon.h
 include/qgis/qgspolygon3dsymbol.h
 include/qgis/qgspolygon3dsymbol_p.h
+include/qgis/qgspostgresstringutils.h
 include/qgis/qgspresetcolorrampdialog.h
 include/qgis/qgsprevieweffect.h
 include/qgis/qgsprintlayout.h
@@ -766,6 +816,7 @@ include/qgis/qgsprocessingmodeloutput.h
 include/qgis/qgsprocessingmodelparameter.h
 include/qgis/qgsprocessingmultipleselectiondialog.h
 include/qgis/qgsprocessingoutputs.h
+include/qgis/qgsprocessingparameterdefinitionwidget.h
 include/qgis/qgsprocessingparameters.h
 include/qgis/qgsprocessingparametertype.h
 include/qgis/qgsprocessingparametertypeimpl.h
@@ -787,9 +838,13 @@ include/qgis/qgsprojectionselectionwidgetplugin.h
 include/qgis/qgsprojectmetadata.h
 include/qgis/qgsprojectproperty.h
 include/qgis/qgsprojectstorage.h
+include/qgis/qgsprojectstorageguiprovider.h
+include/qgis/qgsprojectstorageguiregistry.h
 include/qgis/qgsprojectstorageregistry.h
+include/qgis/qgsprojectstylealgorithms.h
 include/qgis/qgsprojecttranslator.h
 include/qgis/qgsprojectversion.h
+include/qgis/qgsprojectviewsettings.h
 include/qgis/qgsprojutils.h
 include/qgis/qgsproperty.h
 include/qgis/qgsproperty_p.h
@@ -798,6 +853,8 @@ include/qgis/qgspropertycollection.h
 include/qgis/qgspropertyoverridebutton.h
 include/qgis/qgspropertyoverridebuttonplugin.h
 include/qgis/qgspropertytransformer.h
+include/qgis/qgsproviderguimetadata.h
+include/qgis/qgsproviderguiregistry.h
 include/qgis/qgsprovidermetadata.h
 include/qgis/qgsproviderregistry.h
 include/qgis/qgsproxyprogresstask.h
@@ -875,8 +932,10 @@ include/qgis/qgsrelationwidgetwrapper.h
 include/qgis/qgsrelief.h
 include/qgis/qgsrenderchecker.h
 include/qgis/qgsrendercontext.h
+include/qgis/qgsrenderedfeaturehandlerinterface.h
 include/qgis/qgsrenderer.h
 include/qgis/qgsrendererpropertiesdialog.h
+include/qgis/qgsrendererrange.h
 include/qgis/qgsrendererrasterpropertieswidget.h
 include/qgis/qgsrendererregistry.h
 include/qgis/qgsrendererwidget.h
@@ -940,11 +999,14 @@ include/qgis/qgssqliteutils.h
 include/qgis/qgssqlstatement.h
 include/qgis/qgsstatisticalsummary.h
 include/qgis/qgsstatusbar.h
+include/qgis/qgsstoredexpressionmanager.h
 include/qgis/qgsstringstatisticalsummary.h
 include/qgis/qgsstringutils.h
 include/qgis/qgsstyle.h
+include/qgis/qgsstyleentityvisitor.h
 include/qgis/qgsstyleexportimportdialog.h
 include/qgis/qgsstylegroupselectiondialog.h
+include/qgis/qgsstyleitemslistwidget.h
 include/qgis/qgsstylemanagerdialog.h
 include/qgis/qgsstylemodel.h
 include/qgis/qgsstylesavedialog.h
@@ -1056,6 +1118,7 @@ include/qgis/qgsvectorlayerlabelprovider.h
 include/qgis/qgsvectorlayerrenderer.h
 include/qgis/qgsvectorlayersaveasdialog.h
 include/qgis/qgsvectorlayerselectionmanager.h
+include/qgis/qgsvectorlayerserverproperties.h
 include/qgis/qgsvectorlayertools.h
 include/qgis/qgsvectorlayerundocommand.h
 include/qgis/qgsvectorlayerundopassthroughcommand.h
@@ -1146,7 +1209,6 @@ lib/qgis/plugins/libdb2provider.so
 lib/qgis/plugins/libdelimitedtextprovider.so
 lib/qgis/plugins/libesritokenauthmethod.so
 lib/qgis/plugins/libevis.so
-lib/qgis/plugins/libgdalprovider.so
 lib/qgis/plugins/libgeometrycheckerplugin.so
 lib/qgis/plugins/libgeonodeprovider.so
 lib/qgis/plugins/libgeorefplugin.so
@@ -1160,7 +1222,6 @@ lib/qgis/plugins/libmdalprovider.so
 lib/qgis/plugins/libmssqlprovider.so
 lib/qgis/plugins/liboauth2authmethod.so
 lib/qgis/plugins/libofflineeditingplugin.so
-lib/qgis/plugins/libogrprovider.so
 lib/qgis/plugins/libowsprovider.so
 lib/qgis/plugins/libpkcs12authmethod.so
 lib/qgis/plugins/libpkipathsauthmethod.so
@@ -1174,10 +1235,12 @@ lib/qgis/plugins/libwmsprovider.so
 %%SERVER%%lib/qgis/server/libdummy.so
 %%SERVER%%lib/qgis/server/libwcs.so
 %%SERVER%%lib/qgis/server/libwfs.so
+lib/qgis/server/libwfs3.so
 %%SERVER%%lib/qgis/server/libwms.so
 %%SERVER%%lib/qgis/server/libwmts.so
 %%QT_PLUGINDIR%%/designer/libqgis_customwidgets.so
 %%QT_PLUGINDIR%%/designer/libqgis_customwidgets.so.%%DISTVERSION%%
+%%QT_PLUGINDIR%%/sqldrivers/libqsqlspatialite.so
 man/man1/qgis.1.gz
 share/applications/org.qgis.qgis.desktop
 share/icons/hicolor/128x128/apps/qgis.png
@@ -2415,7 +2478,7 @@ share/metainfo/org.qgis.qgis.appdata.xml
 %%DATADIR%%/i18n/qgis_et.qm
 %%DATADIR%%/i18n/qgis_eu.qm
 %%DATADIR%%/i18n/qgis_fi.qm
-%%DATADIR%%/i18n/qgis_fr.qm
+%%DATADIR%%/i18n/qgis_gl.qm
 %%DATADIR%%/i18n/qgis_hi.qm
 %%DATADIR%%/i18n/qgis_hu.qm
 %%DATADIR%%/i18n/qgis_id.qm
@@ -2430,16 +2493,13 @@ share/metainfo/org.qgis.qgis.appdata.xml
 %%DATADIR%%/i18n/qgis_nl.qm
 %%DATADIR%%/i18n/qgis_pl.qm
 %%DATADIR%%/i18n/qgis_pt_BR.qm
-%%DATADIR%%/i18n/qgis_pt_PT.qm
 %%DATADIR%%/i18n/qgis_ro.qm
 %%DATADIR%%/i18n/qgis_ru.qm
 %%DATADIR%%/i18n/qgis_sl.qm
-%%DATADIR%%/i18n/qgis_sv.qm
 %%DATADIR%%/i18n/qgis_tr.qm
 %%DATADIR%%/i18n/qgis_uk.qm
 %%DATADIR%%/i18n/qgis_vi.qm
 %%DATADIR%%/i18n/qgis_zh-Hans.qm
-%%DATADIR%%/i18n/qgis_zh-Hant.qm
 %%DATADIR%%/images/icons/qbrowser-icon.png
 %%DATADIR%%/images/icons/qgis-icon-16x16.png
 %%DATADIR%%/images/icons/qgis-icon-512x512.png
@@ -2631,6 +2691,7 @@ share/metainfo/org.qgis.qgis.appdata.xml
 %%DATADIR%%/python/plugins/processing/algs/gdal/proximity.py
 %%DATADIR%%/python/plugins/processing/algs/gdal/rasterize.py
 %%DATADIR%%/python/plugins/processing/algs/gdal/rasterize_over.py
+%%DATADIR%%/python/plugins/processing/algs/gdal/rasterize_over_fixed_value.py
 %%DATADIR%%/python/plugins/processing/algs/gdal/rearrange_bands.py
 %%DATADIR%%/python/plugins/processing/algs/gdal/retile.py
 %%DATADIR%%/python/plugins/processing/algs/gdal/rgb2pct.py
@@ -3065,6 +3126,7 @@ share/metainfo/org.qgis.qgis.appdata.xml
 %%DATADIR%%/python/plugins/processing/algs/qgis/BoxPlot.py
 %%DATADIR%%/python/plugins/processing/algs/qgis/Buffer.py
 %%DATADIR%%/python/plugins/processing/algs/qgis/CheckValidity.py
+%%DATADIR%%/python/plugins/processing/algs/qgis/Climb.py
 %%DATADIR%%/python/plugins/processing/algs/qgis/ConcaveHull.py
 %%DATADIR%%/python/plugins/processing/algs/qgis/CreateAttributeIndex.py
 %%DATADIR%%/python/plugins/processing/algs/qgis/CreateConstantRaster.py
@@ -3692,7 +3754,9 @@ share/metainfo/org.qgis.qgis.appdata.xml
 %%DATADIR%%/python/plugins/processing/script/__init__.py
 %%DATADIR%%/python/plugins/processing/tests/AlgorithmsTestBase.py
 %%DATADIR%%/python/plugins/processing/tests/CheckValidityAlgorithm.py
-%%DATADIR%%/python/plugins/processing/tests/GdalAlgorithmsTest.py
+%%DATADIR%%/python/plugins/processing/tests/GdalAlgorithmsGeneralTest.py
+%%DATADIR%%/python/plugins/processing/tests/GdalAlgorithmsRasterTest.py
+%%DATADIR%%/python/plugins/processing/tests/GdalAlgorithmsVectorTest.py
 %%DATADIR%%/python/plugins/processing/tests/Grass7AlgorithmsImageryTest.py
 %%DATADIR%%/python/plugins/processing/tests/Grass7AlgorithmsRasterTest.py
 %%DATADIR%%/python/plugins/processing/tests/Grass7AlgorithmsVectorTest.py
@@ -3795,6 +3859,7 @@ share/metainfo/org.qgis.qgis.appdata.xml
 %%DATADIR%%/python/qgis/core/additions/metaenum.py
 %%DATADIR%%/python/qgis/core/additions/processing.py
 %%DATADIR%%/python/qgis/core/additions/projectdirtyblocker.py
+%%DATADIR%%/python/qgis/core/additions/providermetadata.py
 %%DATADIR%%/python/qgis/core/additions/qgsfeature.py
 %%DATADIR%%/python/qgis/core/additions/qgsfunction.py
 %%DATADIR%%/python/qgis/core/additions/qgsgeometry.py
@@ -5018,16 +5083,15 @@ share/metainfo/org.qgis.qgis.appdata.xml
 %%DATADIR%%/resources/cpt-city-qgis-min/wkp/tubs/DESC.xml
 %%DATADIR%%/resources/cpt-city-qgis-min/wkp/tubs/nrwc.svg
 %%DATADIR%%/resources/customization.xml
+%%DATADIR%%/resources/data/README_world_map.md
 %%DATADIR%%/resources/data/contributors.json
 %%DATADIR%%/resources/data/contributors.qml
 %%DATADIR%%/resources/data/qgis-hackfests.json
 %%DATADIR%%/resources/data/qgis-hackfests.qml
-%%DATADIR%%/resources/data/world_map.dbf
-%%DATADIR%%/resources/data/world_map.prj
-%%DATADIR%%/resources/data/world_map.qix
-%%DATADIR%%/resources/data/world_map.qml
-%%DATADIR%%/resources/data/world_map.shp
-%%DATADIR%%/resources/data/world_map.shx
+@mode 0666
+%%DATADIR%%/resources/data/world_map.gpkg
+%%DATADIR%%/resources/data/world_map_generalize.model3
+@mode
 %%DATADIR%%/resources/metadata-ISO/LinkPropertyLookupTable.csv
 %%DATADIR%%/resources/metadata-ISO/country_code_ISO_3166.csv
 %%DATADIR%%/resources/metadata-ISO/language_codes_ISO_639.csv
@@ -5037,6 +5101,21 @@ share/metainfo/org.qgis.qgis.appdata.xml
 %%DATADIR%%/resources/palettes/new_layer_colors.gpl
 %%DATADIR%%/resources/qgis.db
 %%DATADIR%%/resources/qgis_global_settings.ini
+%%DATADIR%%/resources/server/api/ogc/schema.json
+%%DATADIR%%/resources/server/api/ogc/static/jsonFormatter.min.css
+%%DATADIR%%/resources/server/api/ogc/static/jsonFormatter.min.js
+%%DATADIR%%/resources/server/api/ogc/static/style.css
+%%DATADIR%%/resources/server/api/ogc/templates/wfs3/describeCollection.html
+%%DATADIR%%/resources/server/api/ogc/templates/wfs3/describeCollections.html
+%%DATADIR%%/resources/server/api/ogc/templates/wfs3/footer.html
+%%DATADIR%%/resources/server/api/ogc/templates/wfs3/getApiDescription.html
+%%DATADIR%%/resources/server/api/ogc/templates/wfs3/getFeature.html
+%%DATADIR%%/resources/server/api/ogc/templates/wfs3/getFeatures.html
+%%DATADIR%%/resources/server/api/ogc/templates/wfs3/getLandingPage.html
+%%DATADIR%%/resources/server/api/ogc/templates/wfs3/getRequirementClasses.html
+%%DATADIR%%/resources/server/api/ogc/templates/wfs3/header.html
+%%DATADIR%%/resources/server/api/ogc/templates/wfs3/leaflet_map.html
+%%DATADIR%%/resources/server/api/ogc/templates/wfs3/links.html
 %%SERVER%%%%DATADIR%%/resources/server/schemaExtension.xsd
 %%DATADIR%%/resources/spatialite.db
 %%DATADIR%%/resources/srs.db



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