summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Arnold <nerdboy@gentoo.org>2009-04-25 06:08:09 +0000
committerSteve Arnold <nerdboy@gentoo.org>2009-04-25 06:08:09 +0000
commit9c4e051f740127310ee4210fe6f8c4d758bc1c19 (patch)
treeb3fb7730168a6db6772514da75ed99bd059d64c5 /sci-libs
parentAutomated update of use.local.desc (diff)
downloadgentoo-2-9c4e051f740127310ee4210fe6f8c4d758bc1c19.tar.gz
gentoo-2-9c4e051f740127310ee4210fe6f8c4d758bc1c19.tar.bz2
gentoo-2-9c4e051f740127310ee4210fe6f8c4d758bc1c19.zip
Backported patch from upstream for swig 1.3.39 (fixes bug #266251).
(Portage version: 2.2_rc31/cvs/Linux x86_64)
Diffstat (limited to 'sci-libs')
-rw-r--r--sci-libs/gdal/ChangeLog10
-rw-r--r--sci-libs/gdal/files/gdal-1.6.0-swig-fix.patch20
-rw-r--r--sci-libs/gdal/gdal-1.6.0-r1.ebuild (renamed from sci-libs/gdal/gdal-1.6.0.ebuild)4
3 files changed, 32 insertions, 2 deletions
diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index 3dd8d83dfcba..6630cbf095d4 100644
--- a/sci-libs/gdal/ChangeLog
+++ b/sci-libs/gdal/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for sci-libs/gdal
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.56 2009/04/11 17:07:01 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.57 2009/04/25 06:08:09 nerdboy Exp $
+
+*gdal-1.6.0-r1 (25 Apr 2009)
+
+ 25 Apr 2009; Steve Arnold <nerdboy@gentoo.org>
+ +files/gdal-1.6.0-swig-fix.patch, -gdal-1.6.0.ebuild,
+ +gdal-1.6.0-r1.ebuild:
+ Backported patch from upstream for swig 1.3.39 (fixes bug #266251) support
+ for all supported bindings.
*gdal-1.6.0 (11 Apr 2009)
diff --git a/sci-libs/gdal/files/gdal-1.6.0-swig-fix.patch b/sci-libs/gdal/files/gdal-1.6.0-swig-fix.patch
new file mode 100644
index 000000000000..38c94da52f76
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-1.6.0-swig-fix.patch
@@ -0,0 +1,20 @@
+--- swig/include/gdal.i.orig 2009-04-24 21:55:06.315863023 -0700
++++ swig/include/gdal.i 2009-04-24 22:10:28.806611326 -0700
+@@ -176,6 +176,17 @@
+ %include "gdal_typemaps.i"
+ #endif
+
++/* Default memberin typemaps required to support SWIG 1.3.39 and above */
++%typemap(memberin) char *Info %{
++/* char* Info memberin typemap */
++$1;
++%}
++
++%typemap(memberin) char *Id %{
++/* char* Info memberin typemap */
++$1;
++%}
++
+ //************************************************************************
+ //
+ // Define the exposed CPL functions.
diff --git a/sci-libs/gdal/gdal-1.6.0.ebuild b/sci-libs/gdal/gdal-1.6.0-r1.ebuild
index 20dd20b8e026..bc97bf9f1573 100644
--- a/sci-libs/gdal/gdal-1.6.0.ebuild
+++ b/sci-libs/gdal/gdal-1.6.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.0.ebuild,v 1.1 2009/04/11 17:07:01 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.0-r1.ebuild,v 1.1 2009/04/25 06:08:09 nerdboy Exp $
WANT_AUTOCONF="2.5"
inherit autotools distutils eutils perl-module toolchain-funcs
@@ -74,6 +74,8 @@ src_unpack() {
epatch "${FILESDIR}"/${PN}-1.4.2-datadir.patch \
"${FILESDIR}"/${PN}-1.5.0-soname.patch \
"${FILESDIR}"/${PN}-1.5.1-python-install.patch \
+ "${FILESDIR}"/${P}-ruby-make.patch \
+ "${FILESDIR}"/${P}-swig-fix.patch \
|| die "sed failed"
if useq hdf; then