cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to QGIS 2.18.13.

Browse Source 
Remove python/core/qgscoordinatetransform.sip patch, was fixed
differently upstream in https://issues.qgis.org/issues/17039
This commit is contained in:
landry 2017-09-18 12:12:46 +00:00
parent 0b267664fe
commit 202e9dfea5
5 changed files with 11 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
geo/qgis/Makefile
View File

@ -1,16 +1,16 @@
# $OpenBSD: Makefile,v 1.74 2017/08/28 12:25:16 landry Exp $
# $OpenBSD: Makefile,v 1.75 2017/09/18 12:12:46 landry Exp $
COMMENT = desktop geographical information system
DISTNAME = qgis-2.18.12
DISTNAME = qgis-2.18.13
EXTRACT_SUFX = .tar.bz2
CATEGORIES = geo x11
SHARED_LIBS = qgis_core 17.3 \
SHARED_LIBS = qgis_core 18.0 \
qgis_app 5.0 \
qgis_gui 16.3 \
qgis_gui 16.4 \
qgis_analysis 8.0 \
qgis_server 5.1 \
qgis_server 5.2 \
qgispython 5.0 \
qgis_networkanalysis 2.0

4
geo/qgis/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (qgis-2.18.12.tar.bz2) = evcJrIa/f7M1CWK+3dJz8Wns+m8/YNMlTHCKJqQpAjo=
SIZE (qgis-2.18.12.tar.bz2) = 84936155
SHA256 (qgis-2.18.13.tar.bz2) = Yr99QotjXR4K8z1NndBFvAXFJPNNVy6IIRseOh4fdAw=
SIZE (qgis-2.18.13.tar.bz2) = 84909363

16
geo/qgis/patches/patch-python_core_qgscoordinatetransform_sip
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-python_core_qgscoordinatetransform_sip,v 1.1 2017/07/19 15:48:31 zhuk Exp $
Fix build with py-sip-4.19.3.
Idea taken from Arch Linux, see https://aur.archlinux.org/packages/qgis/
Index: python/core/qgscoordinatetransform.sip
--- python/core/qgscoordinatetransform.sip.orig
+++ python/core/qgscoordinatetransform.sip
@@ -15,7 +15,6 @@
class QgsCoordinateTransform : QObject
{
%TypeHeaderCode
-extern PyObject *sipExportedExceptions__core[2]; // workaround: sipExportedExceptions__core is only defined in the first sip part
#include <qgscoordinatetransform.h>
%End

5
geo/qgis/patches/patch-src_app_qgisapp_cpp
View File

@ -1,4 +1,3 @@
$OpenBSD: patch-src_app_qgisapp_cpp,v 1.19 2017/05/31 11:49:28 landry Exp $
Fix paths to docs
Index: src/app/qgisapp.cpp
@ -13,7 +12,7 @@ Index: src/app/qgisapp.cpp
connect( mActionHelpContents, SIGNAL( triggered() ), this, SLOT( helpContents() ) );
connect( mActionHelpAPI, SIGNAL( triggered() ), this, SLOT( apiDocumentation() ) );
@@ -9160,7 +9160,7 @@ void QgisApp::helpContents()
@@ -9161,7 +9161,7 @@ void QgisApp::helpContents()
void QgisApp::apiDocumentation()
{
@ -22,7 +21,7 @@ Index: src/app/qgisapp.cpp
{
openURL( "api/index.html" );
}
@@ -9189,7 +9189,7 @@ void QgisApp::openURL( QString url, bool useQgisDocDir
@@ -9190,7 +9190,7 @@ void QgisApp::openURL( QString url, bool useQgisDocDir
// open help in user browser
if ( useQgisDocDirectory )
{

3
geo/qgis/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.32 2017/08/28 12:25:16 landry Exp $
@comment $OpenBSD: PLIST,v 1.33 2017/09/18 12:12:46 landry Exp $
@bin bin/qbrowser
@bin bin/qgis
@bin bin/qgis_bench
@ -3581,6 +3581,7 @@ share/qgis/python/plugins/processing/algs/qgis/Explode.py
share/qgis/python/plugins/processing/algs/qgis/ExportGeometryInfo.py
share/qgis/python/plugins/processing/algs/qgis/ExtentFromLayer.py
share/qgis/python/plugins/processing/algs/qgis/ExtractByAttribute.py
share/qgis/python/plugins/processing/algs/qgis/ExtractByExpression.py
share/qgis/python/plugins/processing/algs/qgis/ExtractByLocation.py
share/qgis/python/plugins/processing/algs/qgis/ExtractNodes.py
share/qgis/python/plugins/processing/algs/qgis/FieldPyculator.py