Attachment 167087 Details for Bug 206412 – patch to update from 2.12.2_1 to 2.12.3

[patch] patch to update from 2.12.2_1 to 2.12.3

patch-qgis_2.12.2-2.12.3b.diff (text/plain), 5.19 KB, created by Rainer Hurling on 2016-02-16 18:52:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rainer Hurling

Created: 2016-02-16 18:52:02 UTC

Size: 5.19 KB

patch

obsolete

>diff -urN qgis.orig/Makefile qgis/Makefile
>--- qgis.orig/Makefile	2016-02-16 16:53:21.031265000 +0100
>+++ qgis/Makefile	2016-02-16 18:03:59.585561000 +0100
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/graphics/qgis/Makefile 408979 2016-02-16 07:00:07Z lme $
> 
> PORTNAME=	qgis
>-PORTVERSION=	2.12.2
>-PORTREVISION=	1
>+PORTVERSION=	2.12.3
> CATEGORIES=	graphics geography
> 
> MAINTAINER=	rhurlin@gwdg.de
>@@ -24,24 +23,24 @@
> 
> USE_GITHUB=	yes
> GH_PROJECT=	${PORTNAME:tu}
>-GH_TAGNAME=	B403532
>+GH_TAGNAME=	99ac688
> 
>-USES=		cpe bison cmake execinfo fortran gmake sqlite python
>+USES=		cpe bison cmake execinfo fortran gmake python sqlite
> USE_QT4=	gui svg xml network sql designer testlib linguist_build \
> 		qmake_build moc_build rcc_build uic_build
> 
> USE_LDCONFIG=	yes
> 
>-OPTIONS_DEFINE=		POSTGIS PYTHON GRASS SERVER
>+OPTIONS_DEFINE=		PYTHON POSTGIS GRASS SERVER
> OPTIONS_GROUP=		DEVELOPER
> OPTIONS_GROUP_DEVELOPER=	CUSTOMWIDGETS ASTYLE DEBUG
>-OPTIONS_DEFAULT=	POSTGIS PYTHON
>+OPTIONS_DEFAULT=	PYTHON POSTGIS
> OPTIONS_SUB=		yes
> NO_OPTIONS_SORT=	yes
> ASTYLE_DESC=		Enable AStyle for QGis
> CUSTOMWIDGETS_DESC=	Enable QT4/QGis Custom Widgets
> DEBUG_DESC=		Write Debugging Output to Console
>-SERVER_DESC=	Enable QGIS server
>+SERVER_DESC=		Enable QGIS server
> 
> CMAKE_ARGS+=	-DWITH_ORACLE:BOOL=FALSE
> 
>@@ -69,10 +68,6 @@
> POSTGIS_CMAKE_ON=	-DWITH_POSTGRESQL:BOOL=TRUE
> POSTGIS_CMAKE_OFF=	-DWITH_POSTGRESQL:BOOL=FALSE
> 
>-SERVER_LIB_DEPENDS=	libfcgi.so:${PORTSDIR}/www/fcgi
>-SERVER_CMAKE_ON=	-DWITH_SERVER:BOOL=TRUE
>-SERVER_CMAKE_OFF=	-DWITH_SERVER:BOOL=FALSE
>-
> PYTHON_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-core>=4.8.5:${PORTSDIR}/devel/py-qt4-core \
> 			${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.8.5:${PORTSDIR}/x11-toolkits/py-qt4-gui \
> 			${PYTHON_PKGNAMEPREFIX}qt4-network>=4.8.5:${PORTSDIR}/net/py-qt4-network \
>@@ -98,6 +93,10 @@
> PYTHON_CMAKE_ON=	-DWITH_BINDINGS:BOOL=TRUE
> PYTHON_CMAKE_OFF=	-DWITH_BINDINGS:BOOL=FALSE
> 
>+SERVER_LIB_DEPENDS=	libfcgi.so:${PORTSDIR}/www/fcgi
>+SERVER_CMAKE_ON=	-DWITH_SERVER:BOOL=TRUE
>+SERVER_CMAKE_OFF=	-DWITH_SERVER:BOOL=FALSE
>+
> .include <bsd.port.options.mk>
> 
> .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000033
>@@ -112,5 +111,19 @@
> pre-patch:
> 	@${REINPLACE_CMD} -e 's|tr( "QGIS code revision" ) + QString( "</td><td><a href=\\"https://github.com/qgis/QGIS/commit/%1\\">%1</a></td>" ).arg( QGis::QGIS_DEV_VERSION )|tr( "QGIS code revision" ) + "</td><td>" + tr( "${GH_TAGNAME}" ) + "</td>"|g' \
> 		${WRKSRC}/src/app/qgisapp.cpp
>+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000033
>+# [Ugly workaround!] Because of GitHub #76aa035 from 2015-05-23
>+# 'Hide shared library symbols by default on GCC and Clang',
>+# some layer properties are not visible on FreeBSD > 9.x
>+	@${REINPLACE_CMD} -e 's|SET(CMAKE_CXX_FLAGS "$${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")|#SET(CMAKE_CXX_FLAGS "$${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")|g' \
>+		${WRKSRC}/src/analysis/CMakeLists.txt \
>+		${WRKSRC}/src/app/CMakeLists.txt \
>+		${WRKSRC}/src/core/CMakeLists.txt \
>+		${WRKSRC}/src/customwidgets/CMakeLists.txt \
>+		${WRKSRC}/src/gui/CMakeLists.txt \
>+		${WRKSRC}/src/plugins/CMakeLists.txt \
>+		${WRKSRC}/src/python/CMakeLists.txt \
>+		${WRKSRC}/src/server/CMakeLists.txt
>+.endif
> 
> .include <bsd.port.mk>
>diff -urN qgis.orig/distinfo qgis/distinfo
>--- qgis.orig/distinfo	2016-01-10 07:36:32.019097000 +0100
>+++ qgis/distinfo	2016-01-18 17:45:13.249119000 +0100
>@@ -1,2 +1,2 @@
>-SHA256 (qgis-QGIS-2.12.2-B403532_GH0.tar.gz) = 47b3c1d67af3a02c6c387036c032245e044d5bd65fd2c8c4da2bcc45ff86ccfd
>-SIZE (qgis-QGIS-2.12.2-B403532_GH0.tar.gz) = 80837408
>+SHA256 (qgis-QGIS-2.12.3-99ac688_GH0.tar.gz) = 550fc21c7a8c4b7a5f1997fdfcc338916a880050a94eee792218c61a12a7fd9e
>+SIZE (qgis-QGIS-2.12.3-99ac688_GH0.tar.gz) = 80834484
>diff -urN qgis.orig/pkg-plist qgis/pkg-plist
>--- qgis.orig/pkg-plist	2016-02-16 16:53:21.048904000 +0100
>+++ qgis/pkg-plist	2016-02-16 18:09:27.687729000 +0100
>@@ -631,21 +631,21 @@
> include/qgis/ui_qgsquerybuilderbase.h
> include/qgis/ui_qgssublayersdialogbase.h
> lib/libqgis_analysis.so
>-lib/libqgis_analysis.so.2.12.2
>+lib/libqgis_analysis.so.2.12.3
> lib/libqgis_app.so
>-lib/libqgis_app.so.2.12.2
>+lib/libqgis_app.so.2.12.3
> lib/libqgis_core.so
>-lib/libqgis_core.so.2.12.2
>+lib/libqgis_core.so.2.12.3
> lib/libqgis_gui.so
>-lib/libqgis_gui.so.2.12.2
>+lib/libqgis_gui.so.2.12.3
> lib/libqgis_networkanalysis.so
>-lib/libqgis_networkanalysis.so.2.12.2
>+lib/libqgis_networkanalysis.so.2.12.3
> %%SERVER%%lib/libqgis_server.so
>-%%SERVER%%lib/libqgis_server.so.2.12.2
>+%%SERVER%%lib/libqgis_server.so.2.12.3
> %%GRASS%%lib/libqgisgrass6.so
>-%%GRASS%%lib/libqgisgrass6.so.2.12.2
>+%%GRASS%%lib/libqgisgrass6.so.2.12.3
> %%PYTHON%%lib/libqgispython.so
>-%%PYTHON%%lib/libqgispython.so.2.12.2
>+%%PYTHON%%lib/libqgispython.so.2.12.3
> %%CUSTOMWIDGETS%%%%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qgis_customwidgets.py
> lib/qgis/crssync
> %%GRASS%%lib/qgis/grass/bin/qgis.g.browser6
>@@ -691,7 +691,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.12.2
>+%%CUSTOMWIDGETS%%%%QT_PLUGINDIR%%/designer/libqgis_customwidgets.so.2.12.3
> man/man1/qbrowser.1.gz
> man/man1/qgis.1.gz
> %%DATADIR%%/FindQGIS.cmake

Flags:

rhurlin: maintainer-approval+

Actions: View | Diff

Attachments on bug 206412: 165837 | 167087