geography/qgis: Update to 3.16.4

This is an update from the 3.10 LTR to the newly-designated 3.16 LTR.
Besides hand-re-applying patches, and believing the new PLIST, the
only change is a new dependency on protobuf.

Upstream NEWS

# 3.16

This release brings a wealth of new options for 3D mapping, mesh
generation from other data types, additional spatial analysis tools,
symbology and user interface enhancements to name but a few! A host of
tools have been incorporated into the ever-expanding processing
framework, and the QGIS browser now supports advanced database
interaction functionality that was previously reserved for the DB
Manager plugin.

https://www.qgis.org/en/site/forusers/visualchangelog316/index.html

# 3.14

Some of the marquee features include vector tile support, huge
advances in mdal / mesh support, native support for temporal data in
WMS-T, PG Raster, vector providers, and mesh layers. Users focussed on
cartography and digitising haven’t been left out either, with many new
options for you!

https://www.qgis.org/en/site/forusers/visualchangelog314/index.html

# What's new in Version 3.12 'București'?

This release has following new features:

- User Interface: Deselecting tables when adding PostgreSQL data after add button is clicked.
- Symbology: Vector Trace Animation and Streamlines for Mesh Layer
- Rendering: Play/Stop Buttons for Mesh Layer Playback
- Rendering: On the Fly Resampling of Data Defined on Faces to Vertices (Mesh Layer)
- Rendering: Support for Mesh Reference Time
- 3D Features: 3D Mesh Layer Terrain Renderer
- 3D Features: Harmonize 3D map view widget with 2D ones to display the map theme drop-down menu
- Expressions: Search Tags for Functions
- Expressions: List Referenced Layer Values
- Expressions: New functions to check if a geometry is empty or null
- Expressions: Hash expressions
- Digitizing: Edit Invalid Attributes on Copy/Paste to Another Layer
- Digitizing: Snapping cache parallelization
- Data Management: DXF Export Improvements
- Forms and Widgets: Create geometric feature from the relation editor
- Forms and Widgets: Improve feature selection dialog
- Analysis Tools: Smooth Export of the Contours from Mesh Layer
- Analysis Tools: Support of Datasets Defined on Faces in QGIS Mesh Calculator
- Processing: Package new layers to existing GeoPackage
- Browser: Customization of the items shown in browser
- Data Providers: Changed WMTS layer collection icon
- Data Providers: Added Metadata URL property in the layer metadata tab for WMS / WMTS and WCS  services
- Data Providers: Fetch and show dimensions metadata  for a WMS layer metadata
- Data Providers: Added refresh action to OGC services entries
- Data Providers: 3d Stacked Meshes
- Data Providers: Oracle curve type edition support
- Programmability: Exposes shape digitizing methods to QgisInterface
- Notable Fixes: Bug fixes by Stephen Knox

https://www.qgis.org/en/site/forusers/visualchangelog312/index.html

9 files changed, 385 insertions, 159 deletions

diff --git a/geography/qgis/Makefile b/geography/qgis/Makefile
index a74e936120c..2f3dc31ecff 100644
--- a/geography/qgis/Makefile
+++ b/geography/qgis/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.108 2021/02/07 06:30:26 ryoon Exp $
+# $NetBSD: Makefile,v 1.109 2021/03/01 00:03:35 gdt Exp $
 
-# This is intentionally 3.10 Long Term Release.  Please do not update
-# to 3.14, and instead discuss whether/how we want multiple versions.
-DISTNAME=	qgis-3.10.14
-PKGREVISION=	1
+# This is intentionally 3.16 Long Term Release.  Please do not update
+# to later branches, and instead discuss whether/how we want multiple
+# versions.
+DISTNAME=	qgis-3.16.4
 CATEGORIES=	geography
 MASTER_SITES=	https://qgis.org/downloads/
 EXTRACT_SUFX=	.tar.bz2
@@ -71,6 +71,7 @@ pre-configure:
 
 .include "../../archivers/libzip/buildlink3.mk"
 ##.include "../../devel/qjson/buildlink3.mk"
+.include "../../devel/protobuf/buildlink3.mk"
 .include "../../geography/gdal-lib/buildlink3.mk"
 .include "../../geography/proj/buildlink3.mk"
 .include "../../graphics/exiv2/buildlink3.mk"
diff --git a/geography/qgis/PLIST b/geography/qgis/PLIST
index 79641c82498..03b67660ab5 100644
--- a/geography/qgis/PLIST
+++ b/geography/qgis/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.13 2020/12/13 00:31:10 gdt Exp $
+@comment $NetBSD: PLIST,v 1.14 2021/03/01 00:03:35 gdt Exp $
 bin/qgis
 bin/qgis_bench
+bin/qgis_process
 include/qgis/Bezier3D.h
 include/qgis/CloughTocherInterpolator.h
-include/qgis/DualEdgeTriangulation.h
 include/qgis/HalfEdge.h
 include/qgis/LinTriangleInterpolator.h
 include/qgis/MathUtils.h
@@ -11,7 +11,6 @@ include/qgis/NormVecDecorator.h
 include/qgis/ParametricLine.h
 include/qgis/TriDecorator.h
 include/qgis/TriangleInterpolator.h
-include/qgis/Triangulation.h
 include/qgis/Vector3D.h
 include/qgis/characterwidget.h
 include/qgis/json_fwd.hpp
@@ -26,13 +25,17 @@ include/qgis/qgisplugin.h
 include/qgis/qgs25drenderer.h
 include/qgis/qgs25drendererwidget.h
 include/qgis/qgs3drendererregistry.h
+include/qgis/qgs3dsymbolregistry.h
+include/qgis/qgs3dsymbolwidget.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/qgsabstractmaptoolhandler.h
 include/qgis/qgsabstractmetadatabase.h
 include/qgis/qgsabstractproviderconnection.h
 include/qgis/qgsabstractreportsection.h
@@ -42,39 +45,59 @@ include/qgis/qgsactionmanager.h
 include/qgis/qgsactionmenu.h
 include/qgis/qgsactionscope.h
 include/qgis/qgsactionscoperegistry.h
+include/qgis/qgsaddattrdialog.h
+include/qgis/qgsaddtaborgroup.h
 include/qgis/qgsadvanceddigitizingdockwidget.h
 include/qgis/qgsadvanceddigitizingfloater.h
 include/qgis/qgsaggregatecalculator.h
 include/qgis/qgsaggregatetoolbutton.h
+include/qgis/qgsalgorithmfiledownloader.h
 include/qgis/qgsalgorithmimportphotos.h
 include/qgis/qgsalignmentcombobox.h
 include/qgis/qgsalignraster.h
 include/qgis/qgsanalysis.h
 include/qgis/qgsanimatedicon.h
 include/qgis/qgsannotation.h
+include/qgis/qgsannotationitem.h
+include/qgis/qgsannotationitemregistry.h
+include/qgis/qgsannotationlayer.h
+include/qgis/qgsannotationlayerrenderer.h
+include/qgis/qgsannotationlineitem.h
 include/qgis/qgsannotationmanager.h
+include/qgis/qgsannotationmarkeritem.h
+include/qgis/qgsannotationpointtextitem.h
+include/qgis/qgsannotationpolygonitem.h
 include/qgis/qgsannotationregistry.h
 include/qgis/qgsapplication.h
+include/qgis/qgsapplicationexitblockerinterface.h
+include/qgis/qgsarcgisvectortileconnectiondialog.h
 include/qgis/qgsarchive.h
 include/qgis/qgsarrowsymbollayer.h
 include/qgis/qgsarrowsymbollayerwidget.h
 include/qgis/qgsaspectfilter.h
+include/qgis/qgsattributeactiondialog.h
+include/qgis/qgsattributeactionpropertiesdialog.h
 include/qgis/qgsattributedialog.h
 include/qgis/qgsattributeeditorcontext.h
 include/qgis/qgsattributeeditorelement.h
 include/qgis/qgsattributeform.h
+include/qgis/qgsattributeformcontaineredit.h
 include/qgis/qgsattributeformeditorwidget.h
 include/qgis/qgsattributeforminterface.h
 include/qgis/qgsattributeformlegacyinterface.h
 include/qgis/qgsattributeformrelationeditorwidget.h
 include/qgis/qgsattributeformwidget.h
 include/qgis/qgsattributes.h
+include/qgis/qgsattributesforminitcode.h
+include/qgis/qgsattributesformproperties.h
 include/qgis/qgsattributetableconfig.h
 include/qgis/qgsattributetabledelegate.h
 include/qgis/qgsattributetablefiltermodel.h
 include/qgis/qgsattributetablemodel.h
 include/qgis/qgsattributetableview.h
+include/qgis/qgsattributetypedialog.h
 include/qgis/qgsattributetypeloaddialog.h
+include/qgis/qgsattributewidgetedit.h
 include/qgis/qgsauthauthoritieseditor.h
 include/qgis/qgsauthcertificateinfo.h
 include/qgis/qgsauthcertificatemanager.h
@@ -104,6 +127,8 @@ include/qgis/qgsauthsslerrorsdialog.h
 include/qgis/qgsauthsslimportdialog.h
 include/qgis/qgsauthtrustedcasdialog.h
 include/qgis/qgsauxiliarystorage.h
+include/qgis/qgsbasicnumericformat.h
+include/qgis/qgsbearingnumericformat.h
 include/qgis/qgsbearingutils.h
 include/qgis/qgsbilinearrasterresampler.h
 include/qgis/qgsbinarywidgetfactory.h
@@ -155,9 +180,12 @@ include/qgis/qgsclassificationwidgetwrapperfactory.h
 include/qgis/qgsclipper.h
 include/qgis/qgscliptominmaxenhancement.h
 include/qgis/qgscodeeditor.h
+include/qgis/qgscodeeditorcolorscheme.h
+include/qgis/qgscodeeditorcolorschemeregistry.h
 include/qgis/qgscodeeditorcss.h
 include/qgis/qgscodeeditorexpression.h
 include/qgis/qgscodeeditorhtml.h
+include/qgis/qgscodeeditorjs.h
 include/qgis/qgscodeeditorpython.h
 include/qgis/qgscodeeditorsql.h
 include/qgis/qgscollapsiblegroupbox.h
@@ -184,10 +212,12 @@ include/qgis/qgsconditionalstyle.h
 include/qgis/qgsconfig.h
 include/qgis/qgsconfigureshortcutsdialog.h
 include/qgis/qgsconnectionpool.h
+include/qgis/qgsconnectionregistry.h
 include/qgis/qgscontrastenhancement.h
 include/qgis/qgscontrastenhancementfunction.h
 include/qgis/qgscoordinateboundspreviewmapwidget.h
 include/qgis/qgscoordinateformatter.h
+include/qgis/qgscoordinateoperationwidget.h
 include/qgis/qgscoordinatereferencesystem.h
 include/qgis/qgscoordinatetransform.h
 include/qgis/qgscoordinatetransformcontext.h
@@ -197,13 +227,19 @@ include/qgis/qgscptcitycolorrampdialog.h
 include/qgis/qgscredentialdialog.h
 include/qgis/qgscredentials.h
 include/qgis/qgscubicrasterresampler.h
+include/qgis/qgscurrencynumericformat.h
 include/qgis/qgscurve.h
 include/qgis/qgscurveeditorwidget.h
 include/qgis/qgscurvepolygon.h
 include/qgis/qgscustomdrophandler.h
 include/qgis/qgscustomlayerorderwidget.h
+include/qgis/qgscustomprojectopenhandler.h
 include/qgis/qgsdartmeasurement.h
 include/qgis/qgsdashspacedialog.h
+include/qgis/qgsdatabaseschemacombobox.h
+include/qgis/qgsdatabaseschemamodel.h
+include/qgis/qgsdatabasetablecombobox.h
+include/qgis/qgsdatabasetablemodel.h
 include/qgis/qgsdatadefinedsizelegend.h
 include/qgis/qgsdatadefinedsizelegendwidget.h
 include/qgis/qgsdataitem.h
@@ -212,6 +248,7 @@ include/qgis/qgsdataitemguiproviderregistry.h
 include/qgis/qgsdataitemprovider.h
 include/qgis/qgsdataitemproviderregistry.h
 include/qgis/qgsdataprovider.h
+include/qgis/qgsdataprovidertemporalcapabilities.h
 include/qgis/qgsdatasourcemanagerdialog.h
 include/qgis/qgsdatasourceselectdialog.h
 include/qgis/qgsdatasourceuri.h
@@ -231,7 +268,10 @@ include/qgis/qgsderivativefilter.h
 include/qgis/qgsdetaileditemdata.h
 include/qgis/qgsdetaileditemdelegate.h
 include/qgis/qgsdetaileditemwidget.h
+include/qgis/qgsdevtoolwidget.h
+include/qgis/qgsdevtoolwidgetfactory.h
 include/qgis/qgsdiagram.h
