Attachment 156679 Details for Bug 200144 – patch qgis to 2.8.2

[patch] patch qgis to 2.8.2

patch-qgis_2.8.1-2.8.2.diff (text/plain), 11.12 KB, created by Rainer Hurling on 2015-05-12 07:08:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rainer Hurling

Created: 2015-05-12 07:08:39 UTC

Size: 11.12 KB

patch

obsolete

>diff -urN qgis.orig/Makefile qgis/Makefile
>--- qgis.orig/Makefile	2015-05-03 11:58:03.375352000 +0200
>+++ qgis/Makefile	2015-05-11 09:58:48.814304000 +0200
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/graphics/qgis/Makefile 385218 2015-05-02 20:42:41Z brd $
> 
> PORTNAME=	qgis
>-PORTVERSION=	2.8.1
>-PORTREVISION=	2
>+PORTVERSION=	2.8.2
> CATEGORIES=	graphics geography
> 
> MAINTAINER=	rhurlin@gwdg.de
>@@ -24,9 +23,9 @@
> 
> USE_GITHUB=	yes
> GH_PROJECT=	${PORTNAME:tu}
>-GH_TAGNAME=	ddccf8e
>+GH_TAGNAME=	1b929ef
> 
>-USES=		bison cmake fortran gmake python
>+USES=		cpe bison cmake fortran gmake python
> USE_SQLITE=	yes
> USE_QT4=	gui svg xml network sql designer testlib linguist_build \
> 		qmake_build moc_build rcc_build uic_build
>diff -urN qgis.orig/distinfo qgis/distinfo
>--- qgis.orig/distinfo	2015-05-03 11:58:03.322828000 +0200
>+++ qgis/distinfo	2015-05-11 09:57:01.297405000 +0200
>@@ -1,2 +1,2 @@
>-SHA256 (qgis-QGIS-2.8.1-ddccf8e_GH0.tar.gz) = aef5cddedb7f8a412b831ad7ed877cc9ce8d61cb4c17bcd49db5a3a73a840ccb
>-SIZE (qgis-QGIS-2.8.1-ddccf8e_GH0.tar.gz) = 69487659
>+SHA256 (qgis-QGIS-2.8.2-1b929ef_GH0.tar.gz) = 57b42edf5d917eca82c9d6f6e518e69c0c0964975964414971ebe66975494a44
>+SIZE (qgis-QGIS-2.8.2-1b929ef_GH0.tar.gz) = 69520771
>diff -urN qgis.orig/pkg-plist qgis/pkg-plist
>--- qgis.orig/pkg-plist	2015-05-03 11:58:03.522256000 +0200
>+++ qgis/pkg-plist	2015-05-11 10:49:18.654475000 +0200
>@@ -534,19 +534,19 @@
> include/qgis/ui_qgsquerybuilderbase.h
> include/qgis/ui_qgssublayersdialogbase.h
> lib/libqgis_analysis.so
>-lib/libqgis_analysis.so.2.8.1
>+lib/libqgis_analysis.so.2.8.2
> lib/libqgis_core.so
>-lib/libqgis_core.so.2.8.1
>+lib/libqgis_core.so.2.8.2
> lib/libqgis_gui.so
>-lib/libqgis_gui.so.2.8.1
>+lib/libqgis_gui.so.2.8.2
> lib/libqgis_networkanalysis.so
>-lib/libqgis_networkanalysis.so.2.8.1
>+lib/libqgis_networkanalysis.so.2.8.2
> %%QGIS_SERVER%%lib/libqgis_server.so
>-%%QGIS_SERVER%%lib/libqgis_server.so.2.8.1
>+%%QGIS_SERVER%%lib/libqgis_server.so.2.8.2
> %%GRASS%%lib/libqgisgrass.so
>-%%GRASS%%lib/libqgisgrass.so.2.8.1
>+%%GRASS%%lib/libqgisgrass.so.2.8.2
> %%QGIS_PYTHON%%lib/libqgispython.so
>-%%QGIS_PYTHON%%lib/libqgispython.so.2.8.1
>+%%QGIS_PYTHON%%lib/libqgispython.so.2.8.2
> lib/qgis/crssync
> %%GRASS%%lib/qgis/grass/bin/qgis.g.browser
> %%GRASS%%lib/qgis/grass/modules/qgis.d.rast
>@@ -1519,7 +1519,6 @@
> %%DATADIR%%/i18n/qgis_ko.qm
> %%DATADIR%%/i18n/qgis_lt.qm
> %%DATADIR%%/i18n/qgis_lv.qm
>-%%DATADIR%%/i18n/qgis_mn.qm
> %%DATADIR%%/i18n/qgis_nb.qm
> %%DATADIR%%/i18n/qgis_nl.qm
> %%DATADIR%%/i18n/qgis_pl.qm
>@@ -2795,7 +2794,7 @@
> %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/qgis/SplitLinesWithLines.py
> %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/qgis/StatisticsByCategories.py
> %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/qgis/SumLines.py
>-%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/qgis/SymetricalDifference.py
>+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/qgis/SymmetricalDifference.py
> %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/qgis/TextToFloat.py
> %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/qgis/Union.py
> %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/qgis/UniqueValues.py
>@@ -3327,34 +3326,69 @@
> %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/versioncheck.py
> %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/TauDEMAlgorithm.py
> %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/TauDEMAlgorithmProvider.py
>+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/TauDEMMultifileAlgorithm.py
> %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/TauDEMUtils.py
> %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/__init__.py
>-%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/aread8.txt
>-%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/areadinf.txt
>-%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/d8flowdir.txt
>-%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/d8flowpathextremeup.txt
>-%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/d8hdisttostrm.txt
>-%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/dinfavalanche.txt
>-%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/dinfconclimaccum.txt
>-%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/dinfdecayaccum.txt
>-%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/dinfflowdir.txt
>-%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/dinfrevaccum.txt
>-%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/dinfupdependence.txt
>-%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/moveoutletstostrm.txt
>-%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/pitremove.txt
>-%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/slopearearatio.txt
>-%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/slopeavedown.txt
>-%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/streamnet.txt
>-%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/threshold.txt
>+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/multi/aread8.txt
>+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/multi/areadinf.txt
>+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/multi/d8flowdir.txt
>+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/multi/d8flowpathextremeup.txt
>+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/multi/d8hdisttostrm.txt
>+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/multi/dinfavalanche.txt
>+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/multi/dinfconclimaccum.txt
>+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/multi/dinfdecayaccum.txt
>+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/multi/dinfflowdir.txt
>+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/multi/dinfrevaccum.txt
>+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/multi/dinfupdependence.txt
>+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/multi/gagewatershed.txt
>+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/multi/gagewatershed2.txt
>+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/multi/moveoutletstostrm.txt
>+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/multi/pitremove.txt
>+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/multi/selectgtthreshold.txt
>+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/multi/slopearearatio.txt
>+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/multi/slopeavedown.txt
>+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/multi/streamnet.txt
>+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/multi/threshold.txt
>+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/multi/twi.txt
>+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/single/aread8.txt
>+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/single/areadinf.txt
>+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/single/d8flowdir.txt
>+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/single/d8flowpathextremeup.txt
>+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/single/d8hdisttostrm.txt
>+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/single/dinfavalanche.txt
>+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/single/dinfconclimaccum.txt
>+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/single/dinfdecayaccum.txt
>+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/single/dinfflowdir.txt
>+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/single/dinfrevaccum.txt
>+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/single/dinfupdependence.txt
>+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/single/gagewatershed.txt
>+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/single/gagewatershed2.txt
>+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/single/moveoutletstostrm.txt
>+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/single/pitremove.txt
>+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/single/selectgtthreshold.txt
>+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/single/slopearearatio.txt
>+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/single/slopeavedown.txt
>+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/single/streamnet.txt
>+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/single/threshold.txt
>+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/description/single/twi.txt
> %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/dinfdistdown.py
>+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/dinfdistdown_multi.py
> %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/dinfdistup.py
>+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/dinfdistup_multi.py
> %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/dinftranslimaccum.py
> %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/dinftranslimaccum2.py
>+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/dinftranslimaccum2_multi.py
>+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/dinftranslimaccum_multi.py
> %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/dropanalysis.py
>+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/dropanalysis_multi.py
> %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/gridnet.py
>+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/gridnet_multi.py
> %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/lengtharea.py
>+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/lengtharea_multi.py
> %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/peukerdouglas.py
>+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/peukerdouglas_multi.py
> %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/slopearea.py
>+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/algs/taudem/slopearea_multi.py
> %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/core/AlgorithmProvider.py
> %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/core/GeoAlgorithm.py
> %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/processing/core/GeoAlgorithmExecutionException.py

Flags:

koobs: maintainer-approval+

Actions: View | Diff

Attachments on bug 200144: 156679 | 156680 | 156681 | 156682 | 156683