diff options
| author |   Steve Arnold <nerdboy@gentoo.org> | 2006-06-28 06:29:34 +0000 |
|---|---|---|
| committer | Steve Arnold <nerdboy@gentoo.org> | 2006-06-28 06:29:34 +0000 |
| commit | 1698f5a6d88c5083102739e763a31fe1accc9772 (patch) | |
| tree | 94d91db6878ab3b90c0c4824344dd9cced021af2 /sci-libs/gdal | |
| parent | Stable on ppc64; bug #138268 (diff) | |
| download | gentoo-2-1698f5a6d88c5083102739e763a31fe1accc9772.tar.gz gentoo-2-1698f5a6d88c5083102739e763a31fe1accc9772.tar.bz2 gentoo-2-1698f5a6d88c5083102739e763a31fe1accc9772.zip | |
fixed patch borkage (bug 138212) caused by rcs keyword expansion
(Portage version: 2.1.1_pre1-r1)
Diffstat (limited to 'sci-libs/gdal')
| -rw-r--r-- | sci-libs/gdal/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-libs/gdal/files/gdal-1.3.2-gcc4-stl.patch | 30 |
2 files changed, 5 insertions, 31 deletions
diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog index 4d7c23ea66e5..089b490edf22 100644 --- a/sci-libs/gdal/ChangeLog +++ b/sci-libs/gdal/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-libs/gdal # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.26 2006/06/09 19:22:52 nerdboy Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.27 2006/06/28 06:29:33 nerdboy Exp $ + + 28 Jun 2006; Steve Arnold <nerdboy@gentoo.org> + files/gdal-1.3.2-gcc4-stl.patch: + Fixed patch borkage (bug 138212) caused by rcs keyword expansion. 09 Jun 2006; Steve Arnold <nerdboy@gentoo.org> +files/gdal-1.3.2-gcc4-stl.patch, gdal-1.3.2.ebuild, gdal-1.3.1.ebuild: diff --git a/sci-libs/gdal/files/gdal-1.3.2-gcc4-stl.patch b/sci-libs/gdal/files/gdal-1.3.2-gcc4-stl.patch index 331647e0be3e..b86d902e97ec 100644 --- a/sci-libs/gdal/files/gdal-1.3.2-gcc4-stl.patch +++ b/sci-libs/gdal/files/gdal-1.3.2-gcc4-stl.patch @@ -1,35 +1,5 @@ --- ogr/ogrsf_frmts/ili/ogrili2layer.cpp 2006-06-08 10:40:06.804746888 +0200 +++ /home/furai/extProjects/Gdal/gdal_unstable/ogr/ogrsf_frmts/ili/ogrili2layer.cpp 2006-06-08 10:35:53.648232528 +0200 -@@ -1,5 +1,5 @@ - /****************************************************************************** -- * $Id: gdal-1.3.2-gcc4-stl.patch,v 1.1 2006/06/09 19:22:52 nerdboy Exp $ -+ * $Id: gdal-1.3.2-gcc4-stl.patch,v 1.1 2006/06/09 19:22:52 nerdboy Exp $ - * - * Project: Interlis 2 Translator - * Purpose: Implements OGRILI2Layer class. -@@ -28,6 +28,9 @@ - ****************************************************************************** - * - * $Log: gdal-1.3.2-gcc4-stl.patch,v $ - * Revision 1.1 2006/06/09 19:22:52 nerdboy - * added upstream CVS patch for bug 134498, stable bumps for 1.3.1 - * (Portage version: 2.1_rc4-r5) - * -+ * Revision 1.5 2006/06/06 17:49:07 pka -+ * STL compatibility (Bug 1178) -+ * - * Revision 1.4 2005/11/21 14:56:31 pka - * Fix for call of GetNextFeature without ResetReading (Interlis 2) - * Fix for polygonizer crash on Linux with GEOS 2.1.3 (Interlis 1) -@@ -47,7 +50,7 @@ - #include "cpl_conv.h" - #include "cpl_string.h" - --CPL_CVSID("$Id: gdal-1.3.2-gcc4-stl.patch,v 1.1 2006/06/09 19:22:52 nerdboy Exp $"); -+CPL_CVSID("$Id: gdal-1.3.2-gcc4-stl.patch,v 1.1 2006/06/09 19:22:52 nerdboy Exp $"); - - /************************************************************************/ - /* OGRILI2Layer() */ @@ -73,7 +76,6 @@ poFeatureDefn->SetGeomType( eReqType ); |