+include/qgis/qgsdiagramproperties.h
 include/qgis/qgsdiagramrenderer.h
 include/qgis/qgsdial.h
 include/qgis/qgsdialog.h
@@ -239,6 +279,8 @@ include/qgis/qgsdistancearea.h
 include/qgis/qgsdockwidget.h
 include/qgis/qgsdoubleboxscalebarrenderer.h
 include/qgis/qgsdoublespinbox.h
+include/qgis/qgsdoublevalidator.h
+include/qgis/qgsdualedgetriangulation.h
 include/qgis/qgsdualview.h
 include/qgis/qgsdummyconfigdlg.h
 include/qgis/qgsdxfexport.h
@@ -261,6 +303,7 @@ include/qgis/qgsenumerationwidgetfactory.h
 include/qgis/qgsenumerationwidgetwrapper.h
 include/qgis/qgserror.h
 include/qgis/qgserrordialog.h
+include/qgis/qgseventtracing.h
 include/qgis/qgsexception.h
 include/qgis/qgsexiftools.h
 include/qgis/qgsexpression.h
@@ -276,16 +319,21 @@ include/qgis/qgsexpressionhighlighter.h
 include/qgis/qgsexpressionlineedit.h
 include/qgis/qgsexpressionnode.h
 include/qgis/qgsexpressionnodeimpl.h
+include/qgis/qgsexpressionpreviewwidget.h
 include/qgis/qgsexpressionselectiondialog.h
+include/qgis/qgsexpressionstoredialog.h
+include/qgis/qgsexpressiontreeview.h
 include/qgis/qgsextentgroupbox.h
+include/qgis/qgsextentwidget.h
 include/qgis/qgsexternalresourceconfigdlg.h
 include/qgis/qgsexternalresourcewidget.h
 include/qgis/qgsexternalresourcewidgetfactory.h
 include/qgis/qgsexternalresourcewidgetwrapper.h
 include/qgis/qgsfallbackfieldformatter.h
+include/qgis/qgsfallbacknumericformat.h
 include/qgis/qgsfeature.h
+include/qgis/qgsfeatureexpressionvaluesgatherer.h
 include/qgis/qgsfeaturefiltermodel.h
-include/qgis/qgsfeaturefiltermodel_p.h
 include/qgis/qgsfeaturefilterprovider.h
 include/qgis/qgsfeatureid.h
 include/qgis/qgsfeatureiterator.h
@@ -294,6 +342,9 @@ include/qgis/qgsfeaturelistmodel.h
 include/qgis/qgsfeaturelistview.h
 include/qgis/qgsfeaturelistviewdelegate.h
 include/qgis/qgsfeaturemodel.h
+include/qgis/qgsfeaturepickermodel.h
+include/qgis/qgsfeaturepickermodelbase.h
+include/qgis/qgsfeaturepickerwidget.h
 include/qgis/qgsfeaturepool.h
 include/qgis/qgsfeaturerequest.h
 include/qgis/qgsfeatureselectiondlg.h
@@ -303,13 +354,15 @@ include/qgis/qgsfeaturesource.h
 include/qgis/qgsfeaturestore.h
 include/qgis/qgsfeedback.h
 include/qgis/qgsfield.h
-include/qgis/qgsfield_p.h
+include/qgis/qgsfieldcalculator.h
 include/qgis/qgsfieldcombobox.h
 include/qgis/qgsfieldconditionalformatwidget.h
 include/qgis/qgsfieldconstraints.h
 include/qgis/qgsfieldexpressionwidget.h
 include/qgis/qgsfieldformatter.h
 include/qgis/qgsfieldformatterregistry.h
+include/qgis/qgsfieldmappingmodel.h
+include/qgis/qgsfieldmappingwidget.h
 include/qgis/qgsfieldmodel.h
 include/qgis/qgsfieldproxymodel.h
 include/qgis/qgsfields.h
@@ -318,32 +371,36 @@ include/qgis/qgsfieldvalueslineedit.h
 include/qgis/qgsfilecontentsourcelineedit.h
 include/qgis/qgsfiledownloader.h
 include/qgis/qgsfiledownloaderdialog.h
+include/qgis/qgsfilefiltergenerator.h
 include/qgis/qgsfileutils.h
 include/qgis/qgsfilewidget.h
 include/qgis/qgsfillsymbollayer.h
 include/qgis/qgsfilterlineedit.h
 include/qgis/qgsfindfilesbypatternwidget.h
 include/qgis/qgsfloatingwidget.h
-include/qgis/qgsfocuskeeper.h
 include/qgis/qgsfocuswatcher.h
 include/qgis/qgsfontbutton.h
 include/qgis/qgsfontutils.h
 include/qgis/qgsformannotation.h
+include/qgis/qgsfractionnumericformat.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/qgsgenericspatialindex.h
 include/qgis/qgsgeometry.h
 include/qgis/qgsgeometryanglecheck.h
 include/qgis/qgsgeometryareacheck.h
+include/qgis/qgsgeometrycheck.h
 include/qgis/qgsgeometrycheckcontext.h
 include/qgis/qgsgeometrychecker.h
 include/qgis/qgsgeometrycheckerror.h
 include/qgis/qgsgeometrycheckerutils.h
 include/qgis/qgsgeometrycheckfactory.h
 include/qgis/qgsgeometrycheckregistry.h
+include/qgis/qgsgeometrycheckresolutionmethod.h
 include/qgis/qgsgeometrycollection.h
 include/qgis/qgsgeometrycontainedcheck.h
 include/qgis/qgsgeometrydanglecheck.h
@@ -354,11 +411,13 @@ include/qgis/qgsgeometryeditutils.h
 include/qgis/qgsgeometryengine.h
 include/qgis/qgsgeometryfactory.h
 include/qgis/qgsgeometryfollowboundariescheck.h
+include/qgis/qgsgeometrygapcheck.h
 include/qgis/qgsgeometrygeneratorsymbollayer.h
 include/qgis/qgsgeometryholecheck.h
 include/qgis/qgsgeometryisvalidcheck.h
 include/qgis/qgsgeometrylineintersectioncheck.h
 include/qgis/qgsgeometrylinelayerintersectioncheck.h
+include/qgis/qgsgeometrymissingvertexcheck.h
 include/qgis/qgsgeometrymultipartcheck.h
 include/qgis/qgsgeometryoptions.h
 include/qgis/qgsgeometryoverlapcheck.h
@@ -384,6 +443,7 @@ include/qgis/qgsgeopackageprojectstoragedialog.h
 include/qgis/qgsgeopackageprojectstorageguiprovider.h
 include/qgis/qgsgeopackageproviderconnection.h
 include/qgis/qgsgeopackagerasterwritertask.h
+include/qgis/qgsgeopdflayertreemodel.h
 include/qgis/qgsgeos.h
 include/qgis/qgsgloweffect.h
 include/qgis/qgsgml.h
@@ -401,6 +461,8 @@ include/qgis/qgsgraph.h
 include/qgis/qgsgraphanalyzer.h
 include/qgis/qgsgraphbuilder.h
 include/qgis/qgsgraphbuilderinterface.h
+include/qgis/qgsgraphdirector.h
+include/qgis/qgsgraphicsviewmousehandles.h
 include/qgis/qgsgridfilewriter.h
 include/qgis/qgsgroupwmsdatadialog.h
 include/qgis/qgsgui.h
@@ -411,39 +473,55 @@ include/qgis/qgshelp.h
 include/qgis/qgshiddenwidgetfactory.h
 include/qgis/qgshiddenwidgetwrapper.h
 include/qgis/qgshighlight.h
+include/qgis/qgshighlightablecombobox.h
+include/qgis/qgshighlightablelineedit.h
 include/qgis/qgshillshadefilter.h
 include/qgis/qgshillshaderenderer.h
 include/qgis/qgshillshaderendererwidget.h
 include/qgis/qgshistogram.h
 include/qgis/qgshistogramdiagram.h
 include/qgis/qgshistogramwidget.h
+include/qgis/qgshollowscalebarrenderer.h
 include/qgis/qgshstoreutils.h
 include/qgis/qgshtmlannotation.h
 include/qgis/qgshtmlutils.h
 include/qgis/qgshtmlwidgetwrapper.h
 include/qgis/qgshuesaturationfilter.h
+include/qgis/qgsidentifycontext.h
 include/qgis/qgsidentifymenu.h
 include/qgis/qgsidwinterpolator.h
 include/qgis/qgsifeatureselectionmanager.h
 include/qgis/qgsimagecache.h
 include/qgis/qgsimageoperation.h
 include/qgis/qgsindexedfeature.h
+include/qgis/qgsinstallgridshiftdialog.h
 include/qgis/qgsinternalgeometryengine.h
+include/qgis/qgsinterpolatedlinerenderer.h
 include/qgis/qgsinterpolator.h
 include/qgis/qgsinterval.h
 include/qgis/qgsinvertedpolygonrenderer.h
 include/qgis/qgsinvertedpolygonrendererwidget.h
+include/qgis/qgsjoindialog.h
 include/qgis/qgsjsonutils.h
 include/qgis/qgskde.h
 include/qgis/qgskeyvaluefieldformatter.h
 include/qgis/qgskeyvaluewidget.h
 include/qgis/qgskeyvaluewidgetfactory.h
 include/qgis/qgskeyvaluewidgetwrapper.h
+include/qgis/qgslabelengineconfigdialog.h
 include/qgis/qgslabelfeature.h
+include/qgis/qgslabeling.h
 include/qgis/qgslabelingengine.h
 include/qgis/qgslabelingenginesettings.h
 include/qgis/qgslabelinggui.h
+include/qgis/qgslabelingwidget.h
+include/qgis/qgslabellineanchorwidget.h
+include/qgis/qgslabellinesettings.h
+include/qgis/qgslabelobstaclesettings.h
+include/qgis/qgslabelobstaclesettingswidget.h
 include/qgis/qgslabelsearchtree.h
+include/qgis/qgslabelsettingswidgetbase.h
+include/qgis/qgslabelthinningsettings.h
 include/qgis/qgslayerdefinition.h
 include/qgis/qgslayermetadata.h
 include/qgis/qgslayermetadataformatter.h
@@ -453,6 +531,7 @@ include/qgis/qgslayertree.h
 include/qgis/qgslayertreeembeddedconfigwidget.h
 include/qgis/qgslayertreeembeddedwidgetregistry.h
 include/qgis/qgslayertreeembeddedwidgetsimpl.h
+include/qgis/qgslayertreefilterproxymodel.h
 include/qgis/qgslayertreegroup.h
 include/qgis/qgslayertreelayer.h
 include/qgis/qgslayertreemapcanvasbridge.h
@@ -466,8 +545,12 @@ include/qgis/qgslayertreeviewdefaultactions.h
 include/qgis/qgslayertreeviewindicator.h
 include/qgis/qgslayertreeviewitemdelegate.h
 include/qgis/qgslayout.h
+include/qgis/qgslayoutaddpagesdialog.h
 include/qgis/qgslayoutaligner.h
 include/qgis/qgslayoutatlas.h
+include/qgis/qgslayoutatlaswidget.h
+include/qgis/qgslayoutattributeselectiondialog.h
+include/qgis/qgslayoutattributetablewidget.h
 include/qgis/qgslayoutcombobox.h
 include/qgis/qgslayoutcustomdrophandler.h
 include/qgis/qgslayoutdesignerinterface.h
@@ -477,6 +560,10 @@ include/qgis/qgslayoutframe.h
 include/qgis/qgslayoutgeopdfexporter.h
 include/qgis/qgslayoutgridsettings.h
 include/qgis/qgslayoutguidecollection.h
+include/qgis/qgslayoutguidewidget.h
+include/qgis/qgslayoutguiutils.h
+include/qgis/qgslayouthtmlwidget.h
+include/qgis/qgslayoutimageexportoptionsdialog.h
 include/qgis/qgslayoutitem.h
 include/qgis/qgslayoutitemattributetable.h
 include/qgis/qgslayoutitemcombobox.h
@@ -486,10 +573,12 @@ include/qgis/qgslayoutitemguiregistry.h
 include/qgis/qgslayoutitemhtml.h
 include/qgis/qgslayoutitemlabel.h
 include/qgis/qgslayoutitemlegend.h
+include/qgis/qgslayoutitemmanualtable.h
 include/qgis/qgslayoutitemmap.h
 include/qgis/qgslayoutitemmapgrid.h
 include/qgis/qgslayoutitemmapitem.h
 include/qgis/qgslayoutitemmapoverview.h
+include/qgis/qgslayoutitemmarker.h
 include/qgis/qgslayoutitemnodeitem.h
 include/qgis/qgslayoutitempage.h
 include/qgis/qgslayoutitempicture.h
@@ -498,10 +587,18 @@ include/qgis/qgslayoutitempolyline.h
 include/qgis/qgslayoutitemregistry.h
 include/qgis/qgslayoutitemscalebar.h
 include/qgis/qgslayoutitemshape.h
