gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-05 12:38:09 -07:00
Code Issues Projects Releases Wiki Activity

sci-libs/gdal: Fix building with >=swig-3.0.6

Browse Source 
Package-Manager: portage-2.2.28
Signed-off-by: Sven Wegener <swegener@gentoo.org>
This commit is contained in:
Sven Wegener
2016-06-28 18:26:03 +00:00
parent 84847639d4
commit 8091a2d1ee
3 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
sci-libs/gdal/files/gdal-1.11-swig-3.0.6.patch Normal file
View File

@@ -0,0 +1,22 @@
--- gdal/swig/include/python/ogr_python.i
+++ gdal/swig/include/python/ogr_python.i
@@ -67,7 +67,7 @@
def __getitem__(self, value):
"""Support dictionary, list, and slice -like access to the datasource.
-ds[0] would return the first layer on the datasource.
-ds['aname'] would return the layer named "aname".
-ds[0:4] would return a list of the first four layers."""
+ ds[0] would return the first layer on the datasource.
+ ds['aname'] would return the layer named "aname".
+ ds[0:4] would return a list of the first four layers."""
if isinstance(value, slice):
output = []
@@ -135,6 +135,6 @@
def __getitem__(self, value):
"""Support list and slice -like access to the layer.
-layer[0] would return the first feature on the layer.
-layer[0:4] would return a list of the first four features."""
+ layer[0] would return the first feature on the layer.
+ layer[0:4] would return a list of the first four features."""
if isinstance(value, slice):
import sys

5
sci-libs/gdal/gdal-1.11.1-r3.ebuild
View File

@@ -59,7 +59,7 @@ RDEPEND="
xls? ( dev-libs/freexl )
"
SWIG_DEP=">=dev-lang/swig-2.0.2 <=dev-lang/swig-3.0.4"
SWIG_DEP=">=dev-lang/swig-2.0.2"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen )
java? ( >=virtual/jdk-1.6 )
@@ -122,6 +122,9 @@ src_prepare() {
# Fix swig-3.0.3 problem (bug #534168)
epatch "${FILESDIR}"/${PN}-1.11.1-swig-3.0.3.patch
# Fix swig-3.0.6 problem, https://trac.osgeo.org/gdal/ticket/6045
epatch "${FILESDIR}"/${PN}-1.11-swig-3.0.6.patch
# bug 540132
epatch "${FILESDIR}"/${PN}-1.11.1-poppler-0.31.0-support.patch

5
sci-libs/gdal/gdal-1.11.2.ebuild
View File

@@ -59,7 +59,7 @@ RDEPEND="
xls? ( dev-libs/freexl )
"
SWIG_DEP=">=dev-lang/swig-2.0.2 <=dev-lang/swig-3.0.4"
SWIG_DEP=">=dev-lang/swig-2.0.2"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen )
java? ( >=virtual/jdk-1.6 )
@@ -122,6 +122,9 @@ src_prepare() {
# bug 540132
epatch "${FILESDIR}"/${PN}-1.11.1-poppler-0.31.0-support.patch
# Fix swig-3.0.6 problem, https://trac.osgeo.org/gdal/ticket/6045
epatch "${FILESDIR}"/${PN}-1.11-swig-3.0.6.patch
tc-export AR RANLIB
eautoreconf