[fiona] 01/03: Fix compatibility with Cython 0.22

Johan Van de Wauw johanvdw-guest at moszumanska.debian.org
Tue Jun 2 18:00:04 UTC 2015


This is an automated email from the git hooks/post-receive script.

johanvdw-guest pushed a commit to branch master
in repository fiona.

commit 60c933a45a71a7d8a94c5fc413a8339a1ab391db
Author: Johan Van de Wauw <johan.vandewauw at gmail.com>
Date:   Tue Jun 2 19:50:38 2015 +0200

    Fix compatibility with Cython 0.22
---
 .../0003-Fix-compatibility-with-Cython-0.22.patch  | 38 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 39 insertions(+)

diff --git a/debian/patches/0003-Fix-compatibility-with-Cython-0.22.patch b/debian/patches/0003-Fix-compatibility-with-Cython-0.22.patch
new file mode 100644
index 0000000..e4dff07
--- /dev/null
+++ b/debian/patches/0003-Fix-compatibility-with-Cython-0.22.patch
@@ -0,0 +1,38 @@
+From a1cea1c28631a27de40bbdf51bccc4fcd87ba42d Mon Sep 17 00:00:00 2001
+From: Johan Van de Wauw <johan.vandewauw at gmail.com>
+Date: Tue, 2 Jun 2015 19:38:30 +0200
+Subject: [PATCH] Fix compatibility with Cython 0.22
+
+Completely based on the work by brendan-ward for rasterio
+https://github.com/mapbox/rasterio/pull/373/files
+
+Changes are needed to build on debian unstable
+diff --git a/fiona/_geometry.pxd b/fiona/_geometry.pxd
+index 1ff29cf..2bf2cc1 100644
+--- a/fiona/_geometry.pxd
++++ b/fiona/_geometry.pxd
+@@ -19,14 +19,14 @@ cdef class GeomBuilder:
+ 
+ 
+ cdef class OGRGeomBuilder:
+-    cdef void * _createOgrGeometry(self, int geom_type)
++    cdef void * _createOgrGeometry(self, int geom_type) except NULL
+     cdef _addPointToGeometry(self, void *cogr_geometry, object coordinate)
+-    cdef void * _buildPoint(self, object coordinates)
+-    cdef void * _buildLineString(self, object coordinates)
+-    cdef void * _buildLinearRing(self, object coordinates)
+-    cdef void * _buildPolygon(self, object coordinates)
+-    cdef void * _buildMultiPoint(self, object coordinates)
+-    cdef void * _buildMultiLineString(self, object coordinates)
+-    cdef void * _buildMultiPolygon(self, object coordinates)
+-    cdef void * _buildGeometryCollection(self, object coordinates)
+-    cdef void * build(self, object geom)
++    cdef void * _buildPoint(self, object coordinates) except NULL
++    cdef void * _buildLineString(self, object coordinates) except NULL
++    cdef void * _buildLinearRing(self, object coordinates) except NULL
++    cdef void * _buildPolygon(self, object coordinates) except NULL
++    cdef void * _buildMultiPoint(self, object coordinates) except NULL
++    cdef void * _buildMultiLineString(self, object coordinates) except NULL
++    cdef void * _buildMultiPolygon(self, object coordinates) except NULL
++    cdef void * _buildGeometryCollection(self, object coordinates) except NULL
++    cdef void * build(self, object geom) except NULL
diff --git a/debian/patches/series b/debian/patches/series
index 2c8106c..3f37b28 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Rename-fio-command-to-fiona-to-avoid-name-clash.patch
 0002-Remove-outside-reference-possible-privacy-breach.patch
+0003-Fix-compatibility-with-Cython-0.22.patch 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/fiona.git



More information about the Pkg-grass-devel mailing list