+include/qgis/qgslayoutitemslistview.h
 include/qgis/qgslayoutitemtexttable.h
 include/qgis/qgslayoutitemundocommand.h
 include/qgis/qgslayoutitemwidget.h
+include/qgis/qgslayoutlabelwidget.h
+include/qgis/qgslayoutlegendlayersdialog.h
+include/qgis/qgslayoutlegendwidget.h
 include/qgis/qgslayoutmanager.h
+include/qgis/qgslayoutmanualtablewidget.h
+include/qgis/qgslayoutmapgridwidget.h
+include/qgis/qgslayoutmapwidget.h
+include/qgis/qgslayoutmarkerwidget.h
 include/qgis/qgslayoutmeasurement.h
 include/qgis/qgslayoutmeasurementconverter.h
 include/qgis/qgslayoutmodel.h
@@ -509,17 +606,28 @@ include/qgis/qgslayoutmousehandles.h
 include/qgis/qgslayoutmultiframe.h
 include/qgis/qgslayoutmultiframeundocommand.h
 include/qgis/qgslayoutnewitempropertiesdialog.h
+include/qgis/qgslayoutnortharrowhandler.h
 include/qgis/qgslayoutobject.h
 include/qgis/qgslayoutpagecollection.h
+include/qgis/qgslayoutpagepropertieswidget.h
+include/qgis/qgslayoutpdfexportoptionsdialog.h
+include/qgis/qgslayoutpicturewidget.h
 include/qgis/qgslayoutpoint.h
+include/qgis/qgslayoutpolygonwidget.h
+include/qgis/qgslayoutpolylinewidget.h
+include/qgis/qgslayoutpropertieswidget.h
+include/qgis/qgslayoutqptdrophandler.h
 include/qgis/qgslayoutrendercontext.h
 include/qgis/qgslayoutreportcontext.h
 include/qgis/qgslayoutreportsectionlabel.h
 include/qgis/qgslayoutruler.h
+include/qgis/qgslayoutscalebarwidget.h
 include/qgis/qgslayoutserializableobject.h
+include/qgis/qgslayoutshapewidget.h
 include/qgis/qgslayoutsize.h
 include/qgis/qgslayoutsnapper.h
 include/qgis/qgslayouttable.h
+include/qgis/qgslayouttablebackgroundcolorsdialog.h
 include/qgis/qgslayouttablecolumn.h
 include/qgis/qgslayoutundocommand.h
 include/qgis/qgslayoutundostack.h
@@ -540,6 +648,9 @@ include/qgis/qgslayoutviewtooltemporarykeyzoom.h
 include/qgis/qgslayoutviewtooltemporarymousepan.h
 include/qgis/qgslayoutviewtoolzoom.h
 include/qgis/qgslegendfilterbutton.h
+include/qgis/qgslegendpatchshape.h
+include/qgis/qgslegendpatchshapebutton.h
+include/qgis/qgslegendpatchshapewidget.h
 include/qgis/qgslegendrenderer.h
 include/qgis/qgslegendsettings.h
 include/qgis/qgslegendstyle.h
@@ -555,7 +666,9 @@ include/qgis/qgslistfieldformatter.h
 include/qgis/qgslistwidget.h
 include/qgis/qgslistwidgetfactory.h
 include/qgis/qgslistwidgetwrapper.h
+include/qgis/qgslocaldefaultsettings.h
 include/qgis/qgslocalec.h
+include/qgis/qgslocalizeddatapathregistry.h
 include/qgis/qgslocator.h
 include/qgis/qgslocatorcontext.h
 include/qgis/qgslocatorfilter.h
@@ -566,12 +679,17 @@ include/qgis/qgslogger.h
 include/qgis/qgslonglongvalidator.h
 include/qgis/qgsludialog.h
 include/qgis/qgsmanageconnectionsdialog.h
+include/qgis/qgsmapboxglstyleconverter.h
 include/qgis/qgsmapcanvas.h
 include/qgis/qgsmapcanvasannotationitem.h
+include/qgis/qgsmapcanvasinteractionblocker.h
 include/qgis/qgsmapcanvasitem.h
 include/qgis/qgsmapcanvasmap.h
 include/qgis/qgsmapcanvassnappingutils.h
 include/qgis/qgsmapcanvastracer.h
+include/qgis/qgsmapcanvasutils.h
+include/qgis/qgsmapclippingregion.h
+include/qgis/qgsmapclippingutils.h
 include/qgis/qgsmapdecoration.h
 include/qgis/qgsmaphittest.h
 include/qgis/qgsmaplayer.h
@@ -581,14 +699,18 @@ include/qgis/qgsmaplayerconfigwidget.h
 include/qgis/qgsmaplayerconfigwidgetfactory.h
 include/qgis/qgsmaplayerdependency.h
 include/qgis/qgsmaplayerlegend.h
+include/qgis/qgsmaplayerloadstyledialog.h
 include/qgis/qgsmaplayermodel.h
 include/qgis/qgsmaplayerproxymodel.h
 include/qgis/qgsmaplayerref.h
 include/qgis/qgsmaplayerrenderer.h
 include/qgis/qgsmaplayerstore.h
 include/qgis/qgsmaplayerstyle.h
+include/qgis/qgsmaplayerstylecategoriesmodel.h
+include/qgis/qgsmaplayerstyleguiutils.h
 include/qgis/qgsmaplayerstylemanager.h
 include/qgis/qgsmaplayerstylemanagerwidget.h
+include/qgis/qgsmaplayertemporalproperties.h
 include/qgis/qgsmapmouseevent.h
 include/qgis/qgsmapoverviewcanvas.h
 include/qgis/qgsmaprenderercache.h
@@ -618,24 +740,50 @@ include/qgis/qgsmaptopixelgeometrysimplifier.h
 include/qgis/qgsmapunitscale.h
 include/qgis/qgsmargins.h
 include/qgis/qgsmarkersymbollayer.h
+include/qgis/qgsmaskidprovider.h
+include/qgis/qgsmaskingwidget.h
+include/qgis/qgsmasksourceselectionwidget.h
+include/qgis/qgsmasksymbollayerwidget.h
 include/qgis/qgsmasterlayoutinterface.h
+include/qgis/qgsmaterialsettingswidget.h
+include/qgis/qgsmbtiles.h
 include/qgis/qgsmemoryfeatureiterator.h
 include/qgis/qgsmemoryprovider.h
 include/qgis/qgsmemoryproviderutils.h
 include/qgis/qgsmenuheader.h
+include/qgis/qgsmesh3daveraging.h
 include/qgis/qgsmeshcalcnode.h
 include/qgis/qgsmeshcalculator.h
 include/qgis/qgsmeshcalcutils.h
+include/qgis/qgsmeshcontours.h
 include/qgis/qgsmeshdataprovider.h
+include/qgis/qgsmeshdataprovidertemporalcapabilities.h
+include/qgis/qgsmeshdataset.h
+include/qgis/qgsmeshdatasetgroupstore.h
+include/qgis/qgsmeshdatasetgrouptreeview.h
+include/qgis/qgsmeshdatasetgrouptreewidget.h
 include/qgis/qgsmeshlayer.h
 include/qgis/qgsmeshlayerinterpolator.h
+include/qgis/qgsmeshlayerproperties.h
 include/qgis/qgsmeshlayerrenderer.h
+include/qgis/qgsmeshlayertemporalproperties.h
 include/qgis/qgsmeshlayerutils.h
 include/qgis/qgsmeshmemorydataprovider.h
+include/qgis/qgsmeshrenderer3daveragingwidget.h
+include/qgis/qgsmeshrendereractivedatasetwidget.h
+include/qgis/qgsmeshrenderermeshsettingswidget.h
+include/qgis/qgsmeshrendererscalarsettingswidget.h
 include/qgis/qgsmeshrenderersettings.h
+include/qgis/qgsmeshrenderervectorsettingswidget.h
+include/qgis/qgsmeshsimplificationsettings.h
 include/qgis/qgsmeshspatialindex.h
+include/qgis/qgsmeshstaticdatasetwidget.h
 include/qgis/qgsmeshtimesettings.h
+include/qgis/qgsmeshtracerenderer.h
+include/qgis/qgsmeshtriangulation.h
+include/qgis/qgsmeshvariablestrokewidthwidget.h
 include/qgis/qgsmeshvectorrenderer.h
+include/qgis/qgsmeshvirtualdatasetgroup.h
 include/qgis/qgsmessagebar.h
 include/qgis/qgsmessagebaritem.h
 include/qgis/qgsmessagelog.h
@@ -644,6 +792,27 @@ include/qgis/qgsmessageoutput.h
 include/qgis/qgsmessageviewer.h
 include/qgis/qgsmetadatawidget.h
 include/qgis/qgsmimedatautils.h
+include/qgis/qgsmodelarrowitem.h
+include/qgis/qgsmodelcomponentgraphicitem.h
+include/qgis/qgsmodeldesignerdialog.h
+include/qgis/qgsmodeldesignerinputstreewidget.h
+include/qgis/qgsmodelgraphicitem.h
+include/qgis/qgsmodelgraphicsscene.h
+include/qgis/qgsmodelgraphicsview.h
+include/qgis/qgsmodelgroupboxdefinitionwidget.h
+include/qgis/qgsmodelinputreorderwidget.h
+include/qgis/qgsmodelsnapper.h
+include/qgis/qgsmodelundocommand.h
+include/qgis/qgsmodelviewmouseevent.h
+include/qgis/qgsmodelviewmousehandles.h
+include/qgis/qgsmodelviewrubberband.h
+include/qgis/qgsmodelviewtool.h
+include/qgis/qgsmodelviewtoolpan.h
+include/qgis/qgsmodelviewtoolselect.h
+include/qgis/qgsmodelviewtooltemporarykeypan.h
+include/qgis/qgsmodelviewtooltemporarykeyzoom.h
+include/qgis/qgsmodelviewtooltemporarymousepan.h
+include/qgis/qgsmodelviewtoolzoom.h
 include/qgis/qgsmultibandcolorrenderer.h
 include/qgis/qgsmultibandcolorrendererwidget.h
 include/qgis/qgsmulticurve.h
@@ -654,6 +823,7 @@ include/qgis/qgsmultipolygon.h
 include/qgis/qgsmultirenderchecker.h
 include/qgis/qgsmultisurface.h
 include/qgis/qgsnative.h
+include/qgis/qgsnativealgorithms.h
 include/qgis/qgsnetworkaccessmanager.h
 include/qgis/qgsnetworkcontentfetcher.h
 include/qgis/qgsnetworkcontentfetcherregistry.h
@@ -666,6 +836,7 @@ include/qgis/qgsnetworkspeedstrategy.h
 include/qgis/qgsnetworkstrategy.h
 include/qgis/qgsnewauxiliaryfielddialog.h
 include/qgis/qgsnewauxiliarylayerdialog.h
+include/qgis/qgsnewdatabasetablenamewidget.h
 include/qgis/qgsnewgeopackagelayerdialog.h
 include/qgis/qgsnewhttpconnection.h
 include/qgis/qgsnewmemorylayerdialog.h
@@ -674,10 +845,16 @@ include/qgis/qgsnewogrconnection.h
 include/qgis/qgsnewsfeedmodel.h
 include/qgis/qgsnewsfeedparser.h
 include/qgis/qgsnewvectorlayerdialog.h
+include/qgis/qgsnewvectortabledialog.h
 include/qgis/qgsninecellfilter.h
 include/qgis/qgsnmeaconnection.h
 include/qgis/qgsnullsymbolrenderer.h
 include/qgis/qgsnullsymbolrendererwidget.h
+include/qgis/qgsnumericformat.h
+include/qgis/qgsnumericformatguiregistry.h
+include/qgis/qgsnumericformatregistry.h
+include/qgis/qgsnumericformatselectorwidget.h
+include/qgis/qgsnumericformatwidget.h
 include/qgis/qgsnumericscalebarrenderer.h
 include/qgis/qgsobjectcustomproperties.h
 include/qgis/qgsofflineediting.h
@@ -691,6 +868,7 @@ include/qgis/qgsogrguiprovider.h
 include/qgis/qgsogrhelperfunctions.h
 include/qgis/qgsogritemguiprovider.h
 include/qgis/qgsogrprovider.h
+include/qgis/qgsogrproxytextcodec.h
 include/qgis/qgsogrsourceselect.h
 include/qgis/qgsogrtransaction.h
 include/qgis/qgsogrutils.h
@@ -720,6 +898,7 @@ include/qgis/qgspanelwidgetstack.h
 include/qgis/qgspasswordlineedit.h
 include/qgis/qgspathresolver.h
 include/qgis/qgspenstylecombobox.h
+include/qgis/qgspercentagenumericformat.h
 include/qgis/qgspiediagram.h
 include/qgis/qgspixmaplabel.h
 include/qgis/qgspluginlayer.h
