Attachment 180738 Details for Bug 217719 – patch to update graphics/qgis from 2.18.2 to 2.18.4

[patch] patch to update graphics/qgis from 2.18.2 to 2.18.4

patch-qgis_2.18.2-2.18.4.diff (text/plain), 9.47 KB, created by Rainer Hurling on 2017-03-12 06:50:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rainer Hurling

Created: 2017-03-12 06:50:37 UTC

Size: 9.47 KB

patch

obsolete

>diff -urN qgis.orig/Makefile qgis/Makefile
>--- qgis.orig/Makefile	2017-03-11 15:14:14.000000000 +0100
>+++ qgis/Makefile	2017-03-11 15:14:14.000000000 +0100
>@@ -3,8 +3,7 @@
> 
> PORTNAME=	qgis
> DISTVERSIONPREFIX=	final-
>-DISTVERSION=	2_18_2
>-PORTREVISION=	1
>+DISTVERSION=	2_18_4
> CATEGORIES=	graphics geography
> 
> MAINTAINER=	rhurlin@gwdg.de
>@@ -51,7 +50,8 @@
> SERVER_DESC=		Enable QGIS server
> TESTS_DESC=		Run the test suite after build process
> 
>-CMAKE_ARGS+=	-DWITH_ORACLE:BOOL=FALSE \
>+CMAKE_ARGS+=	-DENABLE_QT5=OFF -DENABLE_PYTHON3=OFF \
>+		-DWITH_ORACLE:BOOL=FALSE \
> 		-DWITH_GLOBE:BOOL=FALSE
> 
> .if !defined(MAINTAINER_MODE)
>@@ -91,36 +91,40 @@
> POSTGIS_CMAKE_ON=	-DWITH_POSTGRESQL:BOOL=TRUE
> POSTGIS_CMAKE_OFF=	-DWITH_POSTGRESQL:BOOL=FALSE
> 
>-PYTHON_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}future>=0.14.3:devel/py-future \
>+PYTHON_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future \
> 			${PYTHON_PKGNAMEPREFIX}httplib2>=2-0.9.2:www/py-httplib2 \
> 			${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2 \
>-			${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.23:textproc/py-MarkupSafe \
>-			${PYTHON_PKGNAMEPREFIX}matplotlib>=1.4.3:math/py-matplotlib \
>+			${PYTHON_PKGNAMEPREFIX}MarkupSafe>=1.0:textproc/py-MarkupSafe \
>+			${PYTHON_PKGNAMEPREFIX}matplotlib>=1.5.3:math/py-matplotlib \
> 			${PYTHON_PKGNAMEPREFIX}mock>=1.3.0:devel/py-mock \
>-			${PYTHON_PKGNAMEPREFIX}pip>=8.0.2:devel/py-pip \
>+			${PYTHON_PKGNAMEPREFIX}pbr>=1.8.1:devel/py-pbr \
>+			${PYTHON_PKGNAMEPREFIX}pip>=9.0.1:devel/py-pip \
> 			${PYTHON_PKGNAMEPREFIX}pygments>=2.1.3:textproc/py-pygments \
>+			${PYTHON_PKGNAMEPREFIX}pyproj>=1.9.5.1:graphics/py-pyproj \
> 			${PYTHON_PKGNAMEPREFIX}pyspatialite>=3.0.1:databases/pyspatialite \
>-			${PYTHON_PKGNAMEPREFIX}pytz>=2016.6.1,1:devel/py-pytz \
>-			${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \
>+			${PYTHON_PKGNAMEPREFIX}pytz>=2016.10:devel/py-pytz \
>+			${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests \
> 			${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six \
>-			${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.6:databases/py-sqlite3 \
>+			${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.13:databases/py-sqlite3 \
> 			${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml
>-PYTHON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}future>=0.14.3:devel/py-future \
>+PYTHON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future \
> 			${PYTHON_PKGNAMEPREFIX}gdal>=2.0.1:graphics/py-gdal \
> 			${PYTHON_PKGNAMEPREFIX}httplib2>=2-0.9.2:www/py-httplib2 \
> 			${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2 \
>-			${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.23:textproc/py-MarkupSafe \
>-			${PYTHON_PKGNAMEPREFIX}matplotlib>=1.4.3:math/py-matplotlib \
>+			${PYTHON_PKGNAMEPREFIX}MarkupSafe>=1.0:textproc/py-MarkupSafe \
>+			${PYTHON_PKGNAMEPREFIX}matplotlib>=1.5.3:math/py-matplotlib \
> 			${PYTHON_PKGNAMEPREFIX}mock>=1.3.0:devel/py-mock \
> 			${PYTHON_PKGNAMEPREFIX}numpy>=1.11.2,1:math/py-numpy \
>-			${PYTHON_PKGNAMEPREFIX}pip>=8.0.2:devel/py-pip \
>+			${PYTHON_PKGNAMEPREFIX}pbr>=1.8.1:devel/py-pbr \
>+			${PYTHON_PKGNAMEPREFIX}pip>=9.0.1:devel/py-pip \
> 			${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.3:databases/py-psycopg2 \
> 			${PYTHON_PKGNAMEPREFIX}pygments>=2.1.3:textproc/py-pygments \
>+			${PYTHON_PKGNAMEPREFIX}pyproj>=1.9.5.1:graphics/py-pyproj \
> 			${PYTHON_PKGNAMEPREFIX}pyspatialite>=3.0.1:databases/pyspatialite \
>-			${PYTHON_PKGNAMEPREFIX}pytz>=2016.6.1,1:devel/py-pytz \
>-			${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \
>+			${PYTHON_PKGNAMEPREFIX}pytz>=2016.10:devel/py-pytz \
>+			${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests \
> 			${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six \
>-			${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.6:databases/py-sqlite3 \
>+			${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.13:databases/py-sqlite3 \
> 			${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor \
> 			${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml
> PYTHON_CMAKE_ON=	-DWITH_BINDINGS:BOOL=TRUE
>@@ -141,7 +145,7 @@
> USES+=		compiler:features
> .else
> USES+=		compiler:gcc-c++11-lib
>-BUILD_DEPENDS+=	flex>=2.5.39:textproc/flex
>+BUILD_DEPENDS+=	flex>=2.6.1:textproc/flex
> CMAKE_ARGS+=	-DFLEX_EXECUTABLE:STRING=${LOCALBASE}/bin/flex
> CXXFLAGS+=	-I${LOCALBASE}/include/flex
> .endif
>diff -urN qgis.orig/distinfo qgis/distinfo
>--- qgis.orig/distinfo	2017-03-11 13:56:28.000000000 +0100
>+++ qgis/distinfo	2017-03-11 13:56:28.000000000 +0100
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1482452795
>-SHA256 (qgis-QGIS-final-2_18_2_GH0.tar.gz) = d61c0b28bc9aa84b36bbe8b25cb4432b5f8d31836431976d5bc8d43d4808647b
>-SIZE (qgis-QGIS-final-2_18_2_GH0.tar.gz) = 98127033
>+TIMESTAMP = 1489236988
>+SHA256 (qgis-QGIS-final-2_18_4_GH0.tar.gz) = a53e2fc55e4a02b786519158aec697cbb2305c8e1d88075b493dfe6a105d3cfa
>+SIZE (qgis-QGIS-final-2_18_4_GH0.tar.gz) = 100388432
>diff -urN qgis.orig/pkg-plist qgis/pkg-plist
>--- qgis.orig/pkg-plist	2017-03-11 14:20:01.000000000 +0100
>+++ qgis/pkg-plist	2017-03-11 14:20:01.000000000 +0100
>@@ -736,21 +736,21 @@
> include/qgis/ui_qgssqlcomposerdialogbase.h
> include/qgis/ui_qgssublayersdialogbase.h
> lib/libqgis_analysis.so
>-lib/libqgis_analysis.so.2.18.2
>+lib/libqgis_analysis.so.2.18.4
> lib/libqgis_app.so
>-lib/libqgis_app.so.2.18.2
>+lib/libqgis_app.so.2.18.4
> lib/libqgis_core.so
>-lib/libqgis_core.so.2.18.2
>+lib/libqgis_core.so.2.18.4
> lib/libqgis_gui.so
>-lib/libqgis_gui.so.2.18.2
>+lib/libqgis_gui.so.2.18.4
> lib/libqgis_networkanalysis.so
>-lib/libqgis_networkanalysis.so.2.18.2
>+lib/libqgis_networkanalysis.so.2.18.4
> %%SERVER%%lib/libqgis_server.so
>-%%SERVER%%lib/libqgis_server.so.2.18.2
>+%%SERVER%%lib/libqgis_server.so.2.18.4
> %%GRASS%%lib/libqgisgrass6.so
>-%%GRASS%%lib/libqgisgrass6.so.2.18.2
>+%%GRASS%%lib/libqgisgrass6.so.2.18.4
> %%PYTHON%%lib/libqgispython.so
>-%%PYTHON%%lib/libqgispython.so.2.18.2
>+%%PYTHON%%lib/libqgispython.so.2.18.4
> %%PYTHON%%%%CUSTOMWIDGETS%%%%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qgis_customwidgets.py
> lib/qgis/crssync
> %%GRASS%%lib/qgis/grass/bin/qgis.g.browser6
>@@ -799,7 +799,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.2
>+%%CUSTOMWIDGETS%%%%QT_PLUGINDIR%%/designer/libqgis_customwidgets.so.2.18.4
> man/man1/qbrowser.1.gz
> man/man1/qgis.1.gz
> share/applications/qgis.desktop
>@@ -2130,6 +2130,14 @@
> %%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/__init__.py
> %%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/connector.py
> %%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/data_model.py
>+%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/gpkg/__init__.py
>+%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/gpkg/connector.py
>+%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/gpkg/data_model.py
>+%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/gpkg/icons/gpkg_icon.png
>+%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/gpkg/info_model.py
>+%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/gpkg/plugin.py
>+%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/gpkg/resources_rc.py
>+%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/gpkg/sql_dictionary.py
> %%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/html_elems.py
> %%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/info_model.py
> %%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/plugin.py
>@@ -2157,14 +2165,6 @@
> %%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/plugins/versioning/ui_DlgVersioning.py
> %%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/resources_rc.py
> %%POSTGIS%%%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/postgis/sql_dictionary.py
>-%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/gpkg/__init__.py
>-%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/gpkg/connector.py
>-%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/gpkg/data_model.py
>-%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/gpkg/icons/gpkg_icon.png
>-%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/gpkg/info_model.py
>-%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/gpkg/plugin.py
>-%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/gpkg/resources_rc.py
>-%%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/gpkg/sql_dictionary.py
> %%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/spatialite/__init__.py
> %%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/spatialite/connector.py
> %%PYTHON%%%%DATADIR%%/python/plugins/db_manager/db_plugins/spatialite/data_model.py
>@@ -5175,6 +5175,7 @@
> %%PYTHON%%%%DATADIR%%/python/pyplugin_installer/unzip.py
> %%PYTHON%%%%DATADIR%%/python/pyplugin_installer/version_compare.py
> %%PYTHON%%%%DATADIR%%/python/qgis/PyQt/Qsci.py
>+%%PYTHON%%%%DATADIR%%/python/qgis/PyQt/Qt.py
> %%PYTHON%%%%DATADIR%%/python/qgis/PyQt/QtCore.py
> %%PYTHON%%%%DATADIR%%/python/qgis/PyQt/QtGui.py
> %%PYTHON%%%%DATADIR%%/python/qgis/PyQt/QtNetwork.py
>@@ -5217,9 +5218,9 @@
> %%PYTHON%%%%DATADIR%%/python/qsci_apis/PyQt4-4.7.4.api
> %%PYTHON%%%%DATADIR%%/python/qsci_apis/Python-2.5.api
> %%PYTHON%%%%DATADIR%%/python/qsci_apis/Python-2.6.api
>-%%PYTHON%%%%DATADIR%%/python/qsci_apis/Python-2.7.api
>+%%PYTHON%%%%DATADIR%%/python/qsci_apis/Python-%%PYTHON_VER%%.api
> %%PYTHON%%%%DATADIR%%/python/qsci_apis/QScintilla2-2.4.5.api
>-%%PYTHON%%%%DATADIR%%/python/qsci_apis/QScintilla2-2.7.2.api
>+%%PYTHON%%%%DATADIR%%/python/qsci_apis/QScintilla2-%%PYTHON_VER%%.2.api
> %%PYTHON%%%%DATADIR%%/python/qsci_apis/pyqgis.pap
> %%DATADIR%%/resources/cpt-city-qgis-min/README-qgis.txt
> %%DATADIR%%/resources/cpt-city-qgis-min/README.txt

Actions: View | Diff

Attachments on bug 217719: 180738