Attachment 206923 Details for Bug 240124 – patch to update graphics/qgis from 3.6.2 to 3.8.2

[patch] patch to update graphics/qgis from 3.6.2 to 3.8.2

patch-qgis_3.6.2-3.8.2.diff (text/plain), 25.21 KB, created by Rainer Hurling on 2019-08-26 13:50:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rainer Hurling

Created: 2019-08-26 13:50:20 UTC

Size: 25.21 KB

patch

obsolete

>diff -urN qgis.orig/Makefile qgis/Makefile
>--- qgis.orig/Makefile	2019-07-27 07:19:22.488132000 +0200
>+++ qgis/Makefile	2019-08-26 15:31:52.218298000 +0200
>@@ -3,8 +3,7 @@
> 
> PORTNAME=	qgis
> DISTVERSIONPREFIX=	final-
>-DISTVERSION=	3_6_2
>-PORTREVISION=	1
>+DISTVERSION=	3_8_2
> CATEGORIES=	graphics geography
> 
> MAINTAINER=	rhurlin@gwdg.de
>@@ -12,13 +11,14 @@
> 
> LICENSE=	GPLv2
> 
>-BUILD_DEPENDS=	gpsbabel>=1.5.4:astro/gpsbabel \
>+BUILD_DEPENDS=	clang${LLVM_VER}:devel/llvm${LLVM_VER} \
>+		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} \
>+		${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.0:devel/py-dateutil@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}future>=0.17.1:devel/py-future@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}httplib2>=0.12.1:www/py-httplib2@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10:devel/py-Jinja2@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10.1:devel/py-Jinja2@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}MarkupSafe>=1.1.1:textproc/py-MarkupSafe@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.4:math/py-matplotlib@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR} \
>@@ -26,8 +26,8 @@
> 		${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.3.0:textproc/py-pygments@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}pyproj>=1.9.6:graphics/py-pyproj@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}pygments>=2.4.1:textproc/py-pygments@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}pyproj>=2.1.3:graphics/py-pyproj@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}pytz>=2019.1:devel/py-pytz@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}requests>=2.21.0:www/py-requests@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}six>=1.12.0:devel/py-six@${PY_FLAVOR} \
>@@ -35,24 +35,30 @@
> 		${PYTHON_PKGNAMEPREFIX}yaml>=5.1:devel/py-yaml@${PY_FLAVOR}
> RUN_DEPENDS=	astyle:devel/astyle \
> 		${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}dateutil>=2.7.3:devel/py-dateutil@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.0:devel/py-dateutil@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}future>=0.17.1:devel/py-future@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}gdal>=2.2.4:graphics/py-gdal@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}gdal>=2.4.1:graphics/py-gdal@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}geojson>=2.3.0:devel/py-geojson@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}httplib2>=0.12.1:www/py-httplib2@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10:devel/py-Jinja2@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10.1:devel/py-Jinja2@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}MarkupSafe>=1.1.1:textproc/py-MarkupSafe@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.4:math/py-matplotlib@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}numpy>=1.11.2:math/py-numpy@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}nbformat>=4.4.0:devel/py-nbformat@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}networkx>=2.1:math/py-networkx@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}numpy>=1.16.1:math/py-numpy@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}OWSLib>=0.17.1:graphics/py-OWSLib@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}pillow>=6.0.0:graphics/py-pillow@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}pip>=9.0.3:devel/py-pip@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}psycopg2>=2.7.7:databases/py-psycopg2@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}pygments>=2.3.0:textproc/py-pygments@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}pyproj>=1.9.6:graphics/py-pyproj@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}psycopg2>=2.8.3:databases/py-psycopg2@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}pygments>=2.4.1:textproc/py-pygments@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}pyproj>=2.1.3:graphics/py-pyproj@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}pytz>=2019.1:devel/py-pytz@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}requests>=2.21.0:www/py-requests@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}scikit-image>=0.14.2_2:graphics/py-scikit-image@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}Shapely>=1.6.4:devel/py-shapely@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}six>=1.12.0:devel/py-six@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}sqlite3>=3.6.8:databases/py-sqlite3@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor@${PY_FLAVOR} \
>@@ -100,7 +106,8 @@
> 		-DPYUIC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyuic5-${PYTHON_VER} \
> 		-DQSCI_SIP_DIR:PATH=${PYQT_SIPDIR}/Qsci \
> 		-DQWT_INCLUDE_DIR:PATH=${LOCALBASE}/include/qt5/qwt6 \
>-		-DQWT_LIBRARY:FILEPATH=${LOCALBASE}/lib/qt5/libqwt6.so
>+		-DQWT_LIBRARY:FILEPATH=${LOCALBASE}/lib/qt5/libqwt6.so \
>+		-DCMAKE_POLICY_DEFAULT_CMP0056:STRING=NEW
> CMAKE_ON=	BUILD_TESTING ENABLE_TESTS WITH_3D WITH_ASTYLE \
> 		WITH_BINDINGS WITH_CUSTOM_WIDGETS WITH_POSTGRESQL
> CMAKE_OFF=	WITH_GLOBE WITH_QWTPOLAR
>@@ -129,6 +136,15 @@
> 
> PLIST_SUB=	DISTVERSION=${PORTVERSION}
> 
>+.include <bsd.port.pre.mk>
>+
>+# make describe needs them here, after bsd.port.pre.mk
>+# clang 7.x and 8.x do not build properly
>+LLVM_VER=	90
>+CPP=		clang-cpp${LLVM_VER}
>+CC=		clang${LLVM_VER}
>+CXX=		clang++${LLVM_VER}
>+
> post-patch:
> 	@${REINPLACE_CMD} -e 's|markupsafe ||g' \
> 		${WRKSRC}/python/ext-libs/CMakeLists.txt
>@@ -143,4 +159,4 @@
> check:
> 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>diff -urN qgis.orig/distinfo qgis/distinfo
>--- qgis.orig/distinfo	2019-05-11 22:54:22.771328000 +0200
>+++ qgis/distinfo	2019-08-25 21:32:50.071447000 +0200
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1557046440
>-SHA256 (qgis-QGIS-final-3_6_2_GH0.tar.gz) = 10920eaac37ea5986a9f833a2db79ec5d5c359edfc6821643a24cfc68df48638
>-SIZE (qgis-QGIS-final-3_6_2_GH0.tar.gz) = 94662525
>+TIMESTAMP = 1566761570
>+SHA256 (qgis-QGIS-final-3_8_2_GH0.tar.gz) = 85be6520cf4dd35f2f5e6dd43f7fb56ff4ffa9bd00fca734433c31f0fe9e67bd
>+SIZE (qgis-QGIS-final-3_8_2_GH0.tar.gz) = 99980486
>diff -urN qgis.orig/pkg-plist qgis/pkg-plist
>--- qgis.orig/pkg-plist	2019-05-11 22:54:22.791761000 +0200
>+++ qgis/pkg-plist	2019-08-25 22:38:22.049568000 +0200
>@@ -17,6 +17,7 @@
> include/qgis/Vector3D.h
> include/qgis/characterwidget.h
> include/qgis/mersenne-twister.h
>+include/qgis/nlohmann/json_fwd.hpp
> include/qgis/qgis.h
> include/qgis/qgis_3d.h
> include/qgis/qgis_analysis.h
>@@ -30,6 +31,7 @@
> include/qgis/qgisplugin.h
> include/qgis/qgs25drenderer.h
> include/qgis/qgs25drendererwidget.h
>+include/qgis/qgs3danimationsettings.h
> include/qgis/qgs3dmapscene.h
> include/qgis/qgs3dmapsettings.h
> include/qgis/qgs3drendererregistry.h
>@@ -52,9 +54,11 @@
> include/qgis/qgsactionscope.h
> include/qgis/qgsactionscoperegistry.h
> include/qgis/qgsadvanceddigitizingdockwidget.h
>+include/qgis/qgsadvanceddigitizingfloater.h
> include/qgis/qgsaggregatecalculator.h
> include/qgis/qgsaggregatetoolbutton.h
> include/qgis/qgsalgorithmimportphotos.h
>+include/qgis/qgsalignmentcombobox.h
> include/qgis/qgsalignraster.h
> include/qgis/qgsanalysis.h
> include/qgis/qgsanimatedicon.h
>@@ -186,6 +190,7 @@
> include/qgis/qgsconnectionpool.h
> include/qgis/qgscontrastenhancement.h
> include/qgis/qgscontrastenhancementfunction.h
>+include/qgis/qgscoordinateboundspreviewmapwidget.h
> include/qgis/qgscoordinateformatter.h
> include/qgis/qgscoordinatereferencesystem.h
> include/qgis/qgscoordinatetransform.h
>@@ -335,6 +340,7 @@
> include/qgis/qgsfillsymbollayer.h
> include/qgis/qgsfilterlineedit.h
> include/qgis/qgsfilterlineeditplugin.h
>+include/qgis/qgsfindfilesbypatternwidget.h
> include/qgis/qgsfloatingwidget.h
> include/qgis/qgsfocuswatcher.h
> include/qgis/qgsfontbutton.h
>@@ -420,6 +426,7 @@
> include/qgis/qgshstoreutils.h
> include/qgis/qgshtmlannotation.h
> include/qgis/qgshtmlutils.h
>+include/qgis/qgshtmlwidgetwrapper.h
> include/qgis/qgshuesaturationfilter.h
> include/qgis/qgsidentifymenu.h
> include/qgis/qgsidwinterpolator.h
>@@ -466,6 +473,7 @@
> include/qgis/qgslayout.h
> include/qgis/qgslayoutaligner.h
> include/qgis/qgslayoutatlas.h
>+include/qgis/qgslayoutcombobox.h
> include/qgis/qgslayoutcustomdrophandler.h
> include/qgis/qgslayoutdesignerinterface.h
> include/qgis/qgslayouteffect.h
>@@ -546,9 +554,11 @@
> include/qgis/qgsline3dsymbol_p.h
> include/qgis/qgslinearminmaxenhancement.h
> include/qgis/qgslinearminmaxenhancementwithclip.h
>+include/qgis/qgslinematerial_p.h
> include/qgis/qgslinesegment.h
> include/qgis/qgslinestring.h
> include/qgis/qgslinesymbollayer.h
>+include/qgis/qgslinevertexdata_p.h
> include/qgis/qgslinuxnative.h
> include/qgis/qgslistfieldformatter.h
> include/qgis/qgslistwidget.h
>@@ -635,6 +645,7 @@
> include/qgis/qgsmeshmemorydataprovider.h
> include/qgis/qgsmeshrenderersettings.h
> include/qgis/qgsmeshspatialindex.h
>+include/qgis/qgsmeshtimesettings.h
> include/qgis/qgsmeshvectorrenderer.h
> include/qgis/qgsmessagebar.h
> include/qgis/qgsmessagebaritem.h
>@@ -682,6 +693,7 @@
> include/qgis/qgsoffscreen3dengine.h
> include/qgis/qgsogcutils.h
> include/qgis/qgsogrhelperfunctions.h
>+include/qgis/qgsonlineterraingenerator.h
> include/qgis/qgsopacitywidget.h
> include/qgis/qgsopacitywidgetplugin.h
> include/qgis/qgsoptional.h
>@@ -743,6 +755,7 @@
> include/qgis/qgsprocessingfeedback.h
> include/qgis/qgsprocessinggui.h
> include/qgis/qgsprocessingguiregistry.h
>+include/qgis/qgsprocessingmaplayercombobox.h
> include/qgis/qgsprocessingmatrixparameterdialog.h
> include/qgis/qgsprocessingmodelalgorithm.h
> include/qgis/qgsprocessingmodelchildalgorithm.h
>@@ -751,6 +764,7 @@
> include/qgis/qgsprocessingmodelerparameterwidget.h
> include/qgis/qgsprocessingmodeloutput.h
> include/qgis/qgsprocessingmodelparameter.h
>+include/qgis/qgsprocessingmultipleselectiondialog.h
> include/qgis/qgsprocessingoutputs.h
> include/qgis/qgsprocessingparameters.h
> include/qgis/qgsprocessingparametertype.h
>@@ -776,6 +790,7 @@
> include/qgis/qgsprojectstorageregistry.h
> include/qgis/qgsprojecttranslator.h
> include/qgis/qgsprojectversion.h
>+include/qgis/qgsprojutils.h
> include/qgis/qgsproperty.h
> include/qgis/qgsproperty_p.h
> include/qgis/qgspropertyassistantwidget.h
>@@ -955,6 +970,7 @@
> include/qgis/qgstabwidget.h
> include/qgis/qgstaskmanager.h
> include/qgis/qgstaskmanagerwidget.h
>+include/qgis/qgsterraindownloader.h
> include/qgis/qgsterrainentity_p.h
> include/qgis/qgsterraingenerator.h
> include/qgis/qgsterraintexturegenerator_p.h
>@@ -977,6 +993,7 @@
> include/qgis/qgstextrenderer_p.h
> include/qgis/qgsthreadingutils.h
> include/qgis/qgsticksscalebarrenderer.h
>+include/qgis/qgstilecache.h
> include/qgis/qgstilingscheme.h
> include/qgis/qgstininterpolator.h
> include/qgis/qgstolerance.h
>@@ -1060,6 +1077,7 @@
> include/qgis/qgsxmlutils.h
> include/qgis/qgsziputils.h
> include/qgis/qgszonalstatistics.h
>+include/qgis/qobjectuniqueptr.h
> include/qgis/ui_qgsarcgisservicesourceselectbase.h
> include/qgis/ui_qgsauthauthoritieseditor.h
> include/qgis/ui_qgsauthcertificateinfo.h
>@@ -1162,6 +1180,7 @@
> %%QT_PLUGINDIR%%/designer/libqgis_customwidgets.so.%%DISTVERSION%%
> man/man1/qgis.1.gz
> share/applications/org.qgis.qgis.desktop
>+share/icons/hicolor/128x128/apps/qgis.png
> share/icons/hicolor/128x128/mimetypes/qgis-mime.png
> share/icons/hicolor/128x128/mimetypes/qgis-qgs.png
> share/icons/hicolor/128x128/mimetypes/qgis-qlr.png
>@@ -1173,41 +1192,49 @@
> share/icons/hicolor/16x16/mimetypes/qgis-qlr.png
> share/icons/hicolor/16x16/mimetypes/qgis-qml.png
> share/icons/hicolor/16x16/mimetypes/qgis-qpt.png
>+share/icons/hicolor/192x192/apps/qgis.png
> share/icons/hicolor/192x192/mimetypes/qgis-mime.png
> share/icons/hicolor/192x192/mimetypes/qgis-qgs.png
> share/icons/hicolor/192x192/mimetypes/qgis-qlr.png
> share/icons/hicolor/192x192/mimetypes/qgis-qml.png
> share/icons/hicolor/192x192/mimetypes/qgis-qpt.png
>+share/icons/hicolor/22x22/apps/qgis.png
> share/icons/hicolor/22x22/mimetypes/qgis-mime.png
> share/icons/hicolor/22x22/mimetypes/qgis-qgs.png
> share/icons/hicolor/22x22/mimetypes/qgis-qlr.png
> share/icons/hicolor/22x22/mimetypes/qgis-qml.png
> share/icons/hicolor/22x22/mimetypes/qgis-qpt.png
>+share/icons/hicolor/24x24/apps/qgis.png
> share/icons/hicolor/24x24/mimetypes/qgis-mime.png
> share/icons/hicolor/24x24/mimetypes/qgis-qgs.png
> share/icons/hicolor/24x24/mimetypes/qgis-qlr.png
> share/icons/hicolor/24x24/mimetypes/qgis-qml.png
> share/icons/hicolor/24x24/mimetypes/qgis-qpt.png
>+share/icons/hicolor/256x256/apps/qgis.png
> share/icons/hicolor/256x256/mimetypes/qgis-mime.png
> share/icons/hicolor/256x256/mimetypes/qgis-qgs.png
> share/icons/hicolor/256x256/mimetypes/qgis-qlr.png
> share/icons/hicolor/256x256/mimetypes/qgis-qml.png
> share/icons/hicolor/256x256/mimetypes/qgis-qpt.png
>+share/icons/hicolor/32x32/apps/qgis.png
> share/icons/hicolor/32x32/mimetypes/qgis-mime.png
> share/icons/hicolor/32x32/mimetypes/qgis-qgs.png
> share/icons/hicolor/32x32/mimetypes/qgis-qlr.png
> share/icons/hicolor/32x32/mimetypes/qgis-qml.png
> share/icons/hicolor/32x32/mimetypes/qgis-qpt.png
>+share/icons/hicolor/36x36/apps/qgis.png
> share/icons/hicolor/36x36/mimetypes/qgis-mime.png
> share/icons/hicolor/36x36/mimetypes/qgis-qgs.png
> share/icons/hicolor/36x36/mimetypes/qgis-qlr.png
> share/icons/hicolor/36x36/mimetypes/qgis-qml.png
> share/icons/hicolor/36x36/mimetypes/qgis-qpt.png
>+share/icons/hicolor/42x42/apps/qgis.png
> share/icons/hicolor/42x42/mimetypes/qgis-mime.png
> share/icons/hicolor/42x42/mimetypes/qgis-qgs.png
> share/icons/hicolor/42x42/mimetypes/qgis-qlr.png
> share/icons/hicolor/42x42/mimetypes/qgis-qml.png
> share/icons/hicolor/42x42/mimetypes/qgis-qpt.png
>+share/icons/hicolor/48x48/apps/qgis.png
> share/icons/hicolor/48x48/mimetypes/qgis-mime.png
> share/icons/hicolor/48x48/mimetypes/qgis-qgs.png
> share/icons/hicolor/48x48/mimetypes/qgis-qlr.png
>@@ -1219,26 +1246,31 @@
> share/icons/hicolor/512x512/mimetypes/qgis-qlr.png
> share/icons/hicolor/512x512/mimetypes/qgis-qml.png
> share/icons/hicolor/512x512/mimetypes/qgis-qpt.png
>+share/icons/hicolor/64x64/apps/qgis.png
> share/icons/hicolor/64x64/mimetypes/qgis-mime.png
> share/icons/hicolor/64x64/mimetypes/qgis-qgs.png
> share/icons/hicolor/64x64/mimetypes/qgis-qlr.png
> share/icons/hicolor/64x64/mimetypes/qgis-qml.png
> share/icons/hicolor/64x64/mimetypes/qgis-qpt.png
>+share/icons/hicolor/72x72/apps/qgis.png
> share/icons/hicolor/72x72/mimetypes/qgis-mime.png
> share/icons/hicolor/72x72/mimetypes/qgis-qgs.png
> share/icons/hicolor/72x72/mimetypes/qgis-qlr.png
> share/icons/hicolor/72x72/mimetypes/qgis-qml.png
> share/icons/hicolor/72x72/mimetypes/qgis-qpt.png
>+share/icons/hicolor/80x80/apps/qgis.png
> share/icons/hicolor/80x80/mimetypes/qgis-mime.png
> share/icons/hicolor/80x80/mimetypes/qgis-qgs.png
> share/icons/hicolor/80x80/mimetypes/qgis-qlr.png
> share/icons/hicolor/80x80/mimetypes/qgis-qml.png
> share/icons/hicolor/80x80/mimetypes/qgis-qpt.png
>+share/icons/hicolor/8x8/apps/qgis.png
> share/icons/hicolor/8x8/mimetypes/qgis-mime.png
> share/icons/hicolor/8x8/mimetypes/qgis-qgs.png
> share/icons/hicolor/8x8/mimetypes/qgis-qlr.png
> share/icons/hicolor/8x8/mimetypes/qgis-qml.png
> share/icons/hicolor/8x8/mimetypes/qgis-qpt.png
>+share/icons/hicolor/96x96/apps/qgis.png
> share/icons/hicolor/96x96/mimetypes/qgis-mime.png
> share/icons/hicolor/96x96/mimetypes/qgis-qgs.png
> share/icons/hicolor/96x96/mimetypes/qgis-qlr.png
>@@ -1538,6 +1570,9 @@
> %%GRASS%%%%DATADIR%%/grass/modules/r.fillnulls.1.png
> %%GRASS%%%%DATADIR%%/grass/modules/r.fillnulls.2.png
> %%GRASS%%%%DATADIR%%/grass/modules/r.fillnulls.qgm
>+%%GRASS%%%%DATADIR%%/grass/modules/r.geomorphon.1.png
>+%%GRASS%%%%DATADIR%%/grass/modules/r.geomorphon.2.png
>+%%GRASS%%%%DATADIR%%/grass/modules/r.geomorphon.qgm
> %%GRASS%%%%DATADIR%%/grass/modules/r.grow.1.png
> %%GRASS%%%%DATADIR%%/grass/modules/r.grow.2.png
> %%GRASS%%%%DATADIR%%/grass/modules/r.grow.distance.1.png
>@@ -2376,20 +2411,17 @@
> %%DATADIR%%/i18n/qgis_da.qm
> %%DATADIR%%/i18n/qgis_de.qm
> %%DATADIR%%/i18n/qgis_el.qm
>-%%DATADIR%%/i18n/qgis_eo.qm
> %%DATADIR%%/i18n/qgis_es.qm
> %%DATADIR%%/i18n/qgis_et.qm
> %%DATADIR%%/i18n/qgis_eu.qm
> %%DATADIR%%/i18n/qgis_fi.qm
> %%DATADIR%%/i18n/qgis_fr.qm
>-%%DATADIR%%/i18n/qgis_gl.qm
> %%DATADIR%%/i18n/qgis_hi.qm
> %%DATADIR%%/i18n/qgis_hu.qm
> %%DATADIR%%/i18n/qgis_id.qm
> %%DATADIR%%/i18n/qgis_is.qm
> %%DATADIR%%/i18n/qgis_it.qm
> %%DATADIR%%/i18n/qgis_ja.qm
>-%%DATADIR%%/i18n/qgis_km.qm
> %%DATADIR%%/i18n/qgis_ko.qm
> %%DATADIR%%/i18n/qgis_ky.qm
> %%DATADIR%%/i18n/qgis_lt.qm
>@@ -2551,12 +2583,6 @@
> %%DATADIR%%/python/plugins/processing/ProcessingPlugin.py
> %%DATADIR%%/python/plugins/processing/__init__.py
> %%DATADIR%%/python/plugins/processing/algs/__init__.py
>-%%DATADIR%%/python/plugins/processing/algs/exampleprovider/CMakeLists.txt
>-%%DATADIR%%/python/plugins/processing/algs/exampleprovider/ExampleAlgorithm.py
>-%%DATADIR%%/python/plugins/processing/algs/exampleprovider/ExampleAlgorithmProvider.py
>-%%DATADIR%%/python/plugins/processing/algs/exampleprovider/ProcessingExampleProviderPlugin.py
>-%%DATADIR%%/python/plugins/processing/algs/exampleprovider/__init__.py
>-%%DATADIR%%/python/plugins/processing/algs/exampleprovider/metadata.txt
> %%DATADIR%%/python/plugins/processing/algs/gdal/AssignProjection.py
> %%DATADIR%%/python/plugins/processing/algs/gdal/Buffer.py
> %%DATADIR%%/python/plugins/processing/algs/gdal/ClipRasterByExtent.py
>@@ -2599,6 +2625,7 @@
> %%DATADIR%%/python/plugins/processing/algs/gdal/ogr2ogrtabletopostgislist.py
> %%DATADIR%%/python/plugins/processing/algs/gdal/ogr2ogrtopostgislist.py
> %%DATADIR%%/python/plugins/processing/algs/gdal/ogrinfo.py
>+%%DATADIR%%/python/plugins/processing/algs/gdal/pansharp.py
> %%DATADIR%%/python/plugins/processing/algs/gdal/pct2rgb.py
> %%DATADIR%%/python/plugins/processing/algs/gdal/polygonize.py
> %%DATADIR%%/python/plugins/processing/algs/gdal/proximity.py
>@@ -2688,6 +2715,7 @@
> %%DATADIR%%/python/plugins/processing/algs/grass7/description/r.fill.stats.txt
> %%DATADIR%%/python/plugins/processing/algs/grass7/description/r.fillnulls.txt
> %%DATADIR%%/python/plugins/processing/algs/grass7/description/r.flow.txt
>+%%DATADIR%%/python/plugins/processing/algs/grass7/description/r.geomorphon.txt
> %%DATADIR%%/python/plugins/processing/algs/grass7/description/r.grow.distance.txt
> %%DATADIR%%/python/plugins/processing/algs/grass7/description/r.grow.txt
> %%DATADIR%%/python/plugins/processing/algs/grass7/description/r.gwflow.txt
>@@ -2794,7 +2822,8 @@
> %%DATADIR%%/python/plugins/processing/algs/grass7/description/r.stats.txt
> %%DATADIR%%/python/plugins/processing/algs/grass7/description/r.stats.zonal.txt
> %%DATADIR%%/python/plugins/processing/algs/grass7/description/r.stream.extract.txt
>-%%DATADIR%%/python/plugins/processing/algs/grass7/description/r.sun.txt
>+%%DATADIR%%/python/plugins/processing/algs/grass7/description/r.sun.incidout.txt
>+%%DATADIR%%/python/plugins/processing/algs/grass7/description/r.sun.insoltime.txt
> %%DATADIR%%/python/plugins/processing/algs/grass7/description/r.sunhours.txt
> %%DATADIR%%/python/plugins/processing/algs/grass7/description/r.sunmask.datetime.txt
> %%DATADIR%%/python/plugins/processing/algs/grass7/description/r.sunmask.position.txt
>@@ -2915,6 +2944,7 @@
> %%DATADIR%%/python/plugins/processing/algs/grass7/description/v.type.txt
> %%DATADIR%%/python/plugins/processing/algs/grass7/description/v.univar.txt
> %%DATADIR%%/python/plugins/processing/algs/grass7/description/v.vect.stats.txt
>+%%DATADIR%%/python/plugins/processing/algs/grass7/description/v.voronoi.skeleton.txt
> %%DATADIR%%/python/plugins/processing/algs/grass7/description/v.voronoi.txt
> %%DATADIR%%/python/plugins/processing/algs/grass7/description/v.what.rast.txt
> %%DATADIR%%/python/plugins/processing/algs/grass7/description/v.what.vect.txt
>@@ -3022,6 +3052,11 @@
> %%DATADIR%%/python/plugins/processing/algs/help/__init__.py
> %%DATADIR%%/python/plugins/processing/algs/help/qgis.yaml
> %%DATADIR%%/python/plugins/processing/algs/help/saga.yaml
>+%%DATADIR%%/python/plugins/processing/algs/otb/OtbAlgorithm.py
>+%%DATADIR%%/python/plugins/processing/algs/otb/OtbAlgorithmProvider.py
>+%%DATADIR%%/python/plugins/processing/algs/otb/OtbChoiceWidget.py
>+%%DATADIR%%/python/plugins/processing/algs/otb/OtbUtils.py
>+%%DATADIR%%/python/plugins/processing/algs/otb/__init__.py
> %%DATADIR%%/python/plugins/processing/algs/qgis/AddTableField.py
> %%DATADIR%%/python/plugins/processing/algs/qgis/Aggregate.py
> %%DATADIR%%/python/plugins/processing/algs/qgis/Aspect.py
>@@ -3067,7 +3102,6 @@
> %%DATADIR%%/python/plugins/processing/algs/qgis/NearestNeighbourAnalysis.py
> %%DATADIR%%/python/plugins/processing/algs/qgis/Orthogonalize.py
> %%DATADIR%%/python/plugins/processing/algs/qgis/PointDistance.py
>-%%DATADIR%%/python/plugins/processing/algs/qgis/PointsAlongGeometry.py
> %%DATADIR%%/python/plugins/processing/algs/qgis/PointsDisplacement.py
> %%DATADIR%%/python/plugins/processing/algs/qgis/PointsFromLines.py
> %%DATADIR%%/python/plugins/processing/algs/qgis/PointsFromPolygons.py
>@@ -3117,6 +3151,7 @@
> %%DATADIR%%/python/plugins/processing/algs/qgis/StatisticsByCategories.py
> %%DATADIR%%/python/plugins/processing/algs/qgis/SumLines.py
> %%DATADIR%%/python/plugins/processing/algs/qgis/TextToFloat.py
>+%%DATADIR%%/python/plugins/processing/algs/qgis/TilesXYZ.py
> %%DATADIR%%/python/plugins/processing/algs/qgis/TinInterpolation.py
> %%DATADIR%%/python/plugins/processing/algs/qgis/TopoColors.py
> %%DATADIR%%/python/plugins/processing/algs/qgis/TruncateTable.py
>@@ -3663,10 +3698,15 @@
> %%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/OtbAlgorithmsTest.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/QgisAlgorithmsTest2.py
>+%%DATADIR%%/python/plugins/processing/tests/QgisAlgorithmsTest3.py
>+%%DATADIR%%/python/plugins/processing/tests/QgisAlgorithmsTest4.py
> %%DATADIR%%/python/plugins/processing/tests/SagaAlgorithmsTest.py
>+%%DATADIR%%/python/plugins/processing/tests/ScriptUtilsTest.py
> %%DATADIR%%/python/plugins/processing/tests/TestData.py
> %%DATADIR%%/python/plugins/processing/tests/ToolsTest.py
> %%DATADIR%%/python/plugins/processing/tests/__init__.py
>@@ -3708,10 +3748,13 @@
> %%DATADIR%%/python/pyplugin_installer/__init__.py
> %%DATADIR%%/python/pyplugin_installer/installer.py
> %%DATADIR%%/python/pyplugin_installer/installer_data.py
>+%%DATADIR%%/python/pyplugin_installer/plugindependencies.py
>+%%DATADIR%%/python/pyplugin_installer/qgsplugindependenciesdialog.py
> %%DATADIR%%/python/pyplugin_installer/qgsplugininstallerfetchingdialog.py
> %%DATADIR%%/python/pyplugin_installer/qgsplugininstallerinstallingdialog.py
> %%DATADIR%%/python/pyplugin_installer/qgsplugininstallerpluginerrordialog.py
> %%DATADIR%%/python/pyplugin_installer/qgsplugininstallerrepositorydialog.py
>+%%DATADIR%%/python/pyplugin_installer/ui_qgsplugindependenciesdialogbase.py
> %%DATADIR%%/python/pyplugin_installer/ui_qgsplugininstallerfetchingbase.py
> %%DATADIR%%/python/pyplugin_installer/ui_qgsplugininstallerinstallingbase.py
> %%DATADIR%%/python/pyplugin_installer/ui_qgsplugininstallerpluginerrorbase.py
>@@ -3748,6 +3791,7 @@
> %%DATADIR%%/python/qgis/core/additions/__init__.py
> %%DATADIR%%/python/qgis/core/additions/edit.py
> %%DATADIR%%/python/qgis/core/additions/fromfunction.py
>+%%DATADIR%%/python/qgis/core/additions/markerlinesymbollayer.py
> %%DATADIR%%/python/qgis/core/additions/metaenum.py
> %%DATADIR%%/python/qgis/core/additions/processing.py
> %%DATADIR%%/python/qgis/core/additions/projectdirtyblocker.py
>@@ -5004,9 +5048,13 @@
> %%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-disabled.svg
> %%DATADIR%%/resources/themes/Blend of Gray/icons/qcheckbox-checked.svg
>+%%DATADIR%%/resources/themes/Blend of Gray/icons/qcheckbox-unchecked-disabled.svg
> %%DATADIR%%/resources/themes/Blend of Gray/icons/qcheckbox-unchecked.svg
>+%%DATADIR%%/resources/themes/Blend of Gray/icons/qradiobox-checked-disabled.svg
> %%DATADIR%%/resources/themes/Blend of Gray/icons/qradiobox-checked.svg
>+%%DATADIR%%/resources/themes/Blend of Gray/icons/qradiobox-unchecked-disabled.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
>@@ -5023,9 +5071,13 @@
> %%DATADIR%%/resources/themes/Night Mapping/icons/eye.svg
> %%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-disabled.svg
> %%DATADIR%%/resources/themes/Night Mapping/icons/qcheckbox-checked.svg
>+%%DATADIR%%/resources/themes/Night Mapping/icons/qcheckbox-unchecked-disabled.svg
> %%DATADIR%%/resources/themes/Night Mapping/icons/qcheckbox-unchecked.svg
>+%%DATADIR%%/resources/themes/Night Mapping/icons/qradiobox-checked-disabled.svg
> %%DATADIR%%/resources/themes/Night Mapping/icons/qradiobox-checked.svg
>+%%DATADIR%%/resources/themes/Night Mapping/icons/qradiobox-unchecked-disabled.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

Flags:

rhurlin: maintainer-approval+

Actions: View | Diff

Attachments on bug 240124: 206923