@@ -732,6 +911,7 @@ include/qgis/qgspointdisplacementrenderer.h
 include/qgis/qgspointdisplacementrendererwidget.h
 include/qgis/qgspointdistancerenderer.h
 include/qgis/qgspointlocator.h
+include/qgis/qgspointlocatorinittask.h
 include/qgis/qgspointxy.h
 include/qgis/qgspolygon.h
 include/qgis/qgspostgresstringutils.h
@@ -739,65 +919,87 @@ include/qgis/qgspresetcolorrampdialog.h
 include/qgis/qgsprevieweffect.h
 include/qgis/qgsprintlayout.h
 include/qgis/qgsprocessing.h
+include/qgis/qgsprocessingaggregatewidgets.h
+include/qgis/qgsprocessingaggregatewidgetwrapper.h
 include/qgis/qgsprocessingalgorithm.h
 include/qgis/qgsprocessingalgorithmconfigurationwidget.h
 include/qgis/qgsprocessingalgorithmdialogbase.h
 include/qgis/qgsprocessingalgrunnertask.h
 include/qgis/qgsprocessingconfigurationwidgets.h
 include/qgis/qgsprocessingcontext.h
+include/qgis/qgsprocessingenummodelerwidget.h
+include/qgis/qgsprocessingfeaturesourceoptionswidget.h
 include/qgis/qgsprocessingfeedback.h
+include/qgis/qgsprocessingfieldmapwidgetwrapper.h
 include/qgis/qgsprocessinggui.h
 include/qgis/qgsprocessingguiregistry.h
 include/qgis/qgsprocessingmaplayercombobox.h
+include/qgis/qgsprocessingmatrixmodelerwidget.h
 include/qgis/qgsprocessingmatrixparameterdialog.h
 include/qgis/qgsprocessingmodelalgorithm.h
 include/qgis/qgsprocessingmodelchildalgorithm.h
+include/qgis/qgsprocessingmodelchilddependency.h
 include/qgis/qgsprocessingmodelchildparametersource.h
+include/qgis/qgsprocessingmodelcomment.h
 include/qgis/qgsprocessingmodelcomponent.h
 include/qgis/qgsprocessingmodelerparameterwidget.h
+include/qgis/qgsprocessingmodelgroupbox.h
 include/qgis/qgsprocessingmodeloutput.h
 include/qgis/qgsprocessingmodelparameter.h
 include/qgis/qgsprocessingmultipleselectiondialog.h
+include/qgis/qgsprocessingoutputdestinationwidget.h
 include/qgis/qgsprocessingoutputs.h
+include/qgis/qgsprocessingparameteraggregate.h
 include/qgis/qgsprocessingparameterdefinitionwidget.h
+include/qgis/qgsprocessingparameterfieldmap.h
 include/qgis/qgsprocessingparameters.h
+include/qgis/qgsprocessingparameterswidget.h
+include/qgis/qgsprocessingparametertininputlayers.h
 include/qgis/qgsprocessingparametertype.h
 include/qgis/qgsprocessingparametertypeimpl.h
+include/qgis/qgsprocessingparametervectortilewriterlayers.h
 include/qgis/qgsprocessingprovider.h
 include/qgis/qgsprocessingrecentalgorithmlog.h
 include/qgis/qgsprocessingregistry.h
+include/qgis/qgsprocessingtininputlayerswidget.h
 include/qgis/qgsprocessingtoolboxmodel.h
 include/qgis/qgsprocessingtoolboxtreeview.h
 include/qgis/qgsprocessingutils.h
+include/qgis/qgsprocessingvectortilewriterlayerswidgetwrapper.h
 include/qgis/qgsprocessingwidgetwrapper.h
 include/qgis/qgsprocessingwidgetwrapperimpl.h
 include/qgis/qgsproject.h
 include/qgis/qgsprojectbadlayerhandler.h
+include/qgis/qgsprojectdisplaysettings.h
 include/qgis/qgsprojectfiletransform.h
 include/qgis/qgsprojectionselectiondialog.h
 include/qgis/qgsprojectionselectiontreewidget.h
 include/qgis/qgsprojectionselectionwidget.h
 include/qgis/qgsprojectmetadata.h
 include/qgis/qgsprojectproperty.h
+include/qgis/qgsprojectservervalidator.h
 include/qgis/qgsprojectstorage.h
 include/qgis/qgsprojectstorageguiprovider.h
 include/qgis/qgsprojectstorageguiregistry.h
 include/qgis/qgsprojectstorageregistry.h
 include/qgis/qgsprojectstylealgorithms.h
+include/qgis/qgsprojecttimesettings.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
 include/qgis/qgspropertyassistantwidget.h
 include/qgis/qgspropertycollection.h
 include/qgis/qgspropertyoverridebutton.h
 include/qgis/qgspropertytransformer.h
+include/qgis/qgsproviderconnectioncombobox.h
+include/qgis/qgsproviderconnectionmodel.h
 include/qgis/qgsproviderguimetadata.h
 include/qgis/qgsproviderguiregistry.h
 include/qgis/qgsprovidermetadata.h
 include/qgis/qgsproviderregistry.h
+include/qgis/qgsproxyfeaturesink.h
 include/qgis/qgsproxyprogresstask.h
 include/qgis/qgsproxystyle.h
 include/qgis/qgspythonrunner.h
@@ -817,7 +1019,10 @@ include/qgis/qgsrasterblock.h
 include/qgis/qgsrastercalcnode.h
 include/qgis/qgsrastercalculator.h
 include/qgis/qgsrasterchecker.h
+include/qgis/qgsrastercontourrenderer.h
+include/qgis/qgsrastercontourrendererwidget.h
 include/qgis/qgsrasterdataprovider.h
+include/qgis/qgsrasterdataprovidertemporalcapabilities.h
 include/qgis/qgsrasterdrawer.h
 include/qgis/qgsrasterfilewriter.h
 include/qgis/qgsrasterfilewritertask.h
@@ -828,8 +1033,11 @@ include/qgis/qgsrasteridentifyresult.h
 include/qgis/qgsrasterinterface.h
 include/qgis/qgsrasteriterator.h
 include/qgis/qgsrasterlayer.h
+include/qgis/qgsrasterlayerproperties.h
 include/qgis/qgsrasterlayerrenderer.h
 include/qgis/qgsrasterlayersaveasdialog.h
+include/qgis/qgsrasterlayertemporalproperties.h
+include/qgis/qgsrasterlayertemporalpropertieswidget.h
 include/qgis/qgsrastermatrix.h
 include/qgis/qgsrasterminmaxorigin.h
 include/qgis/qgsrasterminmaxwidget.h
@@ -840,6 +1048,8 @@ include/qgis/qgsrasterpyramid.h
 include/qgis/qgsrasterpyramidsoptionswidget.h
 include/qgis/qgsrasterrange.h
 include/qgis/qgsrasterrenderer.h
+include/qgis/qgsrasterrendererregistry.h
+include/qgis/qgsrasterrendererutils.h
 include/qgis/qgsrasterrendererwidget.h
 include/qgis/qgsrasterresamplefilter.h
 include/qgis/qgsrasterresampler.h
@@ -868,10 +1078,12 @@ include/qgis/qgsrelationreferencewidget.h
 include/qgis/qgsrelationreferencewidgetwrapper.h
 include/qgis/qgsrelationwidgetwrapper.h
 include/qgis/qgsrelief.h
+include/qgis/qgsremappingproxyfeaturesink.h
 include/qgis/qgsrenderchecker.h
 include/qgis/qgsrendercontext.h
 include/qgis/qgsrenderedfeaturehandlerinterface.h
 include/qgis/qgsrenderer.h
+include/qgis/qgsrenderermeshpropertieswidget.h
 include/qgis/qgsrendererpropertiesdialog.h
 include/qgis/qgsrendererrange.h
 include/qgis/qgsrendererrasterpropertieswidget.h
@@ -880,14 +1092,17 @@ include/qgis/qgsrendererwidget.h
 include/qgis/qgsreport.h
 include/qgis/qgsreportsectionfieldgroup.h
 include/qgis/qgsreportsectionlayout.h
+include/qgis/qgsresamplingutils.h
 include/qgis/qgsrubberband.h
 include/qgis/qgsruggednessfilter.h
 include/qgis/qgsrulebasedlabeling.h
+include/qgis/qgsrulebasedlabelingwidget.h
 include/qgis/qgsrulebasedrenderer.h
 include/qgis/qgsrulebasedrendererwidget.h
 include/qgis/qgsrunprocess.h
 include/qgis/qgsruntimeprofiler.h
 include/qgis/qgsscalebarrenderer.h
+include/qgis/qgsscalebarrendererregistry.h
 include/qgis/qgsscalebarsettings.h
 include/qgis/qgsscalecalculator.h
 include/qgis/qgsscalecombobox.h
@@ -895,6 +1110,7 @@ include/qgis/qgsscalerangewidget.h
 include/qgis/qgsscaleutils.h
 include/qgis/qgsscalevisibilitydialog.h
 include/qgis/qgsscalewidget.h
+include/qgis/qgsscientificnumericformat.h
 include/qgis/qgsscrollarea.h
 include/qgis/qgssearchquerybuilder.h
 include/qgis/qgssearchwidgettoolbutton.h
@@ -919,20 +1135,24 @@ include/qgis/qgssnapindicator.h
 include/qgis/qgssnappingconfig.h
 include/qgis/qgssnappingutils.h
 include/qgis/qgssnaptogridcanvasitem.h
+include/qgis/qgssourcecache.h
+include/qgis/qgssourcefieldsproperties.h
 include/qgis/qgssourceselectprovider.h
 include/qgis/qgssourceselectproviderregistry.h
 include/qgis/qgsspatialindex.h
 include/qgis/qgsspatialindexkdbush.h
-include/qgis/qgsspatialindexkdbush_p.h
 include/qgis/qgsspatialindexkdbushdata.h
+include/qgis/qgsspatialindexutils.h
 include/qgis/qgsspatialiteutils.h
 include/qgis/qgsspinbox.h
 include/qgis/qgssqlcomposerdialog.h
 include/qgis/qgssqlexpressioncompiler.h
 include/qgis/qgssqliteutils.h
 include/qgis/qgssqlstatement.h
+include/qgis/qgsstackedbardiagram.h
 include/qgis/qgsstatisticalsummary.h
 include/qgis/qgsstatusbar.h
+include/qgis/qgssteppedlinescalebarrenderer.h
 include/qgis/qgsstoredexpressionmanager.h
 include/qgis/qgsstringstatisticalsummary.h
 include/qgis/qgsstringutils.h
@@ -953,35 +1173,58 @@ include/qgis/qgssvgselectorwidget.h
 include/qgis/qgssymbol.h
 include/qgis/qgssymbolbutton.h
 include/qgis/qgssymbollayer.h
+include/qgis/qgssymbollayerreference.h
 include/qgis/qgssymbollayerregistry.h
+include/qgis/qgssymbollayerselectionwidget.h
 include/qgis/qgssymbollayerutils.h
 include/qgis/qgssymbollayerwidget.h
 include/qgis/qgssymbollevelsdialog.h
 include/qgis/qgssymbolselectordialog.h
 include/qgis/qgssymbolslistwidget.h
 include/qgis/qgssymbolwidgetcontext.h
+include/qgis/qgstablecell.h
+include/qgis/qgstableeditordialog.h
+include/qgis/qgstableeditorformattingwidget.h
+include/qgis/qgstableeditorwidget.h
 include/qgis/qgstablewidgetbase.h
 include/qgis/qgstablewidgetitem.h
 include/qgis/qgstabwidget.h
 include/qgis/qgstaskmanager.h
 include/qgis/qgstaskmanagerwidget.h
+include/qgis/qgstemporalcontroller.h
+include/qgis/qgstemporalcontrollerwidget.h
+include/qgis/qgstemporalmapsettingswidget.h
+include/qgis/qgstemporalnavigationobject.h
+include/qgis/qgstemporalproperty.h
+include/qgis/qgstemporalrangeobject.h
+include/qgis/qgstemporalutils.h
 include/qgis/qgstessellator.h
 include/qgis/qgstest.h
 include/qgis/qgstestutils.h
 include/qgis/qgstextannotation.h
+include/qgis/qgstextbackgroundsettings.h
+include/qgis/qgstextblock.h
+include/qgis/qgstextbuffersettings.h
+include/qgis/qgstextcharacterformat.h
 include/qgis/qgstextdiagram.h
+include/qgis/qgstextdocument.h
 include/qgis/qgstexteditconfigdlg.h
 include/qgis/qgstexteditsearchwidgetwrapper.h
 include/qgis/qgstexteditwidgetfactory.h
 include/qgis/qgstexteditwrapper.h
+include/qgis/qgstextformat.h
 include/qgis/qgstextformatwidget.h
+include/qgis/qgstextfragment.h
 include/qgis/qgstextlabelfeature.h
