diff -urN qgis.orig/Makefile qgis/Makefile --- qgis.orig/Makefile 2019-02-03 07:40:55.530186000 +0100 +++ qgis/Makefile 2019-02-23 07:37:50.508550000 +0100 @@ -3,8 +3,7 @@ PORTNAME= qgis DISTVERSIONPREFIX= final- -DISTVERSION= 3_4_3 -PORTREVISION= 2 +DISTVERSION= 3_6_0 CATEGORIES= graphics geography MAINTAINER= rhurlin@gwdg.de @@ -12,7 +11,7 @@ LICENSE= GPLv2 -BUILD_DEPENDS= gpsbabel>=1.5.3: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.7.3:devel/py-dateutil@${PY_FLAVOR} \ @@ -25,6 +24,7 @@ ${PYTHON_PKGNAMEPREFIX}OWSLib>=0.17.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} \ ${PYTHON_PKGNAMEPREFIX}pygments>=2.2.0:textproc/py-pygments@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyproj>=1.9.5.1:graphics/py-pyproj@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytz>=2018.7:devel/py-pytz@${PY_FLAVOR} \ @@ -46,6 +46,7 @@ ${PYTHON_PKGNAMEPREFIX}OWSLib>=0.17.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} \ ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.7.6.1:databases/py-psycopg2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pygments>=2.2.0:textproc/py-pygments@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyproj>=1.9.5.1:graphics/py-pyproj@${PY_FLAVOR} \ @@ -55,8 +56,8 @@ ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.15:databases/py-sqlite3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>=3.13:devel/py-yaml@${PY_FLAVOR} -LIB_DEPENDS= libexpat.so:textproc/expat2 \ - libfcgi.so:www/fcgi \ +LIB_DEPENDS= libexiv2.so:graphics/exiv2 \ + libexpat.so:textproc/expat2 \ libgdal.so:graphics/gdal \ libgeos.so:graphics/geos \ libgsl.so:math/gsl \ diff -urN qgis.orig/distinfo qgis/distinfo --- qgis.orig/distinfo 2019-01-16 08:12:08.874698000 +0100 +++ qgis/distinfo 2019-02-22 17:26:19.182338000 +0100 @@ -1,3 +1,3 @@ -TIMESTAMP = 1545994756 -SHA256 (qgis-QGIS-final-3_4_3_GH0.tar.gz) = 47dcda95b3b64057a428d8e50c3e8cdf5dabb0618de02e9e637f442e964c4d47 -SIZE (qgis-QGIS-final-3_4_3_GH0.tar.gz) = 89093146 +TIMESTAMP = 1550852779 +SHA256 (qgis-QGIS-final-3_6_0_GH0.tar.gz) = 4e50a3ea3bd4b38b6255c0ca6533528c5507863e9bcb50491e5f6038ebe15d9b +SIZE (qgis-QGIS-final-3_6_0_GH0.tar.gz) = 92695815 diff -urN qgis.orig/files/patch-src_core_qgsproject.cpp qgis/files/patch-src_core_qgsproject.cpp --- qgis.orig/files/patch-src_core_qgsproject.cpp 2019-01-16 08:12:08.875738000 +0100 +++ qgis/files/patch-src_core_qgsproject.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- src/core/qgsproject.cpp.orig 2018-11-23 12:08:36 UTC -+++ src/core/qgsproject.cpp -@@ -1867,7 +1867,7 @@ bool QgsProject::writeProjectFile( const QString &file - } - - QFileInfo fi( fileName() ); -- struct utimbuf tb = { fi.lastRead().toTime_t(), fi.lastModified().toTime_t() }; -+ struct utimbuf tb = { static_cast( fi.lastRead().toSecsSinceEpoch() ), static_cast( fi.lastModified().toSecsSinceEpoch() ) }; - utime( backupFile.fileName().toUtf8().constData(), &tb ); - } - diff -urN qgis.orig/pkg-plist qgis/pkg-plist --- qgis.orig/pkg-plist 2019-01-16 08:12:08.951757000 +0100 +++ qgis/pkg-plist 2019-02-22 19:13:32.788325000 +0100 @@ -39,11 +39,13 @@ include/qgis/qgsabstract3dengine.h include/qgis/qgsabstract3drenderer.h include/qgis/qgsabstract3dsymbol.h +include/qgis/qgsabstractcontentcache.h include/qgis/qgsabstractdatasourcewidget.h include/qgis/qgsabstractgeometry.h include/qgis/qgsabstractlayoutiterator.h include/qgis/qgsabstractmetadatabase.h include/qgis/qgsabstractreportsection.h +include/qgis/qgsabstractvaliditycheck.h include/qgis/qgsaction.h include/qgis/qgsactionmanager.h include/qgis/qgsactionmenu.h @@ -110,7 +112,10 @@ include/qgis/qgsauxiliarystorage.h include/qgis/qgsbearingutils.h include/qgis/qgsbilinearrasterresampler.h +include/qgis/qgsbinarywidgetfactory.h +include/qgis/qgsbinarywidgetwrapper.h include/qgis/qgsblendmodecombobox.h +include/qgis/qgsblockingnetworkrequest.h include/qgis/qgsblureffect.h include/qgis/qgsbox3d.h include/qgis/qgsbrightnesscontrastfilter.h @@ -201,10 +206,13 @@ include/qgis/qgsdatadefinedsizelegend.h include/qgis/qgsdatadefinedsizelegendwidget.h include/qgis/qgsdataitem.h +include/qgis/qgsdataitemguiprovider.h +include/qgis/qgsdataitemguiproviderregistry.h include/qgis/qgsdataitemprovider.h include/qgis/qgsdataitemproviderregistry.h include/qgis/qgsdataprovider.h include/qgis/qgsdatasourcemanagerdialog.h +include/qgis/qgsdatasourceselectdialog.h include/qgis/qgsdatasourceuri.h include/qgis/qgsdatetimeedit.h include/qgis/qgsdatetimeeditconfig.h @@ -259,6 +267,7 @@ include/qgis/qgserror.h include/qgis/qgserrordialog.h include/qgis/qgsexception.h +include/qgis/qgsexiftools.h include/qgis/qgsexpression.h include/qgis/qgsexpressionbuilderdialog.h include/qgis/qgsexpressionbuilderwidget.h @@ -266,6 +275,7 @@ include/qgis/qgsexpressioncontext.h include/qgis/qgsexpressioncontextgenerator.h include/qgis/qgsexpressioncontextscopegenerator.h +include/qgis/qgsexpressioncontextutils.h include/qgis/qgsexpressionfieldbuffer.h include/qgis/qgsexpressionfunction.h include/qgis/qgsexpressionhighlighter.h @@ -282,6 +292,7 @@ include/qgis/qgsexternalresourcewidgetwrapper.h include/qgis/qgsfallbackfieldformatter.h include/qgis/qgsfeature.h +include/qgis/qgsfeature3dhandler_p.h include/qgis/qgsfeaturefiltermodel.h include/qgis/qgsfeaturefiltermodel_p.h include/qgis/qgsfeaturefilterprovider.h @@ -315,6 +326,7 @@ include/qgis/qgsfields.h include/qgis/qgsfieldvalidator.h include/qgis/qgsfieldvalueslineedit.h +include/qgis/qgsfilecontentsourcelineedit.h include/qgis/qgsfiledownloader.h include/qgis/qgsfiledownloaderdialog.h include/qgis/qgsfileutils.h @@ -412,6 +424,7 @@ 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/qgsinternalgeometryengine.h @@ -546,6 +559,7 @@ include/qgis/qgslocatorcontext.h include/qgis/qgslocatorfilter.h include/qgis/qgslocatormodel.h +include/qgis/qgslocatormodelbridge.h include/qgis/qgslocatorwidget.h include/qgis/qgslogger.h include/qgis/qgslonglongvalidator.h @@ -607,13 +621,20 @@ include/qgis/qgsmemoryprovider.h include/qgis/qgsmemoryproviderutils.h include/qgis/qgsmenuheader.h +include/qgis/qgsmesh3dsymbol.h +include/qgis/qgsmesh3dsymbol_p.h +include/qgis/qgsmeshcalcnode.h +include/qgis/qgsmeshcalculator.h +include/qgis/qgsmeshcalcutils.h include/qgis/qgsmeshdataprovider.h include/qgis/qgsmeshlayer.h +include/qgis/qgsmeshlayer3drenderer.h include/qgis/qgsmeshlayerinterpolator.h include/qgis/qgsmeshlayerrenderer.h include/qgis/qgsmeshlayerutils.h include/qgis/qgsmeshmemorydataprovider.h include/qgis/qgsmeshrenderersettings.h +include/qgis/qgsmeshspatialindex.h include/qgis/qgsmeshvectorrenderer.h include/qgis/qgsmessagebar.h include/qgis/qgsmessagebaritem.h @@ -639,6 +660,7 @@ include/qgis/qgsnetworkcontentfetchertask.h include/qgis/qgsnetworkdiskcache.h include/qgis/qgsnetworkdistancestrategy.h +include/qgis/qgsnetworkreply.h include/qgis/qgsnetworkreplyparser.h include/qgis/qgsnetworkspeedstrategy.h include/qgis/qgsnetworkstrategy.h @@ -702,6 +724,7 @@ include/qgis/qgspointdisplacementrenderer.h include/qgis/qgspointdisplacementrendererwidget.h include/qgis/qgspointdistancerenderer.h +include/qgis/qgspointlightsettings.h include/qgis/qgspointlocator.h include/qgis/qgspointxy.h include/qgis/qgspolygon.h @@ -720,6 +743,7 @@ include/qgis/qgsprocessingfeedback.h include/qgis/qgsprocessinggui.h include/qgis/qgsprocessingguiregistry.h +include/qgis/qgsprocessingmatrixparameterdialog.h include/qgis/qgsprocessingmodelalgorithm.h include/qgis/qgsprocessingmodelchildalgorithm.h include/qgis/qgsprocessingmodelchildparametersource.h @@ -766,6 +790,7 @@ include/qgis/qgspythonrunner.h include/qgis/qgsqmlwidgetwrapper.h include/qgis/qgsqtlocationconnection.h +include/qgis/qgsquadrilateral.h include/qgis/qgsquerybuilder.h include/qgis/qgsrange.h include/qgis/qgsrangeconfigdlg.h @@ -845,6 +870,7 @@ include/qgis/qgsreportsectionlayout.h include/qgis/qgsrubberband.h include/qgis/qgsruggednessfilter.h +include/qgis/qgsrulebased3drenderer.h include/qgis/qgsrulebasedlabeling.h include/qgis/qgsrulebasedrenderer.h include/qgis/qgsrulebasedrendererwidget.h @@ -913,7 +939,6 @@ include/qgis/qgssvgannotation.h include/qgis/qgssvgcache.h include/qgis/qgssvgselectorwidget.h -include/qgis/qgssvgsourcelineedit.h include/qgis/qgssymbol.h include/qgis/qgssymbolbutton.h include/qgis/qgssymbolbuttonplugin.h @@ -974,6 +999,9 @@ include/qgis/qgsuserprofilemanager.h include/qgis/qgsuuidwidgetfactory.h include/qgis/qgsuuidwidgetwrapper.h +include/qgis/qgsvaliditycheckcontext.h +include/qgis/qgsvaliditycheckregistry.h +include/qgis/qgsvaliditycheckresultswidget.h include/qgis/qgsvaluemapconfigdlg.h include/qgis/qgsvaluemapfieldformatter.h include/qgis/qgsvaluemapsearchwidgetwrapper.h @@ -2704,7 +2732,7 @@ %%DATADIR%%/python/plugins/processing/algs/grass7/description/r.li.shape.txt %%DATADIR%%/python/plugins/processing/algs/grass7/description/r.li.simpson.ascii.txt %%DATADIR%%/python/plugins/processing/algs/grass7/description/r.li.simpson.txt -%%DATADIR%%/python/plugins/processing/algs/grass7/description/r.mapcalc.txt +%%DATADIR%%/python/plugins/processing/algs/grass7/description/r.mapcalc.simple.txt %%DATADIR%%/python/plugins/processing/algs/grass7/description/r.mask.rast.txt %%DATADIR%%/python/plugins/processing/algs/grass7/description/r.mask.vect.txt %%DATADIR%%/python/plugins/processing/algs/grass7/description/r.mfilter.txt @@ -2877,6 +2905,7 @@ %%DATADIR%%/python/plugins/processing/algs/grass7/description/v.split.txt %%DATADIR%%/python/plugins/processing/algs/grass7/description/v.surf.bspline.txt %%DATADIR%%/python/plugins/processing/algs/grass7/description/v.surf.idw.txt +%%DATADIR%%/python/plugins/processing/algs/grass7/description/v.surf.rst.cvdev.txt %%DATADIR%%/python/plugins/processing/algs/grass7/description/v.surf.rst.txt %%DATADIR%%/python/plugins/processing/algs/grass7/description/v.to.3d.txt %%DATADIR%%/python/plugins/processing/algs/grass7/description/v.to.lines.txt @@ -2949,7 +2978,6 @@ %%DATADIR%%/python/plugins/processing/algs/grass7/ext/r_li_shape_ascii.py %%DATADIR%%/python/plugins/processing/algs/grass7/ext/r_li_simpson.py %%DATADIR%%/python/plugins/processing/algs/grass7/ext/r_li_simpson_ascii.py -%%DATADIR%%/python/plugins/processing/algs/grass7/ext/r_mapcalc.py %%DATADIR%%/python/plugins/processing/algs/grass7/ext/r_mask_rast.py %%DATADIR%%/python/plugins/processing/algs/grass7/ext/r_mask_vect.py %%DATADIR%%/python/plugins/processing/algs/grass7/ext/r_null.py @@ -3011,7 +3039,6 @@ %%DATADIR%%/python/plugins/processing/algs/qgis/DeleteColumn.py %%DATADIR%%/python/plugins/processing/algs/qgis/DeleteDuplicateGeometries.py %%DATADIR%%/python/plugins/processing/algs/qgis/DensifyGeometries.py -%%DATADIR%%/python/plugins/processing/algs/qgis/DensifyGeometriesInterval.py %%DATADIR%%/python/plugins/processing/algs/qgis/EliminateSelection.py %%DATADIR%%/python/plugins/processing/algs/qgis/ExecuteSQL.py %%DATADIR%%/python/plugins/processing/algs/qgis/ExportGeometryInfo.py @@ -3050,7 +3077,6 @@ %%DATADIR%%/python/plugins/processing/algs/qgis/PolarPlot.py %%DATADIR%%/python/plugins/processing/algs/qgis/PoleOfInaccessibility.py %%DATADIR%%/python/plugins/processing/algs/qgis/Polygonize.py -%%DATADIR%%/python/plugins/processing/algs/qgis/PolygonsToLines.py %%DATADIR%%/python/plugins/processing/algs/qgis/PostGISExecuteAndLoadSQL.py %%DATADIR%%/python/plugins/processing/algs/qgis/PostGISExecuteSQL.py %%DATADIR%%/python/plugins/processing/algs/qgis/QgisAlgorithm.py @@ -3111,7 +3137,7 @@ %%DATADIR%%/python/plugins/processing/algs/qgis/ui/FieldsCalculatorDialog.py %%DATADIR%%/python/plugins/processing/algs/qgis/ui/FieldsMappingPanel.py %%DATADIR%%/python/plugins/processing/algs/qgis/ui/HeatmapWidgets.py -%%DATADIR%%/python/plugins/processing/algs/qgis/ui/InterpolationDataWidget.py +%%DATADIR%%/python/plugins/processing/algs/qgis/ui/InterpolationWidgets.py %%DATADIR%%/python/plugins/processing/algs/qgis/ui/PredefinedExpressionDialog.ui %%DATADIR%%/python/plugins/processing/algs/qgis/ui/RasterCalculatorWidget.ui %%DATADIR%%/python/plugins/processing/algs/qgis/ui/RasterCalculatorWidgets.py @@ -3596,6 +3622,7 @@ %%DATADIR%%/python/plugins/processing/modeler/CreateNewModelAction.py %%DATADIR%%/python/plugins/processing/modeler/DeleteModelAction.py %%DATADIR%%/python/plugins/processing/modeler/EditModelAction.py +%%DATADIR%%/python/plugins/processing/modeler/ExportModelAsPythonScriptAction.py %%DATADIR%%/python/plugins/processing/modeler/ModelerAlgorithmProvider.py %%DATADIR%%/python/plugins/processing/modeler/ModelerArrowItem.py %%DATADIR%%/python/plugins/processing/modeler/ModelerDialog.py @@ -3636,6 +3663,7 @@ %%DATADIR%%/python/plugins/processing/tests/Grass7AlgorithmsVectorTest.py %%DATADIR%%/python/plugins/processing/tests/GuiTest.py %%DATADIR%%/python/plugins/processing/tests/ModelerTest.py +%%DATADIR%%/python/plugins/processing/tests/ProcessingGeneralTest.py %%DATADIR%%/python/plugins/processing/tests/ProjectProvider.py %%DATADIR%%/python/plugins/processing/tests/QgisAlgorithmsTest.py %%DATADIR%%/python/plugins/processing/tests/SagaAlgorithmsTest.py @@ -3729,8 +3757,11 @@ %%DATADIR%%/python/qgis/core/additions/qgssettings.py %%DATADIR%%/python/qgis/core/additions/qgstaskwrapper.py %%DATADIR%%/python/qgis/core/additions/readwritecontextentercategory.py +%%DATADIR%%/python/qgis/core/additions/validitycheck.py %%DATADIR%%/python/qgis/core/contextmanagers.py %%DATADIR%%/python/qgis/gui/__init__.py +%%DATADIR%%/python/qgis/processing/__init__.py +%%DATADIR%%/python/qgis/processing/algfactory.py %%SERVER%%%%DATADIR%%/python/qgis/server/__init__.py %%DATADIR%%/python/qgis/testing/__init__.py %%DATADIR%%/python/qgis/testing/mocked.py @@ -4968,14 +4999,40 @@ %%DATADIR%%/resources/spatialite.db %%DATADIR%%/resources/srs.db %%DATADIR%%/resources/symbology-style.xml -%%DATADIR%%/resources/themes/Night Mapping/icons/caret-down_ffffff_14.png -%%DATADIR%%/resources/themes/Night Mapping/icons/caret-right_ffffff_14.png -%%DATADIR%%/resources/themes/Night Mapping/icons/check.png -%%DATADIR%%/resources/themes/Night Mapping/icons/cross.svg -%%DATADIR%%/resources/themes/Night Mapping/icons/down_arrow.png +%%DATADIR%%/resources/themes/Blend of Gray/icons/arrow-down.svg +%%DATADIR%%/resources/themes/Blend of Gray/icons/arrow-up.svg +%%DATADIR%%/resources/themes/Blend of Gray/icons/caret-down.svg +%%DATADIR%%/resources/themes/Blend of Gray/icons/caret-right.svg +%%DATADIR%%/resources/themes/Blend of Gray/icons/close.svg +%%DATADIR%%/resources/themes/Blend of Gray/icons/handle-horizontal.svg +%%DATADIR%%/resources/themes/Blend of Gray/icons/handle-vertical.svg +%%DATADIR%%/resources/themes/Blend of Gray/icons/qcheckbox-checked.svg +%%DATADIR%%/resources/themes/Blend of Gray/icons/qcheckbox-unchecked.svg +%%DATADIR%%/resources/themes/Blend of Gray/icons/qradiobox-checked.svg +%%DATADIR%%/resources/themes/Blend of Gray/icons/qradiobox-unchecked.svg +%%DATADIR%%/resources/themes/Blend of Gray/icons/separator-horizontal.svg +%%DATADIR%%/resources/themes/Blend of Gray/icons/separator-vertical.svg +%%DATADIR%%/resources/themes/Blend of Gray/palette.txt +%%DATADIR%%/resources/themes/Blend of Gray/qscintilla.ini +%%DATADIR%%/resources/themes/Blend of Gray/style.qss +%%DATADIR%%/resources/themes/Blend of Gray/variables.qss +%%DATADIR%%/resources/themes/Night Mapping/icons/arrow-down.svg +%%DATADIR%%/resources/themes/Night Mapping/icons/arrow-up.svg +%%DATADIR%%/resources/themes/Night Mapping/icons/caret-down.svg +%%DATADIR%%/resources/themes/Night Mapping/icons/caret-right.svg +%%DATADIR%%/resources/themes/Night Mapping/icons/close.svg %%DATADIR%%/resources/themes/Night Mapping/icons/eye-blocked.svg %%DATADIR%%/resources/themes/Night Mapping/icons/eye.svg -%%DATADIR%%/resources/themes/Night Mapping/icons/up_arrow.png +%%DATADIR%%/resources/themes/Night Mapping/icons/handle-horizontal.svg +%%DATADIR%%/resources/themes/Night Mapping/icons/handle-vertical.svg +%%DATADIR%%/resources/themes/Night Mapping/icons/qcheckbox-checked.svg +%%DATADIR%%/resources/themes/Night Mapping/icons/qcheckbox-unchecked.svg +%%DATADIR%%/resources/themes/Night Mapping/icons/qradiobox-checked.svg +%%DATADIR%%/resources/themes/Night Mapping/icons/qradiobox-unchecked.svg +%%DATADIR%%/resources/themes/Night Mapping/icons/separator-horizontal.svg +%%DATADIR%%/resources/themes/Night Mapping/icons/separator-vertical.svg +%%DATADIR%%/resources/themes/Night Mapping/palette.txt +%%DATADIR%%/resources/themes/Night Mapping/qscintilla.ini %%DATADIR%%/resources/themes/Night Mapping/style.qss %%DATADIR%%/resources/themes/Night Mapping/variables.qss %%DATADIR%%/svg/accommodation/accommodation_alpinehut.svg