Attachment 189906 Details for Bug 224404 – patch to update graphics/qgis to 2.18.15 with correct removal of /tmp/srs.db

[patch] patch to update graphics/qgis to 2.18.15 with correct removal of /tmp/srs.db

patch-qgis_2.18.14-2.18.15_corr.diff (text/plain), 3.11 KB, created by Rainer Hurling on 2018-01-19 14:47:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rainer Hurling

Created: 2018-01-19 14:47:15 UTC

Size: 3.11 KB

patch

obsolete

>diff -urN qgis.orig/Makefile qgis/Makefile
>--- qgis.orig/Makefile	2017-12-09 22:02:40.792243000 +0100
>+++ qgis/Makefile	2018-01-19 15:30:41.132550000 +0100
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	qgis
> DISTVERSIONPREFIX=	final-
>-DISTVERSION=	2_18_14
>+DISTVERSION=	2_18_15
> CATEGORIES=	graphics geography
> 
> MAINTAINER=	rhurlin@gwdg.de
>@@ -144,6 +144,8 @@
> 
> INSTALLS_ICONS=		yes
> 
>+.include <bsd.port.pre.mk>
>+
> 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
>@@ -185,9 +187,11 @@
> 	${INSTALL_DATA} ${WRKSRC}/debian/${PORTNAME}-icon${SZ}x${SZ}.png \
> 		${STAGEDIR}${PREFIX}/share/icons/hicolor/${SZ}x${SZ}/apps/${PORTNAME}.png
> .endfor
>+.if ${PORT_OPTIONS:MTESTS}
> 	${RM} /tmp/srs.db
>+.endif
> 
> check:
> 	(cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check)
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>diff -urN qgis.orig/distinfo qgis/distinfo
>--- qgis.orig/distinfo	2017-12-09 22:02:40.713086000 +0100
>+++ qgis/distinfo	2017-12-16 16:06:17.102889000 +0100
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1511094312
>-SHA256 (qgis-QGIS-final-2_18_14_GH0.tar.gz) = f8912cddca6673b54fcbea8b418d877b51d7229ebd4caec07bdb5fbfda6851e4
>-SIZE (qgis-QGIS-final-2_18_14_GH0.tar.gz) = 99324977
>+TIMESTAMP = 1513436777
>+SHA256 (qgis-QGIS-final-2_18_15_GH0.tar.gz) = d47eb5ab7ad7c469f911eb8e8249a771becc9969c3909f773a48d29774a653c7
>+SIZE (qgis-QGIS-final-2_18_15_GH0.tar.gz) = 99339627
>diff -urN qgis.orig/pkg-plist qgis/pkg-plist
>--- qgis.orig/pkg-plist	2017-12-09 22:02:40.801516000 +0100
>+++ qgis/pkg-plist	2017-12-16 16:06:25.094444000 +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.14
>+lib/libqgis_analysis.so.2.18.15
> lib/libqgis_app.so
>-lib/libqgis_app.so.2.18.14
>+lib/libqgis_app.so.2.18.15
> lib/libqgis_core.so
>-lib/libqgis_core.so.2.18.14
>+lib/libqgis_core.so.2.18.15
> lib/libqgis_gui.so
>-lib/libqgis_gui.so.2.18.14
>+lib/libqgis_gui.so.2.18.15
> lib/libqgis_networkanalysis.so
>-lib/libqgis_networkanalysis.so.2.18.14
>+lib/libqgis_networkanalysis.so.2.18.15
> %%SERVER%%lib/libqgis_server.so
>-%%SERVER%%lib/libqgis_server.so.2.18.14
>+%%SERVER%%lib/libqgis_server.so.2.18.15
> %%GRASS%%lib/libqgisgrass7.so
>-%%GRASS%%lib/libqgisgrass7.so.2.18.14
>+%%GRASS%%lib/libqgisgrass7.so.2.18.15
> %%PYTHON%%lib/libqgispython.so
>-%%PYTHON%%lib/libqgispython.so.2.18.14
>+%%PYTHON%%lib/libqgispython.so.2.18.15
> %%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.14
>+%%CUSTOMWIDGETS%%%%QT_PLUGINDIR%%/designer/libqgis_customwidgets.so.2.18.15
> man/man1/qbrowser.1.gz
> man/man1/qgis.1.gz
> share/applications/qgis.desktop

Flags:

rhurlin: maintainer-approval+

Actions: View | Diff

Attachments on bug 224404: 188915 | 189906