+include/qgis/qgstextmasksettings.h
 include/qgis/qgstextpreview.h
 include/qgis/qgstextrenderer.h
-include/qgis/qgstextrenderer_p.h
+include/qgis/qgstextrendererutils.h
+include/qgis/qgstextshadowsettings.h
 include/qgis/qgsthreadingutils.h
 include/qgis/qgsticksscalebarrenderer.h
 include/qgis/qgstilecache.h
+include/qgis/qgstiles.h
 include/qgis/qgstininterpolator.h
 include/qgis/qgstolerance.h
 include/qgis/qgstotalcurvaturefilter.h
@@ -994,6 +1237,7 @@ include/qgis/qgstranslationcontext.h
 include/qgis/qgstreewidgetitem.h
 include/qgis/qgstriangle.h
 include/qgis/qgstriangularmesh.h
+include/qgis/qgstriangulation.h
 include/qgis/qgsuniquevaluesconfigdlg.h
 include/qgis/qgsuniquevaluewidgetfactory.h
 include/qgis/qgsuniquevaluewidgetwrapper.h
@@ -1021,6 +1265,7 @@ include/qgis/qgsvector.h
 include/qgis/qgsvector3d.h
 include/qgis/qgsvectordataprovider.h
 include/qgis/qgsvectordataproviderfeaturepool.h
+include/qgis/qgsvectordataprovidertemporalcapabilities.h
 include/qgis/qgsvectorfieldsymbollayer.h
 include/qgis/qgsvectorfieldsymbollayerwidget.h
 include/qgis/qgsvectorfilewriter.h
@@ -1035,36 +1280,67 @@ include/qgis/qgsvectorlayereditutils.h
 include/qgis/qgsvectorlayerexporter.h
 include/qgis/qgsvectorlayerfeaturecounter.h
 include/qgis/qgsvectorlayerfeatureiterator.h
+include/qgis/qgsvectorlayerfeaturepool.h
 include/qgis/qgsvectorlayerjoinbuffer.h
 include/qgis/qgsvectorlayerjoininfo.h
 include/qgis/qgsvectorlayerlabeling.h
 include/qgis/qgsvectorlayerlabelprovider.h
+include/qgis/qgsvectorlayerlegendwidget.h
+include/qgis/qgsvectorlayerproperties.h
+include/qgis/qgsvectorlayerref.h
 include/qgis/qgsvectorlayerrenderer.h
 include/qgis/qgsvectorlayersaveasdialog.h
+include/qgis/qgsvectorlayersavestyledialog.h
 include/qgis/qgsvectorlayerselectionmanager.h
 include/qgis/qgsvectorlayerserverproperties.h
+include/qgis/qgsvectorlayertemporalproperties.h
+include/qgis/qgsvectorlayertemporalpropertieswidget.h
 include/qgis/qgsvectorlayertools.h
 include/qgis/qgsvectorlayerundocommand.h
 include/qgis/qgsvectorlayerundopassthroughcommand.h
 include/qgis/qgsvectorlayerutils.h
 include/qgis/qgsvectorsimplifymethod.h
+include/qgis/qgsvectortilebasiclabeling.h
+include/qgis/qgsvectortilebasiclabelingwidget.h
+include/qgis/qgsvectortilebasicrenderer.h
+include/qgis/qgsvectortilebasicrendererwidget.h
+include/qgis/qgsvectortileconnection.h
+include/qgis/qgsvectortileconnectiondialog.h
+include/qgis/qgsvectortiledataitemguiprovider.h
+include/qgis/qgsvectortiledataitems.h
+include/qgis/qgsvectortilelabeling.h
+include/qgis/qgsvectortilelayer.h
+include/qgis/qgsvectortilelayerrenderer.h
+include/qgis/qgsvectortileloader.h
+include/qgis/qgsvectortilemvtdecoder.h
+include/qgis/qgsvectortilemvtencoder.h
+include/qgis/qgsvectortilemvtutils.h
+include/qgis/qgsvectortileproviderguimetadata.h
+include/qgis/qgsvectortileprovidermetadata.h
+include/qgis/qgsvectortilerenderer.h
+include/qgis/qgsvectortilesourceselect.h
+include/qgis/qgsvectortileutils.h
+include/qgis/qgsvectortilewriter.h
 include/qgis/qgsvertexmarker.h
 include/qgis/qgsvirtuallayerdefinition.h
 include/qgis/qgsvirtuallayerdefinitionutils.h
 include/qgis/qgsvirtuallayertask.h
 include/qgis/qgsvscrollarea.h
+include/qgis/qgsweakrelation.h
 include/qgis/qgswebframe.h
 include/qgis/qgswebpage.h
 include/qgis/qgswebview.h
-include/qgis/qgswidgetstatehelper_p.h
 include/qgis/qgswidgetwrapper.h
 include/qgis/qgswindowmanagerinterface.h
 include/qgis/qgswkbptr.h
 include/qgis/qgswkbtypes.h
+include/qgis/qgswmsdimensiondialog.h
 include/qgis/qgsxmlutils.h
 include/qgis/qgsziputils.h
 include/qgis/qgszonalstatistics.h
 include/qgis/qobjectuniqueptr.h
+include/qgis/ui_qgsadvanceddigitizingdockwidgetbase.h
+include/qgis/ui_qgsadvanceddigitizingfloaterbase.h
 include/qgis/ui_qgsarcgisservicesourceselectbase.h
 include/qgis/ui_qgsauthauthoritieseditor.h
 include/qgis/ui_qgsauthcertificateinfo.h
@@ -1088,18 +1364,38 @@ include/qgis/ui_qgsauthsslimporterrors.h
 include/qgis/ui_qgsauthtrustedcasdialog.h
 include/qgis/ui_qgscredentialdialog.h
 include/qgis/ui_qgsdetaileditemwidgetbase.h
+include/qgis/ui_qgseffectstackpropertieswidgetbase.h
 include/qgis/ui_qgsexpressionbuilder.h
 include/qgis/ui_qgsexpressionbuilderdialogbase.h
 include/qgis/ui_qgsexpressionselectiondialogbase.h
+include/qgis/ui_qgsexpressionstoredialogbase.h
+include/qgis/ui_qgsfeaturefilterwidget.h
 include/qgis/ui_qgsgenericprojectionselectorbase.h
+include/qgis/ui_qgslayertreeembeddedconfigwidgetbase.h
+include/qgis/ui_qgslayoutguidewidgetbase.h
+include/qgis/ui_qgslayoutimageexportoptions.h
+include/qgis/ui_qgslayoutitemwidgetbase.h
+include/qgis/ui_qgslayoutnewpagedialog.h
+include/qgis/ui_qgslayoutpagepropertieswidget.h
+include/qgis/ui_qgslayoutwidgetbase.h
+include/qgis/ui_qgsmeshdatasetgrouptreewidgetbase.h
+include/qgis/ui_qgsmeshlayerpropertiesbase.h
+include/qgis/ui_qgsmeshstaticdatasetwidgetbase.h
 include/qgis/ui_qgsmessagelogviewer.h
 include/qgis/ui_qgsmessageviewer.h
+include/qgis/ui_qgsnewvectortabledialogbase.h
 include/qgis/ui_qgsowssourceselectbase.h
+include/qgis/ui_qgspdfexportoptions.h
 include/qgis/ui_qgsprojectionselectorbase.h
 include/qgis/ui_qgsquerybuilderbase.h
+include/qgis/ui_qgsrasterlayerpropertiesbase.h
+include/qgis/ui_qgsrenderercontainerbase.h
+include/qgis/ui_qgsrendererpropsdialogbase.h
 include/qgis/ui_qgssqlcomposerdialogbase.h
 include/qgis/ui_qgssublayersdialogbase.h
 include/qgis/ui_qgstablewidgetuibase.h
+include/qgis/ui_qgsvectorlayerpropertiesbase.h
+include/qgis/vector_tile.pb.h
 lib/libqgis_analysis.so
 lib/libqgis_analysis.so.${PKGVERSION}
 lib/libqgis_app.so
@@ -1114,14 +1410,11 @@ lib/qgis/crssync
 lib/qgis/plugins/libarcgisfeatureserverprovider.so
 lib/qgis/plugins/libarcgismapserverprovider.so
 lib/qgis/plugins/libbasicauthmethod.so
-lib/qgis/plugins/libcoordinatecaptureplugin.so
 lib/qgis/plugins/libdb2provider.so
 lib/qgis/plugins/libdelimitedtextprovider.so
 lib/qgis/plugins/libesritokenauthmethod.so
-lib/qgis/plugins/libevis.so
 lib/qgis/plugins/libgeometrycheckerplugin.so
 lib/qgis/plugins/libgeonodeprovider.so
-lib/qgis/plugins/libgeorefplugin.so
 lib/qgis/plugins/libgpsimporterplugin.so
 lib/qgis/plugins/libgpxprovider.so
 lib/qgis/plugins/libidentcertauthmethod.so
@@ -1133,6 +1426,7 @@ lib/qgis/plugins/libowsprovider.so
 lib/qgis/plugins/libpkcs12authmethod.so
 lib/qgis/plugins/libpkipathsauthmethod.so
 lib/qgis/plugins/libpostgresprovider.so
+lib/qgis/plugins/libpostgresrasterprovider.so
 lib/qgis/plugins/libspatialiteprovider.so
 lib/qgis/plugins/libtopolplugin.so
 lib/qgis/plugins/libvirtuallayerprovider.so
@@ -1248,8 +1542,10 @@ share/qgis/FindQGIS.cmake
 share/qgis/doc/AUTHORS
 share/qgis/doc/CONTRIBUTORS
 share/qgis/doc/DONORS
-share/qgis/doc/INSTALL
+share/qgis/doc/INSTALL.md
 share/qgis/doc/LICENSE
+share/qgis/doc/NEWS.html
+share/qgis/doc/NEWS.md
 share/qgis/doc/SPONSORS
 share/qgis/doc/TRANSLATORS
 share/qgis/doc/developersmap.html
@@ -1291,7 +1587,6 @@ share/qgis/doc/images/projects/thumbnails/e24951be1e5ff2d6fd591f9760871e38a684be
 share/qgis/doc/images/projects/thumbnails/f6379f3083e612fd47917e1f948d795b6951dde9.png.200x100_q85.png
 share/qgis/doc/images/qgis-icon-60x60.png
 share/qgis/doc/index.html
-share/qgis/doc/news.html
 share/qgis/doc/nohelp.html
 share/qgis/doc/style.css
 share/qgis/i18n/qgis_ar.qm
@@ -1308,9 +1603,7 @@ share/qgis/i18n/qgis_eu.qm
 share/qgis/i18n/qgis_fi.qm
 share/qgis/i18n/qgis_fr.qm
 share/qgis/i18n/qgis_gl.qm
-share/qgis/i18n/qgis_hi.qm
 share/qgis/i18n/qgis_hu.qm
-share/qgis/i18n/qgis_id.qm
 share/qgis/i18n/qgis_is.qm
 share/qgis/i18n/qgis_it.qm
 share/qgis/i18n/qgis_ja.qm
@@ -1326,9 +1619,7 @@ share/qgis/i18n/qgis_pt_PT.qm
 share/qgis/i18n/qgis_ro.qm
 share/qgis/i18n/qgis_ru.qm
 share/qgis/i18n/qgis_sc.qm
-share/qgis/i18n/qgis_sl.qm
 share/qgis/i18n/qgis_sv.qm
-share/qgis/i18n/qgis_tr.qm
 share/qgis/i18n/qgis_uk.qm
 share/qgis/i18n/qgis_vi.qm
 share/qgis/i18n/qgis_zh-Hans.qm
@@ -1339,6 +1630,14 @@ share/qgis/images/icons/qgis-icon-512x512.png
 share/qgis/images/icons/qgis-icon-60x60.png
 share/qgis/images/icons/qgis-icon-macos.png
 share/qgis/images/icons/qgis-mime-icon.png
+share/qgis/images/icons/sponsor_medals/2010/bronze_medal_2010.png
+share/qgis/images/icons/sponsor_medals/2010/gold_medal_2010.png
+share/qgis/images/icons/sponsor_medals/2010/platin_medal_2010.png
+share/qgis/images/icons/sponsor_medals/2010/silver_medal_2010.png
+share/qgis/images/icons/sponsor_medals/2011/bronze_medal_2011.png
+share/qgis/images/icons/sponsor_medals/2011/gold_medal_2011.png
+share/qgis/images/icons/sponsor_medals/2011/platin_medal_2011.png
+share/qgis/images/icons/sponsor_medals/2011/silver_medal_2011.png
 share/qgis/resources/2to3migration.txt
 share/qgis/resources/cpt-city-qgis-min/README-qgis.txt
 share/qgis/resources/cpt-city-qgis-min/README.txt
