Attachment 188295 Details for Bug 223887 – patch to update graphics/qgis from 2.18.12 to 2.18.14

[patch] patch to update graphics/qgis from 2.18.12 to 2.18.14

patch-qgis_2.18.12_1-2.18.14.diff (text/plain), 16.04 KB, created by Rainer Hurling on 2017-11-26 17:59:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rainer Hurling

Created: 2017-11-26 17:59:41 UTC

Size: 16.04 KB

patch

obsolete

>diff -urN qgis.orig/Makefile qgis/Makefile
>--- qgis.orig/Makefile	2017-11-19 15:18:01.653729000 +0100
>+++ qgis/Makefile	2017-11-19 13:15:51.476616000 +0100
>@@ -3,8 +3,7 @@
> 
> PORTNAME=	qgis
> DISTVERSIONPREFIX=	final-
>-DISTVERSION=	2_18_12
>-PORTREVISION=	1
>+DISTVERSION=	2_18_14
> CATEGORIES=	graphics geography
> 
> MAINTAINER=	rhurlin@gwdg.de
>@@ -80,7 +79,7 @@
> 
> GRASS_BUILD_DEPENDS=	grass72:databases/grass7
> GRASS_RUN_DEPENDS=	grass72:databases/grass7
>-GRASS_CMAKE_ON=		-DWITH_GRASS7:BOOL=TRUE -DGRASS_PREFIX7=${LOCALBASE}/grass-7.2.1
>+GRASS_CMAKE_ON=		-DWITH_GRASS7:BOOL=TRUE -DGRASS_PREFIX7=${LOCALBASE}/grass-7.2.2
> GRASS_FORCE_MAKE_JOBS=	NO
> GRASS_CMAKE_OFF=	-DWITH_GRASS7:BOOL=FALSE
> 
>@@ -107,6 +106,7 @@
> 			${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests \
> 			${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six \
> 			${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.13:databases/py-sqlite3 \
>+			${PYTHON_PKGNAMEPREFIX}wxPython-common>=3.0.2.0:x11-toolkits/py-wxPython-common \
> 			${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml
> PYTHON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler \
> 			${PYTHON_PKGNAMEPREFIX}dateutil>=2.6.0:devel/py-dateutil \
>@@ -130,6 +130,7 @@
> 			${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six \
> 			${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.13:databases/py-sqlite3 \
> 			${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor \
>+			${PYTHON_PKGNAMEPREFIX}wxPython-common>=3.0.2.0:x11-toolkits/py-wxPython-common \
> 			${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml
> PYTHON_CMAKE_ON=	-DWITH_BINDINGS:BOOL=TRUE
> PYTHON_CMAKE_OFF=	-DWITH_BINDINGS:BOOL=FALSE
>@@ -184,6 +185,7 @@
> 	${INSTALL_DATA} ${WRKSRC}/debian/${PORTNAME}-icon${SZ}x${SZ}.png \
> 		${STAGEDIR}${PREFIX}/share/icons/hicolor/${SZ}x${SZ}/apps/${PORTNAME}.png
> .endfor
>+	${RM} /tmp/srs.db
> 
> check:
> 	(cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check)
>diff -urN qgis.orig/distinfo qgis/distinfo
>--- qgis.orig/distinfo	2017-11-19 15:18:01.655622000 +0100
>+++ qgis/distinfo	2017-11-19 13:25:12.043494000 +0100
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1503130352
>-SHA256 (qgis-QGIS-final-2_18_12_GH0.tar.gz) = 154920b5c79f587589f04b9da6f52ddbb8b6acace61f665aa79f6681d5fb5346
>-SIZE (qgis-QGIS-final-2_18_12_GH0.tar.gz) = 99289641
>+TIMESTAMP = 1511094312
>+SHA256 (qgis-QGIS-final-2_18_14_GH0.tar.gz) = f8912cddca6673b54fcbea8b418d877b51d7229ebd4caec07bdb5fbfda6851e4
>+SIZE (qgis-QGIS-final-2_18_14_GH0.tar.gz) = 99324977
>diff -urN qgis.orig/files/patch-debian_qgis.desktop qgis/files/patch-debian_qgis.desktop
>--- qgis.orig/files/patch-debian_qgis.desktop	2017-11-19 15:18:01.645733000 +0100
>+++ qgis/files/patch-debian_qgis.desktop	2017-11-26 18:52:35.594852000 +0100
>@@ -1,4 +1,4 @@
>---- debian/qgis.desktop.orig	2016-10-21 12:14:02 UTC
>+--- debian/qgis.desktop.orig	2017-10-27 12:00:21 UTC
> +++ debian/qgis.desktop
> @@ -1,7 +1,9 @@
>  [Desktop Entry]
>@@ -10,3 +10,16 @@
>  GenericName=Geographic Information System
>  GenericName[ar]=ÙØ¸Ø§Ù Ø§ÙÙØ¹ÙÙÙØ§Øª Ø§ÙØ¬ØºØ±Ø§ÙÙ
>  GenericName[az]=CoÄrafi informasiya sistemi
>+@@ -47,9 +49,9 @@ GenericName[th]=à¸£à¸°à¸à¸à¸ªà¸²à¸£à¸ªà¸à¹à¸à¸¨à¸
>+ GenericName[tr]=CoÄrafi bilgi sistemi
>+ GenericName[uk]=ÐÐµÐ¾ÑÐ½ÑÐ¾ÑÐ¼Ð°ÑÑÐ¹Ð½Ð° ÑÐ¸ÑÑÐµÐ¼Ð°
>+ GenericName[uz]=Geografik axborot tizimi
>+-Icon=qgis
>+-TryExec=/usr/bin/qgis
>+-Exec=/usr/bin/qgis %F
>++Icon=qgis-icon
>++TryExec=/usr/local/bin/qgis
>++Exec=/usr/local/bin/qgis %F
>+ Terminal=false
>+ StartupNotify=false
>+ Categories=Qt;Education;Science;Geography;
>diff -urN qgis.orig/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py qgis/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py
>--- qgis.orig/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py	1970-01-01 01:00:00.000000000 +0100
>+++ qgis/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py	2017-11-26 18:52:35.596990000 +0100
>@@ -0,0 +1,11 @@
>+--- python/plugins/processing/algs/saga/SagaAlgorithmProvider.py.orig	2017-10-27 12:00:21 UTC
>++++ python/plugins/processing/algs/saga/SagaAlgorithmProvider.py
>+@@ -73,7 +73,7 @@ class SagaAlgorithmProvider(AlgorithmProvider):
>+                                    self.tr('Problem with SAGA installation: SAGA was not found or is not correctly installed'))
>+             return
>+ 
>+-        if not version.startswith('2.3.'):
>++        if version < '2.3.':
>+             ProcessingLog.addToLog(ProcessingLog.LOG_ERROR,
>+                                    self.tr('Problem with SAGA installation: unsupported SAGA version found.'))
>+             return
>diff -urN qgis.orig/files/patch-python_plugins_processing_algs_saga_SagaUtils.py qgis/files/patch-python_plugins_processing_algs_saga_SagaUtils.py
>--- qgis.orig/files/patch-python_plugins_processing_algs_saga_SagaUtils.py	1970-01-01 01:00:00.000000000 +0100
>+++ qgis/files/patch-python_plugins_processing_algs_saga_SagaUtils.py	2017-11-26 18:52:35.599048000 +0100
>@@ -0,0 +1,55 @@
>+--- python/plugins/processing/algs/saga/SagaUtils.py.orig	2017-10-27 12:00:21 UTC
>++++ python/plugins/processing/algs/saga/SagaUtils.py
>+@@ -26,6 +26,7 @@ __copyright__ = '(C) 2012, Victor Olaya'
>+ __revision__ = '$Format:%H$'
>+ 
>+ import os
>++import platform
>+ import stat
>+ import subprocess
>+ import time
>+@@ -57,7 +58,7 @@ def sagaBatchJobFilename():
>+ 
>+ def findSagaFolder():
>+     folder = None
>+-    if isMac():
>++    if isMac() or platform.system() == 'FreeBSD':
>+         testfolder = os.path.join(QgsApplication.prefixPath(), 'bin')
>+         if os.path.exists(os.path.join(testfolder, 'saga_cmd')):
>+             folder = testfolder
>+@@ -82,7 +83,7 @@ def findSagaFolder():
>+ 
>+ 
>+ def sagaPath():
>+-    if not isWindows() and not isMac():
>++    if not isWindows() and not isMac() and not platform.system() == 'FreeBSD':
>+         return ''
>+ 
>+     folder = findSagaFolder()
>+@@ -101,7 +102,7 @@ def createSagaBatchJobFileFromSagaCommands(commands):
>+         fout.write('set SAGA_MLB=' + sagaPath() + os.sep +
>+                    'modules' + '\n')
>+         fout.write('PATH=%PATH%;%SAGA%;%SAGA_MLB%\n')
>+-    elif isMac():
>++    elif isMac()  or platform.system() == 'FreeBSD':
>+         fout.write('export SAGA_MLB=' + sagaPath() +
>+                    '/../lib/saga\n')
>+         fout.write('export PATH=' + sagaPath() + ':$PATH\n')
>+@@ -130,7 +131,7 @@ def getSagaInstalledVersion(runSaga=False):
>+ 
>+     if isWindows():
>+         commands = [os.path.join(sagaPath(), "saga_cmd.exe"), "-v"]
>+-    elif isMac():
>++    elif isMac() or platform.system() == 'FreeBSD':
>+         commands = [os.path.join(sagaPath(), "saga_cmd -v")]
>+     else:
>+         # for Linux use just one string instead of separated parameters as the list
>+@@ -146,7 +147,7 @@ def getSagaInstalledVersion(runSaga=False):
>+             stderr=subprocess.STDOUT,
>+             universal_newlines=True,
>+         ).stdout
>+-        if isMac():  # This trick avoids having an uninterrupted system call exception if SAGA is not installed
>++        if isMac() or platform.system() == 'FreeBSD':  # This trick avoids having an uninterrupted system call exception if SAGA is not installed
>+             time.sleep(1)
>+         try:
>+             lines = proc.readlines()
>diff -urN qgis.orig/files/patch-src_plugins_grass_CMakeLists.txt qgis/files/patch-src_plugins_grass_CMakeLists.txt
>--- qgis.orig/files/patch-src_plugins_grass_CMakeLists.txt	2017-11-19 15:18:01.647895000 +0100
>+++ qgis/files/patch-src_plugins_grass_CMakeLists.txt	2017-11-26 18:52:35.601105000 +0100
>@@ -1,6 +1,6 @@
>---- src/plugins/grass/CMakeLists.txt.orig	2016-10-21 12:14:02 UTC
>+--- src/plugins/grass/CMakeLists.txt.orig	2017-10-27 12:00:21 UTC
> +++ src/plugins/grass/CMakeLists.txt
>-@@ -202,6 +202,7 @@ MACRO(ADD_GRASSPLUGIN GRASS_BUILD_VERSIO
>+@@ -202,6 +202,7 @@ MACRO(ADD_GRASSPLUGIN GRASS_BUILD_VERSION)
>        qgis_app
>        qgis_gui
>        ${OPENPTY_LIBRARY}
>diff -urN qgis.orig/pkg-plist qgis/pkg-plist
>--- qgis.orig/pkg-plist	2017-11-19 15:18:01.652424000 +0100
>+++ qgis/pkg-plist	2017-11-19 15:55:52.000000000 +0100
>@@ -758,21 +758,21 @@
> include/qgis/ui_qgssqlcomposerdialogbase.h
> include/qgis/ui_qgssublayersdialogbase.h
> lib/libqgis_analysis.so
>-lib/libqgis_analysis.so.2.18.12
>+lib/libqgis_analysis.so.2.18.14
> lib/libqgis_app.so
>-lib/libqgis_app.so.2.18.12
>+lib/libqgis_app.so.2.18.14
> lib/libqgis_core.so
>-lib/libqgis_core.so.2.18.12
>+lib/libqgis_core.so.2.18.14
> lib/libqgis_gui.so
>-lib/libqgis_gui.so.2.18.12
>+lib/libqgis_gui.so.2.18.14
> lib/libqgis_networkanalysis.so
>-lib/libqgis_networkanalysis.so.2.18.12
>+lib/libqgis_networkanalysis.so.2.18.14
> %%SERVER%%lib/libqgis_server.so
>-%%SERVER%%lib/libqgis_server.so.2.18.12
>+%%SERVER%%lib/libqgis_server.so.2.18.14
> %%GRASS%%lib/libqgisgrass7.so
>-%%GRASS%%lib/libqgisgrass7.so.2.18.12
>+%%GRASS%%lib/libqgisgrass7.so.2.18.14
> %%PYTHON%%lib/libqgispython.so
>-%%PYTHON%%lib/libqgispython.so.2.18.12
>+%%PYTHON%%lib/libqgispython.so.2.18.14
> %%PYTHON%%%%CUSTOMWIDGETS%%%%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qgis_customwidgets.py
> lib/qgis/crssync
> %%GRASS%%lib/qgis/grass/bin/qgis.g.browser7
>@@ -821,7 +821,7 @@
> lib/qgis/plugins/libzonalstatisticsplugin.so
> lib/qgis/qgis_help
> %%CUSTOMWIDGETS%%%%QT_PLUGINDIR%%/designer/libqgis_customwidgets.so
>-%%CUSTOMWIDGETS%%%%QT_PLUGINDIR%%/designer/libqgis_customwidgets.so.2.18.12
>+%%CUSTOMWIDGETS%%%%QT_PLUGINDIR%%/designer/libqgis_customwidgets.so.2.18.14
> man/man1/qbrowser.1.gz
> man/man1/qgis.1.gz
> share/applications/qgis.desktop
>@@ -2541,7 +2541,6 @@
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/description/i.vi.txt
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/description/i.zc.txt
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/description/m.cogo.txt
>-%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/description/nviz.txt
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/description/r.aspect.txt
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/description/r.basins.fill.txt
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/description/r.blend.combine.txt
>@@ -2928,7 +2927,6 @@
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/ext/v_what_rast_points.py
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/ext/v_what_vect.py
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/grass7.txt
>-%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/nviz7.py
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/help/__init__.py
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/help/qgis.yaml
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/help/saga.yaml
>@@ -4211,6 +4209,7 @@
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/qgis/ExportGeometryInfo.py
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/qgis/ExtentFromLayer.py
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/qgis/ExtractByAttribute.py
>+%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/qgis/ExtractByExpression.py
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/qgis/ExtractByLocation.py
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/qgis/ExtractNodes.py
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/qgis/FieldPyculator.py
>@@ -4405,14 +4404,12 @@
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/DiffusiveHillslopeEvolution(FTCS).txt
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/DirectionalAverage.txt
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/DirectionalStatisticsforSingleGrid.txt
>-%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/Distance(ViGrA).txt
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/DistanceMatrix.txt
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/DiurnalAnisotropicHeating.txt
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/DiversityOfCategories.txt
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/DownslopeDistanceGradient.txt
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/EarthsOrbitalParameters.txt
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/EdgeContamination.txt
>-%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/EdgeDetection(ViGrA).txt
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/EffectiveAirFlowHeights.txt
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/EnhancedVegetationIndex.txt
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/EnumerateTableField.txt
>@@ -4436,10 +4433,6 @@
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/FlowAccumulation(Top-Down).txt
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/FlowPathLength.txt
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/FlowWidthandSpecificCatchmentArea.txt
>-%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/FourierFilter(ViGrA).txt
>-%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/FourierTransform(RealViGrA).txt
>-%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/FourierTransform(ViGrA).txt
>-%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/FourierTransformInverse(ViGrA).txt
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/FourierTransformation(OpenCV).txt
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/Fragmentation(Alternative).txt
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/Fragmentation(Standard).txt
>@@ -4529,7 +4522,6 @@
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/ModifiedQuadraticShepard.txt
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/MonthlyGlobalbyLatitude.txt
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/MorphologicalFilter(OpenCV).txt
>-%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/MorphologicalFilter(ViGrA).txt
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/MorphologicalFilter.txt
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/MorphometricFeatures.txt
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/MorphometricProtectionIndex.txt
>@@ -4590,7 +4582,6 @@
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/RadiusofVariance(Grid).txt
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/RandomField.txt
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/RandomForestClassification(OpenCV).txt
>-%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/RandomForestPresencePrediction(ViGrA).txt
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/RandomTerrain.txt
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/RandomTerrainGeneration.txt
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/RankFilter.txt
>@@ -4631,7 +4622,6 @@
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/Slope,Aspect,Curvature.txt
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/SlopeLength.txt
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/SlopeLimitedFlowAccumulation.txt
>-%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/Smoothing(ViGrA).txt
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/SnapPointstoGrid.txt
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/SnapPointstoLines.txt
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/SnapPointstoPoints.txt
>@@ -4692,7 +4682,6 @@
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/WarpingShapes.txt
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/WaterRetentionCapacity.txt
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/WatershedBasins.txt
>-%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/WatershedSegmentation(ViGrA).txt
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/WatershedSegmentation.txt
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/WindEffect(WindwardLeewardIndex).txt
> %%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/WindExpositionIndex.txt

Flags:

rhurlin: maintainer-approval+

Actions: View | Diff

Attachments on bug 223887: 188295