Attachment 171085 Details for Bug 210070 – patch to update QGIS from 2.14.2 to 2.14.3

[patch] patch to update QGIS from 2.14.2 to 2.14.3

patch-qgis_2.14.2-2.14.3.diff (text/plain), 6.44 KB, created by Rainer Hurling on 2016-06-06 08:39:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rainer Hurling

Created: 2016-06-06 08:39:34 UTC

Size: 6.44 KB

patch

obsolete

>diff -urN qgis.orig/Makefile qgis/Makefile
>--- qgis.orig/Makefile	2016-06-01 16:48:27.712717000 +0200
>+++ qgis/Makefile	2016-06-06 09:51:19.938801000 +0200
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	qgis
> DISTVERSIONPREFIX=	final-
>-DISTVERSION=	2_14_2
>+DISTVERSION=	2_14_3
> CATEGORIES=	graphics geography
> 
> MAINTAINER=	rhurlin@gwdg.de
>@@ -12,12 +12,14 @@
> LICENSE=	GPLv2
> 
> BUILD_DEPENDS=	txt2tags:textproc/txt2tags
>-LIB_DEPENDS=	libgdal.so:graphics/gdal \
>+LIB_DEPENDS=	libexpat.so:textproc/expat2 \
>+		libgdal.so:graphics/gdal \
> 		libgeos.so:graphics/geos \
> 		libgsl.so:math/gsl \
> 		libproj.so:graphics/proj \
> 		libqca.so:devel/qca \
> 		libqscintilla2.so:devel/qscintilla2 \
>+		libQtWebKit.so:www/webkit-qt4 \
> 		libqwt.so:x11-toolkits/qwt5 \
> 		libspatialindex.so:devel/spatialindex \
> 		libspatialite.so:databases/spatialite
>@@ -25,9 +27,10 @@
> USE_GITHUB=	yes
> GH_PROJECT=	${PORTNAME:tu}
> 
>-USES=		cpe bison cmake desktop-file-utils execinfo fortran gmake python:2 sqlite
>-USE_QT4=	gui svg xml network sql designer testlib linguist_build \
>-		qmake_build moc_build rcc_build uic_build
>+USES=		bison cmake cpe desktop-file-utils execinfo fortran \
>+		gmake python:2 sqlite
>+USE_QT4=	corelib designer gui linguist_build moc_build network \
>+		qmake_build rcc_build script sql svg testlib uic_build xml
> 
> USE_LDCONFIG=	yes
> ICON_SIZES=	8 16 22 24 32 36 42 48 64 72 80 96 128 192 256 512
>@@ -65,11 +68,13 @@
> GRASS_CMAKE_OFF=	-DWITH_GRASS:BOOL=FALSE
> GRASS_FORCE_MAKE_JOBS=	NO
> 
>+POSTGIS_USES=		pgsql
> POSTGIS_LIB_DEPENDS=	liblwgeom.so:databases/postgis21
> POSTGIS_CMAKE_ON=	-DWITH_POSTGRESQL:BOOL=TRUE
> POSTGIS_CMAKE_OFF=	-DWITH_POSTGRESQL:BOOL=FALSE
> 
>-PYTHON_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=1.4.3:math/py-matplotlib \
>+PYTHON_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}future>=0.14.3:devel/py-future \
>+			${PYTHON_PKGNAMEPREFIX}matplotlib>=1.4.3:math/py-matplotlib \
> 			${PYTHON_PKGNAMEPREFIX}mock>=1.3.0:devel/py-mock \
> 			${PYTHON_PKGNAMEPREFIX}pip>=8.0.2:devel/py-pip \
> 			${PYTHON_PKGNAMEPREFIX}qt4-core>=4.8.5:devel/py-qt4-core \
>@@ -82,7 +87,8 @@
> 			${PYTHON_PKGNAMEPREFIX}sip>=4.14.6:devel/py-sip \
> 			${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.6:databases/py-sqlite3 \
> 			${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml
>-PYTHON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gdal>=2.0.1:graphics/py-gdal \
>+PYTHON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}future>=0.14.3:devel/py-future \
>+			${PYTHON_PKGNAMEPREFIX}gdal>=2.0.1:graphics/py-gdal \
> 			${PYTHON_PKGNAMEPREFIX}matplotlib>=1.4.3:math/py-matplotlib \
> 			${PYTHON_PKGNAMEPREFIX}mock>=1.3.0:devel/py-mock \
> 			${PYTHON_PKGNAMEPREFIX}numpy>=1.9.1:math/py-numpy \
>diff -urN qgis.orig/distinfo qgis/distinfo
>--- qgis.orig/distinfo	2016-06-01 16:48:27.712978000 +0200
>+++ qgis/distinfo	2016-06-02 07:02:57.000000000 +0200
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1464775659
>-SHA256 (qgis-QGIS-final-2_14_2_GH0.tar.gz) = 211455372606f08aa8a423aa2792d5785901f162411b8eaaab22cf745226cfe9
>-SIZE (qgis-QGIS-final-2_14_2_GH0.tar.gz) = 87856676
>+TIMESTAMP = 1464843777
>+SHA256 (qgis-QGIS-final-2_14_3_GH0.tar.gz) = 5423fff2b0ed0572eb01700b7a5b8ba4e06f7d59392ec0a9e1b3dbeb7fe44608
>+SIZE (qgis-QGIS-final-2_14_3_GH0.tar.gz) = 87864988
>diff -urN qgis.orig/pkg-plist qgis/pkg-plist
>--- qgis.orig/pkg-plist	2016-05-04 06:48:59.188636000 +0200
>+++ qgis/pkg-plist	2016-06-02 08:10:48.000000000 +0200
>@@ -657,21 +657,21 @@
> include/qgis/ui_qgsquerybuilderbase.h
> include/qgis/ui_qgssublayersdialogbase.h
> lib/libqgis_analysis.so
>-lib/libqgis_analysis.so.2.14.2
>+lib/libqgis_analysis.so.2.14.3
> lib/libqgis_app.so
>-lib/libqgis_app.so.2.14.2
>+lib/libqgis_app.so.2.14.3
> lib/libqgis_core.so
>-lib/libqgis_core.so.2.14.2
>+lib/libqgis_core.so.2.14.3
> lib/libqgis_gui.so
>-lib/libqgis_gui.so.2.14.2
>+lib/libqgis_gui.so.2.14.3
> lib/libqgis_networkanalysis.so
>-lib/libqgis_networkanalysis.so.2.14.2
>+lib/libqgis_networkanalysis.so.2.14.3
> %%SERVER%%lib/libqgis_server.so
>-%%SERVER%%lib/libqgis_server.so.2.14.2
>+%%SERVER%%lib/libqgis_server.so.2.14.3
> %%GRASS%%lib/libqgisgrass6.so
>-%%GRASS%%lib/libqgisgrass6.so.2.14.2
>+%%GRASS%%lib/libqgisgrass6.so.2.14.3
> %%PYTHON%%lib/libqgispython.so
>-%%PYTHON%%lib/libqgispython.so.2.14.2
>+%%PYTHON%%lib/libqgispython.so.2.14.3
> %%PYTHON%%%%CUSTOMWIDGETS%%%%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qgis_customwidgets.py
> lib/qgis/crssync
> %%GRASS%%lib/qgis/grass/bin/qgis.g.browser6
>@@ -717,7 +717,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.14.2
>+%%CUSTOMWIDGETS%%%%QT_PLUGINDIR%%/designer/libqgis_customwidgets.so.2.14.3
> man/man1/qbrowser.1.gz
> man/man1/qgis.1.gz
> share/applications/qgis.desktop
>@@ -1840,14 +1840,6 @@
> %%DATADIR%%/images/icons/qgis-icon-60x60_xmas.png
> %%DATADIR%%/images/icons/qgis-icon.png
> %%DATADIR%%/images/icons/qgis-mime-icon.png
>-%%PYTHON%%%%DATADIR%%/python/PyQt/Qsci.py
>-%%PYTHON%%%%DATADIR%%/python/PyQt/QtCore.py
>-%%PYTHON%%%%DATADIR%%/python/PyQt/QtGui.py
>-%%PYTHON%%%%DATADIR%%/python/PyQt/QtPrintSupport.py
>-%%PYTHON%%%%DATADIR%%/python/PyQt/QtWebKit.py
>-%%PYTHON%%%%DATADIR%%/python/PyQt/QtWebKitWidgets.py
>-%%PYTHON%%%%DATADIR%%/python/PyQt/QtWidgets.py
>-%%PYTHON%%%%DATADIR%%/python/PyQt/__init__.py
> %%PYTHON%%%%DATADIR%%/python/console/__init__.py
> %%PYTHON%%%%DATADIR%%/python/console/console.py
> %%PYTHON%%%%DATADIR%%/python/console/console_compile_apis.py
>@@ -5631,6 +5623,22 @@
> %%PYTHON%%%%DATADIR%%/python/pytz/zoneinfo/posixrules
> %%PYTHON%%%%DATADIR%%/python/pytz/zoneinfo/zone.tab
> %%PYTHON%%%%DATADIR%%/python/pytz/zoneinfo/zone1970.tab
>+%%PYTHON%%%%DATADIR%%/python/qgis/PyQt/Qsci.py
>+%%PYTHON%%%%DATADIR%%/python/qgis/PyQt/QtCore.py
>+%%PYTHON%%%%DATADIR%%/python/qgis/PyQt/QtGui.py
>+%%PYTHON%%%%DATADIR%%/python/qgis/PyQt/QtNetwork.py
>+%%PYTHON%%%%DATADIR%%/python/qgis/PyQt/QtPrintSupport.py
>+%%PYTHON%%%%DATADIR%%/python/qgis/PyQt/QtSql.py
>+%%PYTHON%%%%DATADIR%%/python/qgis/PyQt/QtSvg.py
>+%%PYTHON%%%%DATADIR%%/python/qgis/PyQt/QtTest.py
>+%%PYTHON%%%%DATADIR%%/python/qgis/PyQt/QtWebKit.py
>+%%PYTHON%%%%DATADIR%%/python/qgis/PyQt/QtWebKitWidgets.py
>+%%PYTHON%%%%DATADIR%%/python/qgis/PyQt/QtWidgets.py
>+%%PYTHON%%%%DATADIR%%/python/qgis/PyQt/QtXml.py
>+%%PYTHON%%%%DATADIR%%/python/qgis/PyQt/__init__.py
>+%%PYTHON%%%%DATADIR%%/python/qgis/PyQt/uic/__init__.py
>+%%PYTHON%%%%DATADIR%%/python/qgis/PyQt/uic/properties.py
>+%%PYTHON%%%%DATADIR%%/python/qgis/PyQt/uic/pyuic.py
> %%PYTHON%%%%DATADIR%%/python/qgis/__init__.py
> %%PYTHON%%%%DATADIR%%/python/qgis/_analysis.so
> %%PYTHON%%%%DATADIR%%/python/qgis/_core.so

Flags:

rhurlin: maintainer-approval+

Actions: View | Diff

Attachments on bug 210070: 171085