@@ -2536,6 +2835,8 @@ share/qgis/resources/data/contributors.json
 share/qgis/resources/data/contributors.qml
 share/qgis/resources/data/qgis-hackfests.json
 share/qgis/resources/data/qgis-hackfests.qml
+share/qgis/resources/data/user_groups.qml
+share/qgis/resources/data/user_groups_data.json
 share/qgis/resources/data/world_map.gpkg
 share/qgis/resources/data/world_map_generalize.model3
 share/qgis/resources/metadata-ISO/LinkPropertyLookupTable.csv
@@ -2904,6 +3205,7 @@ share/qgis/svg/transport/transport_car_share.svg
 share/qgis/svg/transport/transport_ford.svg
 share/qgis/svg/transport/transport_fuel.svg
 share/qgis/svg/transport/transport_fuel_lpg.svg
+share/qgis/svg/transport/transport_helicopter.svg
 share/qgis/svg/transport/transport_lighthouse.svg
 share/qgis/svg/transport/transport_marina.svg
 share/qgis/svg/transport/transport_parking.svg
diff --git a/geography/qgis/PLIST.python b/geography/qgis/PLIST.python
index 9c6ec446305..27efb2d7936 100644
--- a/geography/qgis/PLIST.python
+++ b/geography/qgis/PLIST.python
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.python,v 1.6 2020/06/21 13:51:49 gdt Exp $
+@comment $NetBSD: PLIST.python,v 1.7 2021/03/01 00:03:35 gdt Exp $
 lib/libqgispython.so
 lib/libqgispython.so.${PKGVERSION}
 share/qgis/python/console/__init__.py
@@ -145,6 +145,7 @@ share/qgis/python/plugins/processing/algs/gdal/ClipRasterByMask.py
 share/qgis/python/plugins/processing/algs/gdal/ClipVectorByExtent.py
 share/qgis/python/plugins/processing/algs/gdal/ClipVectorByMask.py
 share/qgis/python/plugins/processing/algs/gdal/ColorRelief.py
+share/qgis/python/plugins/processing/algs/gdal/Datasources2Vrt.py
 share/qgis/python/plugins/processing/algs/gdal/Dissolve.py
 share/qgis/python/plugins/processing/algs/gdal/ExecuteSql.py
 share/qgis/python/plugins/processing/algs/gdal/GdalAlgorithm.py
@@ -177,7 +178,6 @@ share/qgis/python/plugins/processing/algs/gdal/hillshade.py
 share/qgis/python/plugins/processing/algs/gdal/merge.py
 share/qgis/python/plugins/processing/algs/gdal/nearblack.py
 share/qgis/python/plugins/processing/algs/gdal/ogr2ogr.py
-share/qgis/python/plugins/processing/algs/gdal/ogr2ogrtabletopostgislist.py
 share/qgis/python/plugins/processing/algs/gdal/ogr2ogrtopostgislist.py
 share/qgis/python/plugins/processing/algs/gdal/ogrinfo.py
 share/qgis/python/plugins/processing/algs/gdal/pansharp.py
@@ -198,6 +198,7 @@ share/qgis/python/plugins/processing/algs/gdal/translate.py
 share/qgis/python/plugins/processing/algs/gdal/tri.py
 share/qgis/python/plugins/processing/algs/gdal/ui/RasterOptionsWidget.py
 share/qgis/python/plugins/processing/algs/gdal/ui/__init__.py
+share/qgis/python/plugins/processing/algs/gdal/viewshed.py
 share/qgis/python/plugins/processing/algs/gdal/warp.py
 share/qgis/python/plugins/processing/algs/grass7/Grass7Algorithm.py
 share/qgis/python/plugins/processing/algs/grass7/Grass7AlgorithmProvider.py
@@ -575,6 +576,7 @@ share/qgis/python/plugins/processing/algs/grass7/ext/r_series_interp.py
 share/qgis/python/plugins/processing/algs/grass7/ext/r_shade.py
 share/qgis/python/plugins/processing/algs/grass7/ext/r_statistics.py
 share/qgis/python/plugins/processing/algs/grass7/ext/r_stats_quantile_rast.py
+share/qgis/python/plugins/processing/algs/grass7/ext/r_tileset.py
 share/qgis/python/plugins/processing/algs/grass7/ext/r_what_color.py
 share/qgis/python/plugins/processing/algs/grass7/ext/v_distance.py
 share/qgis/python/plugins/processing/algs/grass7/ext/v_edit.py
@@ -613,9 +615,6 @@ share/qgis/python/plugins/processing/algs/otb/OtbAlgorithmProvider.py
 share/qgis/python/plugins/processing/algs/otb/OtbChoiceWidget.py
 share/qgis/python/plugins/processing/algs/otb/OtbUtils.py
 share/qgis/python/plugins/processing/algs/otb/__init__.py
-share/qgis/python/plugins/processing/algs/qgis/AddTableField.py
-share/qgis/python/plugins/processing/algs/qgis/Aggregate.py
-share/qgis/python/plugins/processing/algs/qgis/Aspect.py
 share/qgis/python/plugins/processing/algs/qgis/BarPlot.py
 share/qgis/python/plugins/processing/algs/qgis/BasicStatistics.py
 share/qgis/python/plugins/processing/algs/qgis/BoxPlot.py
@@ -623,28 +622,16 @@ share/qgis/python/plugins/processing/algs/qgis/Buffer.py
 share/qgis/python/plugins/processing/algs/qgis/CheckValidity.py
 share/qgis/python/plugins/processing/algs/qgis/Climb.py
 share/qgis/python/plugins/processing/algs/qgis/ConcaveHull.py
-share/qgis/python/plugins/processing/algs/qgis/CreateAttributeIndex.py
-share/qgis/python/plugins/processing/algs/qgis/CreateConstantRaster.py
-share/qgis/python/plugins/processing/algs/qgis/Datasources2Vrt.py
 share/qgis/python/plugins/processing/algs/qgis/DefineProjection.py
 share/qgis/python/plugins/processing/algs/qgis/Delaunay.py
 share/qgis/python/plugins/processing/algs/qgis/DeleteColumn.py
-share/qgis/python/plugins/processing/algs/qgis/DeleteDuplicateGeometries.py
-share/qgis/python/plugins/processing/algs/qgis/DensifyGeometries.py
 share/qgis/python/plugins/processing/algs/qgis/EliminateSelection.py
 share/qgis/python/plugins/processing/algs/qgis/ExecuteSQL.py
 share/qgis/python/plugins/processing/algs/qgis/ExportGeometryInfo.py
-share/qgis/python/plugins/processing/algs/qgis/ExtentFromLayer.py
-share/qgis/python/plugins/processing/algs/qgis/ExtractSpecificVertices.py
 share/qgis/python/plugins/processing/algs/qgis/FieldPyculator.py
-share/qgis/python/plugins/processing/algs/qgis/FieldsCalculator.py
-share/qgis/python/plugins/processing/algs/qgis/FieldsMapper.py
 share/qgis/python/plugins/processing/algs/qgis/FindProjection.py
-share/qgis/python/plugins/processing/algs/qgis/GeometryByExpression.py
 share/qgis/python/plugins/processing/algs/qgis/GeometryConvert.py
-share/qgis/python/plugins/processing/algs/qgis/Grid.py
 share/qgis/python/plugins/processing/algs/qgis/Heatmap.py
-share/qgis/python/plugins/processing/algs/qgis/Hillshade.py
 share/qgis/python/plugins/processing/algs/qgis/HubDistanceLines.py
 share/qgis/python/plugins/processing/algs/qgis/HubDistancePoints.py
 share/qgis/python/plugins/processing/algs/qgis/HypsometricCurves.py
@@ -656,78 +643,45 @@ share/qgis/python/plugins/processing/algs/qgis/KeepNBiggestParts.py
 share/qgis/python/plugins/processing/algs/qgis/LinesToPolygons.py
 share/qgis/python/plugins/processing/algs/qgis/MeanAndStdDevPlot.py
 share/qgis/python/plugins/processing/algs/qgis/MinimumBoundingGeometry.py
-share/qgis/python/plugins/processing/algs/qgis/NearestNeighbourAnalysis.py
-share/qgis/python/plugins/processing/algs/qgis/Orthogonalize.py
 share/qgis/python/plugins/processing/algs/qgis/PointDistance.py
 share/qgis/python/plugins/processing/algs/qgis/PointsDisplacement.py
 share/qgis/python/plugins/processing/algs/qgis/PointsFromLines.py
-share/qgis/python/plugins/processing/algs/qgis/PointsFromPolygons.py
-share/qgis/python/plugins/processing/algs/qgis/PointsInPolygon.py
-share/qgis/python/plugins/processing/algs/qgis/PointsLayerFromTable.py
 share/qgis/python/plugins/processing/algs/qgis/PointsToPaths.py
 share/qgis/python/plugins/processing/algs/qgis/PolarPlot.py
-share/qgis/python/plugins/processing/algs/qgis/PoleOfInaccessibility.py
-share/qgis/python/plugins/processing/algs/qgis/Polygonize.py
 share/qgis/python/plugins/processing/algs/qgis/PostGISExecuteAndLoadSQL.py
-share/qgis/python/plugins/processing/algs/qgis/PostGISExecuteSQL.py
 share/qgis/python/plugins/processing/algs/qgis/QgisAlgorithm.py
 share/qgis/python/plugins/processing/algs/qgis/QgisAlgorithmProvider.py
-share/qgis/python/plugins/processing/algs/qgis/RandomExtract.py
 share/qgis/python/plugins/processing/algs/qgis/RandomExtractWithinSubsets.py
 share/qgis/python/plugins/processing/algs/qgis/RandomPointsAlongLines.py
-share/qgis/python/plugins/processing/algs/qgis/RandomPointsExtent.py
 share/qgis/python/plugins/processing/algs/qgis/RandomPointsLayer.py
 share/qgis/python/plugins/processing/algs/qgis/RandomPointsPolygons.py
 share/qgis/python/plugins/processing/algs/qgis/RandomSelection.py
 share/qgis/python/plugins/processing/algs/qgis/RandomSelectionWithinSubsets.py
 share/qgis/python/plugins/processing/algs/qgis/RasterCalculator.py
 share/qgis/python/plugins/processing/algs/qgis/RasterLayerHistogram.py
-share/qgis/python/plugins/processing/algs/qgis/RasterLayerStatistics.py
-share/qgis/python/plugins/processing/algs/qgis/RasterSampling.py
-share/qgis/python/plugins/processing/algs/qgis/Rasterize.py
-share/qgis/python/plugins/processing/algs/qgis/RectanglesOvalsDiamondsFixed.py
 share/qgis/python/plugins/processing/algs/qgis/RectanglesOvalsDiamondsVariable.py
 share/qgis/python/plugins/processing/algs/qgis/RegularPoints.py
 share/qgis/python/plugins/processing/algs/qgis/Relief.py
-share/qgis/python/plugins/processing/algs/qgis/Ruggedness.py
 share/qgis/python/plugins/processing/algs/qgis/SelectByAttribute.py
 share/qgis/python/plugins/processing/algs/qgis/SelectByExpression.py
-share/qgis/python/plugins/processing/algs/qgis/ServiceAreaFromLayer.py
-share/qgis/python/plugins/processing/algs/qgis/ServiceAreaFromPoint.py
-share/qgis/python/plugins/processing/algs/qgis/SetMValue.py
 share/qgis/python/plugins/processing/algs/qgis/SetRasterStyle.py
 share/qgis/python/plugins/processing/algs/qgis/SetVectorStyle.py
-share/qgis/python/plugins/processing/algs/qgis/SetZValue.py
-share/qgis/python/plugins/processing/algs/qgis/SingleSidedBuffer.py
-share/qgis/python/plugins/processing/algs/qgis/Slope.py
-share/qgis/python/plugins/processing/algs/qgis/SnapGeometries.py
-share/qgis/python/plugins/processing/algs/qgis/SpatialIndex.py
-share/qgis/python/plugins/processing/algs/qgis/SpatialJoin.py
 share/qgis/python/plugins/processing/algs/qgis/SpatialJoinSummary.py
-share/qgis/python/plugins/processing/algs/qgis/SpatialiteExecuteSQL.py
 share/qgis/python/plugins/processing/algs/qgis/StatisticsByCategories.py
-share/qgis/python/plugins/processing/algs/qgis/SumLines.py
 share/qgis/python/plugins/processing/algs/qgis/TextToFloat.py
 share/qgis/python/plugins/processing/algs/qgis/TilesXYZ.py
 share/qgis/python/plugins/processing/algs/qgis/TinInterpolation.py
 share/qgis/python/plugins/processing/algs/qgis/TopoColors.py
-share/qgis/python/plugins/processing/algs/qgis/TruncateTable.py
 share/qgis/python/plugins/processing/algs/qgis/UniqueValues.py
 share/qgis/python/plugins/processing/algs/qgis/VariableDistanceBuffer.py
 share/qgis/python/plugins/processing/algs/qgis/VectorLayerHistogram.py
 share/qgis/python/plugins/processing/algs/qgis/VectorLayerScatterplot.py
 share/qgis/python/plugins/processing/algs/qgis/VectorLayerScatterplot3D.py
-share/qgis/python/plugins/processing/algs/qgis/VectorSplit.py
 share/qgis/python/plugins/processing/algs/qgis/VoronoiPolygons.py
-share/qgis/python/plugins/processing/algs/qgis/ZonalStatistics.py
 share/qgis/python/plugins/processing/algs/qgis/__init__.py
 share/qgis/python/plugins/processing/algs/qgis/ui/AddNewExpressionDialog.ui
-share/qgis/python/plugins/processing/algs/qgis/ui/AggregatesPanel.py
-share/qgis/python/plugins/processing/algs/qgis/ui/DlgFieldsCalculator.ui
 share/qgis/python/plugins/processing/algs/qgis/ui/ExecuteSQLWidget.py
 share/qgis/python/plugins/processing/algs/qgis/ui/ExecuteSQLWidgetBase.ui
-share/qgis/python/plugins/processing/algs/qgis/ui/FieldsCalculatorDialog.py
-share/qgis/python/plugins/processing/algs/qgis/ui/FieldsMappingPanel.py
 share/qgis/python/plugins/processing/algs/qgis/ui/HeatmapWidgets.py
 share/qgis/python/plugins/processing/algs/qgis/ui/InterpolationWidgets.py
 share/qgis/python/plugins/processing/algs/qgis/ui/PredefinedExpressionDialog.ui
@@ -736,7 +690,6 @@ share/qgis/python/plugins/processing/algs/qgis/ui/RasterCalculatorWidgets.py
 share/qgis/python/plugins/processing/algs/qgis/ui/RasterResolutionWidget.ui
 share/qgis/python/plugins/processing/algs/qgis/ui/ReliefColorsWidget.py
 share/qgis/python/plugins/processing/algs/qgis/ui/__init__.py
-share/qgis/python/plugins/processing/algs/qgis/ui/fieldsmappingpanelbase.ui
 share/qgis/python/plugins/processing/algs/qgis/ui/interpolationdatawidgetbase.ui
 share/qgis/python/plugins/processing/algs/qgis/ui/reliefcolorswidgetbase.ui
 share/qgis/python/plugins/processing/algs/qgis/voronoi.py
@@ -949,7 +902,6 @@ share/qgis/python/plugins/processing/algs/saga/description/MeshDenoise.txt
 share/qgis/python/plugins/processing/algs/saga/description/MetricConversions.txt
 share/qgis/python/plugins/processing/algs/saga/description/MinimumDistanceAnalysis.txt
 share/qgis/python/plugins/processing/algs/saga/description/MirrorGrid.txt
-share/qgis/python/plugins/processing/algs/saga/description/ModifedQuadraticShepard.txt
 share/qgis/python/plugins/processing/algs/saga/description/ModifiedQuadraticShepard.txt
 share/qgis/python/plugins/processing/algs/saga/description/MonthlyGlobalbyLatitude.txt
 share/qgis/python/plugins/processing/algs/saga/description/MorphologicalFilter(OpenCV).txt
@@ -1011,6 +963,9 @@ share/qgis/python/plugins/processing/algs/saga/description/RandomTerrainGenerati
 share/qgis/python/plugins/processing/algs/saga/description/RankFilter.txt
 share/qgis/python/plugins/processing/algs/saga/description/RealSurfaceArea.txt
 share/qgis/python/plugins/processing/algs/saga/description/ReclassifyGridValues.txt
+share/qgis/python/plugins/processing/algs/saga/description/ReclassifyGridValuesRange.txt
+share/qgis/python/plugins/processing/algs/saga/description/ReclassifyGridValuesSingle.txt
+share/qgis/python/plugins/processing/algs/saga/description/ReclassifyGridValuesTable.txt
 share/qgis/python/plugins/processing/algs/saga/description/RegressionAnalysis(PointsGrid).txt
 share/qgis/python/plugins/processing/algs/saga/description/RegressionAnalysis(PointsandPredictorGrid).txt
 share/qgis/python/plugins/processing/algs/saga/description/RegressionKriging.txt
@@ -1136,7 +1091,6 @@ share/qgis/python/plugins/processing/gui/CMakeLists.txt
 share/qgis/python/plugins/processing/gui/CheckboxesPanel.py
 share/qgis/python/plugins/processing/gui/ConfigDialog.py
 share/qgis/python/plugins/processing/gui/ContextAction.py
-share/qgis/python/plugins/processing/gui/DestinationSelectionPanel.py
 share/qgis/python/plugins/processing/gui/DirectorySelectorDialog.py
 share/qgis/python/plugins/processing/gui/EditRenderingStylesDialog.py
 share/qgis/python/plugins/processing/gui/ExtentSelectionPanel.py
@@ -1153,11 +1107,9 @@ share/qgis/python/plugins/processing/gui/MultipleFileInputDialog.py
 share/qgis/python/plugins/processing/gui/MultipleInputDialog.py
 share/qgis/python/plugins/processing/gui/MultipleInputPanel.py
 share/qgis/python/plugins/processing/gui/NumberInputPanel.py
-share/qgis/python/plugins/processing/gui/ParameterGuiUtils.py
 share/qgis/python/plugins/processing/gui/ParametersPanel.py
 share/qgis/python/plugins/processing/gui/PointMapTool.py
 share/qgis/python/plugins/processing/gui/PointSelectionPanel.py
-share/qgis/python/plugins/processing/gui/PostgisTableSelector.py
 share/qgis/python/plugins/processing/gui/Postprocessing.py
 share/qgis/python/plugins/processing/gui/ProcessingToolbox.py
 share/qgis/python/plugins/processing/gui/ProviderActions.py
@@ -1170,15 +1122,9 @@ share/qgis/python/plugins/processing/gui/TestTools.py
 share/qgis/python/plugins/processing/gui/ToolboxAction.py
 share/qgis/python/plugins/processing/gui/__init__.py
 share/qgis/python/plugins/processing/gui/algnames.txt
-share/qgis/python/plugins/processing/gui/enummodelerwidget.py
-share/qgis/python/plugins/processing/gui/matrixmodelerwidget.py
 share/qgis/python/plugins/processing/gui/menus.py
 share/qgis/python/plugins/processing/gui/wrappers.py
-share/qgis/python/plugins/processing/gui/wrappers_map_theme.py
-share/qgis/python/plugins/processing/gui/wrappers_postgis.py
-share/qgis/python/plugins/processing/images/delete.svg
 share/qgis/python/plugins/processing/images/dem.png
-share/qgis/python/plugins/processing/images/edit.svg
 share/qgis/python/plugins/processing/images/gdaltools/24-to-8-bits.png
 share/qgis/python/plugins/processing/images/gdaltools/8-to-24-bits.png
 share/qgis/python/plugins/processing/images/gdaltools/contour.png
@@ -1198,17 +1144,8 @@ share/qgis/python/plugins/processing/images/gdaltools/tiles.png
 share/qgis/python/plugins/processing/images/gdaltools/translate.png
 share/qgis/python/plugins/processing/images/gdaltools/vrt.png
 share/qgis/python/plugins/processing/images/gdaltools/warp.png
-share/qgis/python/plugins/processing/images/input.svg
 share/qgis/python/plugins/processing/images/interpolation.png
-share/qgis/python/plugins/processing/images/iterate.png
 share/qgis/python/plugins/processing/images/menu.png
-share/qgis/python/plugins/processing/images/minus.svg
-share/qgis/python/plugins/processing/images/namespace.png
-share/qgis/python/plugins/processing/images/networkanalysis.svg
-share/qgis/python/plugins/processing/images/output.svg
-share/qgis/python/plugins/processing/images/plus.svg
-share/qgis/python/plugins/processing/images/postgis.png
-share/qgis/python/plugins/processing/images/zonalstats.png
 share/qgis/python/plugins/processing/metadata.txt
 share/qgis/python/plugins/processing/modeler/AddModelFromFileAction.py
 share/qgis/python/plugins/processing/modeler/CreateNewModelAction.py
@@ -1216,7 +1153,6 @@ share/qgis/python/plugins/processing/modeler/DeleteModelAction.py
 share/qgis/python/plugins/processing/modeler/EditModelAction.py
 share/qgis/python/plugins/processing/modeler/ExportModelAsPythonScriptAction.py
 share/qgis/python/plugins/processing/modeler/ModelerAlgorithmProvider.py
-share/qgis/python/plugins/processing/modeler/ModelerArrowItem.py
 share/qgis/python/plugins/processing/modeler/ModelerDialog.py
 share/qgis/python/plugins/processing/modeler/ModelerGraphicItem.py
 share/qgis/python/plugins/processing/modeler/ModelerParameterDefinitionDialog.py
@@ -1260,7 +1196,7 @@ share/qgis/python/plugins/processing/tests/ModelerTest.py
 share/qgis/python/plugins/processing/tests/OtbAlgorithmsTest.py
 share/qgis/python/plugins/processing/tests/ProcessingGeneralTest.py
 share/qgis/python/plugins/processing/tests/ProjectProvider.py
-share/qgis/python/plugins/processing/tests/QgisAlgorithmsTest.py
+share/qgis/python/plugins/processing/tests/QgisAlgorithmsTest1.py
 share/qgis/python/plugins/processing/tests/QgisAlgorithmsTest2.py
 share/qgis/python/plugins/processing/tests/QgisAlgorithmsTest3.py
 share/qgis/python/plugins/processing/tests/QgisAlgorithmsTest4.py
@@ -1275,34 +1211,23 @@ share/qgis/python/plugins/processing/tests/testdata/table.dbf
 share/qgis/python/plugins/processing/tools/__init__.py
 share/qgis/python/plugins/processing/tools/dataobjects.py
 share/qgis/python/plugins/processing/tools/general.py
-share/qgis/python/plugins/processing/tools/postgis.py
 share/qgis/python/plugins/processing/tools/raster.py
-share/qgis/python/plugins/processing/tools/spatialite.py
 share/qgis/python/plugins/processing/tools/system.py
 share/qgis/python/plugins/processing/tools/vector.py
-share/qgis/python/plugins/processing/ui/DlgAlgorithmBase.ui
 share/qgis/python/plugins/processing/ui/DlgAutofill.ui
 share/qgis/python/plugins/processing/ui/DlgConfig.ui
 share/qgis/python/plugins/processing/ui/DlgFixedTable.ui
 share/qgis/python/plugins/processing/ui/DlgHelpEdition.ui
 share/qgis/python/plugins/processing/ui/DlgHistory.ui
 share/qgis/python/plugins/processing/ui/DlgMessage.ui
-share/qgis/python/plugins/processing/ui/DlgModeler.ui
 share/qgis/python/plugins/processing/ui/DlgMultipleSelection.ui
-share/qgis/python/plugins/processing/ui/DlgNumberInput.ui
-share/qgis/python/plugins/processing/ui/DlgPostgisTableSelector.ui
 share/qgis/python/plugins/processing/ui/DlgRenderingStyles.ui
 share/qgis/python/plugins/processing/ui/DlgScriptEditor.ui
 share/qgis/python/plugins/processing/ui/ProcessingToolbox.ui
-share/qgis/python/plugins/processing/ui/enummodelerwidgetbase.ui
-share/qgis/python/plugins/processing/ui/matrixmodelerwidgetbase.ui
 share/qgis/python/plugins/processing/ui/resultsdockbase.ui
 share/qgis/python/plugins/processing/ui/widgetBaseSelector.ui
 share/qgis/python/plugins/processing/ui/widgetBatchPanel.ui
-share/qgis/python/plugins/processing/ui/widgetGeometryPredicateSelector.ui
-share/qgis/python/plugins/processing/ui/widgetLayerSelector.ui
 share/qgis/python/plugins/processing/ui/widgetNumberSelector.ui
-share/qgis/python/plugins/processing/ui/widgetParametersPanel.ui
 share/qgis/python/plugins/processing/ui/widgetRangeSelector.ui
 share/qgis/python/pyplugin_installer/__init__.py
 share/qgis/python/pyplugin_installer/installer.py
@@ -1347,7 +1272,6 @@ share/qgis/python/qgis/core/__init__.py
 share/qgis/python/qgis/core/additions/__init__.py
 share/qgis/python/qgis/core/additions/edit.py
 share/qgis/python/qgis/core/additions/fromfunction.py
-share/qgis/python/qgis/core/additions/markerlinesymbollayer.py
 share/qgis/python/qgis/core/additions/metaenum.py
 share/qgis/python/qgis/core/additions/processing.py
 share/qgis/python/qgis/core/additions/projectdirtyblocker.py
@@ -1358,6 +1282,7 @@ share/qgis/python/qgis/core/additions/qgsgeometry.py
 share/qgis/python/qgis/core/additions/qgssettings.py
 share/qgis/python/qgis/core/additions/qgstaskwrapper.py
 share/qgis/python/qgis/core/additions/readwritecontextentercategory.py
+share/qgis/python/qgis/core/additions/runtimeprofiler.py
 share/qgis/python/qgis/core/additions/validitycheck.py
 share/qgis/python/qgis/core/contextmanagers.py
 share/qgis/python/qgis/gui/__init__.py
diff --git a/geography/qgis/distinfo b/geography/qgis/distinfo
index 46b4c9ba84e..70baf42634d 100644
--- a/geography/qgis/distinfo
+++ b/geography/qgis/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.20 2021/01/23 19:47:06 gdt Exp $
+$NetBSD: distinfo,v 1.21 2021/03/01 00:03:35 gdt Exp $
 
-SHA1 (qgis-3.10.14.tar.bz2) = 428cca6ad7a8bb50d5b5011f568490e4f7a97d69
-RMD160 (qgis-3.10.14.tar.bz2) = c00e778baba3e81d1418a0022da439ca8f45e06c
-SHA512 (qgis-3.10.14.tar.bz2) = 7f23b669f6341c5318d7e097b60b3bbcd7af00eeca08c0fc1729bee76534133841c4ad3855fceb0c61507758acd8954cbd56d393a72a783f46e97dac9d4c4c15
-Size (qgis-3.10.14.tar.bz2) = 103264948 bytes
-SHA1 (patch-cmake_FindQwt.cmake) = bd0c082e53b8647fcdeb671b932180ec16de49d9
-SHA1 (patch-mac_CMakeLists.txt) = 2468c0a629738ce78cccb784395eb1f41049cc73
+SHA1 (qgis-3.16.4.tar.bz2) = cb412270b74b7b54e7b9c668b6db15a326c0aca4
+RMD160 (qgis-3.16.4.tar.bz2) = ddbc056edf32224c5d154f8652a31e7557aa8fcb
+SHA512 (qgis-3.16.4.tar.bz2) = a58ef90089416ac08ba014f483cf7f6f929ef97306e213a5d1855fe551ecc42631926f8e015134ebcbc368f134c9f3ed8f2fda1846a409f249ed00b104036d25
+Size (qgis-3.16.4.tar.bz2) = 115427023 bytes
+SHA1 (patch-cmake_FindQwt.cmake) = 4e1320601c1149dabf63b624e61f5783ff09f17c
+SHA1 (patch-mac_CMakeLists.txt) = 8e52ca943d44392939d0fcf083ba2681a7d77c53
 SHA1 (patch-mac_cmake_1qt.cmake.in) = d74f7201849ef6dd83f39251e466eb04c791c0e6
-SHA1 (patch-src_core_CMakeLists.txt) = f476770fcb488385723def8aecaa8146de18d624
-SHA1 (patch-src_core_qgsapplication.cpp) = 9300b9af85281c1b766560e72e52658930f50a12
-SHA1 (patch-src_crssync_CMakeLists.txt) = a3f4f9d0ac47bafb7c23931528bbdcbbf08b6098
+SHA1 (patch-src_core_CMakeLists.txt) = 818d36e9dbbd31a46471de185d489ebbdbafe71d
+SHA1 (patch-src_core_qgsapplication.cpp) = 54bba734969cd9fd90a2317d8c1531da2827d145
+SHA1 (patch-src_crssync_CMakeLists.txt) = 785d820fec76d046c87297bd71ea547a83c4ac2a
diff --git a/geography/qgis/patches/patch-cmake_FindQwt.cmake b/geography/qgis/patches/patch-cmake_FindQwt.cmake
index 40af3b1db3d..cc137edd7f7 100644
--- a/geography/qgis/patches/patch-cmake_FindQwt.cmake
+++ b/geography/qgis/patches/patch-cmake_FindQwt.cmake
@@ -1,8 +1,8 @@
-$NetBSD: patch-cmake_FindQwt.cmake,v 1.1 2019/10/29 19:30:11 bouyer Exp $
+$NetBSD: patch-cmake_FindQwt.cmake,v 1.2 2021/03/01 00:03:35 gdt Exp $
 
---- cmake/FindQwt.cmake.orig	2019-10-27 18:10:06.615593553 +0100
-+++ cmake/FindQwt.cmake	2019-10-27 18:11:27.844260494 +0100
-@@ -17,11 +17,7 @@
+--- cmake/FindQwt.cmake.orig	2021-02-19 12:09:21.000000000 +0000
++++ cmake/FindQwt.cmake
+@@ -17,11 +17,7 @@ set(QWT_LIBRARY_NAMES qwt-qt5 qwt6-qt5 q
  find_library(QWT_LIBRARY
    NAMES ${QWT_LIBRARY_NAMES}
    PATHS
@@ -15,11 +15,12 @@ $NetBSD: patch-cmake_FindQwt.cmake,v 1.1 2019/10/29 19:30:11 bouyer Exp $
  )
  
  set(_qwt_fw)
-@@ -31,12 +27,7 @@
+@@ -31,13 +27,7 @@ endif()
  
  FIND_PATH(QWT_INCLUDE_DIR NAMES qwt.h PATHS
    "${_qwt_fw}/Headers"
 -  /usr/include
+-  /usr/include/qt5
 -  /usr/local/include
 -  /usr/local/include/qt5
 -  "$ENV{LIB_DIR}/include"
diff --git a/geography/qgis/patches/patch-mac_CMakeLists.txt b/geography/qgis/patches/patch-mac_CMakeLists.txt
index d361cfd79c3..49bfa594663 100644
--- a/geography/qgis/patches/patch-mac_CMakeLists.txt
+++ b/geography/qgis/patches/patch-mac_CMakeLists.txt
@@ -1,15 +1,15 @@
-$NetBSD: patch-mac_CMakeLists.txt,v 1.1 2016/02/02 04:33:58 dbj Exp $
+$NetBSD: patch-mac_CMakeLists.txt,v 1.2 2021/03/01 00:03:35 gdt Exp $
 
 Make sure QCATOOL_EXECUTABLE is available to 1qt.cmake
 This is in conjunction with patch-mac_cmake_1qt.cmake.in
 
---- mac/CMakeLists.txt.orig	2016-01-15 12:00:55.000000000 +0000
+--- mac/CMakeLists.txt.orig	2021-02-19 12:09:21.000000000 +0000
 +++ mac/CMakeLists.txt
-@@ -10,6 +10,7 @@ IF (APPLE)
+@@ -8,6 +8,7 @@ if (APPLE AND QGIS_MACAPP_BUNDLE GREATER
+   install (SCRIPT ${CMAKE_BINARY_DIR}/mac/0qgis.cmake)
+   if (QGIS_MACAPP_BUNDLE GREATER 0)
      # start with Qt
-     CONFIGURE_FILE (cmake/1osg.cmake.in 1osg.cmake @ONLY)
-     INSTALL (SCRIPT ${CMAKE_BINARY_DIR}/mac/1osg.cmake)
 +    FIND_QCATOOL(1)
-     CONFIGURE_FILE (cmake/1qt.cmake.in 1qt.cmake @ONLY)
-     INSTALL (SCRIPT ${CMAKE_BINARY_DIR}/mac/1qt.cmake)
-     IF (QGIS_MACAPP_BUNDLE GREATER 1)
+     configure_file (cmake/1qt.cmake.in 1qt.cmake @ONLY)
+     install (SCRIPT ${CMAKE_BINARY_DIR}/mac/1qt.cmake)
+     if (QGIS_MACAPP_BUNDLE GREATER 1)
diff --git a/geography/qgis/patches/patch-src_core_CMakeLists.txt b/geography/qgis/patches/patch-src_core_CMakeLists.txt
index c7fe9928fa8..9d681dc1d0e 100644
--- a/geography/qgis/patches/patch-src_core_CMakeLists.txt
+++ b/geography/qgis/patches/patch-src_core_CMakeLists.txt
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_core_CMakeLists.txt,v 1.2 2019/10/29 19:30:11 bouyer Exp $
+$NetBSD: patch-src_core_CMakeLists.txt,v 1.3 2021/03/01 00:03:35 gdt Exp $
 
 Add ApplicationServices framework
 Use Q_WS_MAC to conditionalize frameworks
@@ -6,17 +6,14 @@ This sort-of matches Q_OS_MACX conditionals in main.cpp and qgisapp.cpp
 but more importantly avoids using APPLE which we overwrite in the
 pkgsrc Makefile to disable the MAC application bundle
 
---- src/core/CMakeLists.txt.orig	2019-09-13 14:11:09.000000000 +0200
-+++ src/core/CMakeLists.txt	2019-10-27 19:11:40.694784656 +0100
-@@ -1369,9 +1369,9 @@
-   TARGET_LINK_LIBRARIES(qgis_core ${LIBTASN1_LIBRARY})
- ENDIF (APPLE)
+--- src/core/CMakeLists.txt.orig	2021-02-19 12:09:21.000000000 +0000
++++ src/core/CMakeLists.txt
+@@ -1713,7 +1713,7 @@ if (APPLE)
+   target_link_libraries(qgis_core ${LIBTASN1_LIBRARY})
+ endif()
  
--IF (APPLE AND NOT IOS)
-+IF (Q_WS_MAC)
-   TARGET_LINK_LIBRARIES(qgis_core qgis_native)
--ENDIF (APPLE AND NOT IOS)
-+ENDIF (Q_WS_MAC)
+-if (APPLE AND NOT IOS)
++if (Q_WS_MAC)
+   target_link_libraries(qgis_core qgis_native)
+ endif()
  
- IF (QT_MOBILITY_LOCATION_FOUND)
-   TARGET_LINK_LIBRARIES(qgis_core ${QT_MOBILITY_LOCATION_LIBRARY})
diff --git a/geography/qgis/patches/patch-src_core_qgsapplication.cpp b/geography/qgis/patches/patch-src_core_qgsapplication.cpp
index c4e576e5296..3e797254d13 100644
--- a/geography/qgis/patches/patch-src_core_qgsapplication.cpp
+++ b/geography/qgis/patches/patch-src_core_qgsapplication.cpp
@@ -1,13 +1,13 @@
-$NetBSD: patch-src_core_qgsapplication.cpp,v 1.3 2019/10/29 19:30:11 bouyer Exp $
+$NetBSD: patch-src_core_qgsapplication.cpp,v 1.4 2021/03/01 00:03:35 gdt Exp $
 
 Only assume we are running from a Mac OS application bundle
 if the binary is in a directory ending in "/Contents/MacOS"
 
---- src/core/qgsapplication.cpp.orig	2019-10-25 14:03:26.000000000 +0200
-+++ src/core/qgsapplication.cpp	2019-10-25 22:58:01.706800411 +0200
-@@ -233,8 +233,18 @@
+--- src/core/qgsapplication.cpp.orig	2021-02-19 12:09:21.000000000 +0000
++++ src/core/qgsapplication.cpp
+@@ -279,8 +279,18 @@ void QgsApplication::init( QString profi
      {
-       if ( ABISYM( mPrefixPath ).isNull() )
+       if ( sPrefixPath()->isNull() )
        {
 -#if defined(Q_OS_MACX) || defined(Q_OS_WIN)
 +#if defined(Q_OS_WIN)
diff --git a/geography/qgis/patches/patch-src_crssync_CMakeLists.txt b/geography/qgis/patches/patch-src_crssync_CMakeLists.txt
index 18a6e0b7d8b..11054c393ae 100644
--- a/geography/qgis/patches/patch-src_crssync_CMakeLists.txt
+++ b/geography/qgis/patches/patch-src_crssync_CMakeLists.txt
@@ -1,17 +1,17 @@
-$NetBSD: patch-src_crssync_CMakeLists.txt,v 1.3 2020/06/21 13:51:49 gdt Exp $
+$NetBSD: patch-src_crssync_CMakeLists.txt,v 1.4 2021/03/01 00:03:35 gdt Exp $
 
 Fix executing dynamically-linked executable from the build directory
 
 \todo Explain if this should be filed upstream or not.
 
---- src/crssync/CMakeLists.txt.orig	2020-06-19 12:10:56.000000000 +0000
+--- src/crssync/CMakeLists.txt.orig	2021-02-19 12:09:21.000000000 +0000
 +++ src/crssync/CMakeLists.txt
-@@ -33,7 +33,7 @@ ELSEIF(CMAKE_CROSSCOMPILING)
+@@ -36,7 +36,7 @@ elseif()
+ else()
+   add_custom_target(synccrsdb
+     COMMENT "Running crssync"
+-    COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/crssync
++    COMMAND env LD_LIBRARY_PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/../lib ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/crssync
+     DEPENDS crssync
    )
- ELSE()
- 	ADD_CUSTOM_TARGET(synccrsdb
--		COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/crssync
-+		COMMAND env LD_LIBRARY_PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/../lib ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/crssync
- 		DEPENDS crssync
- 	)
- ENDIF()
+ endif()