summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sci-libs/gdal/ChangeLog6
-rw-r--r--sci-libs/gdal/Manifest16
-rw-r--r--sci-libs/gdal/files/gdal-1.3.2-gcc4-stl.patch26
3 files changed, 13 insertions, 35 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/Manifest b/sci-libs/gdal/Manifest
index 0a07bba40dc6..ea0df2349ce0 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -14,10 +14,10 @@ AUX gdal-1.3.2-destdir.patch 6789 RMD160 f74a404c3d9874542b9074477af7d21fe7e0774
MD5 6f8eda6fa6406ee1ca216384b2810b95 files/gdal-1.3.2-destdir.patch 6789
RMD160 f74a404c3d9874542b9074477af7d21fe7e0774a files/gdal-1.3.2-destdir.patch 6789
SHA256 6818460591e7077878f4658ca73a4582325f19f9e5580d73411b13f4dd548e81 files/gdal-1.3.2-destdir.patch 6789
-AUX gdal-1.3.2-gcc4-stl.patch 2185 RMD160 5081a89f9f7c7f368aff7cd617ab54c1256acca7 SHA1 126be677b9bd0a339c5e1fc91969e0808c0428b6 SHA256 f9cbffcae47216f42c8bc5da45256b02dfca542bb5519a040e82fb2b467a9600
-MD5 c99dd6ce03793f8e44d9ee555157440f files/gdal-1.3.2-gcc4-stl.patch 2185
-RMD160 5081a89f9f7c7f368aff7cd617ab54c1256acca7 files/gdal-1.3.2-gcc4-stl.patch 2185
-SHA256 f9cbffcae47216f42c8bc5da45256b02dfca542bb5519a040e82fb2b467a9600 files/gdal-1.3.2-gcc4-stl.patch 2185
+AUX gdal-1.3.2-gcc4-stl.patch 902 RMD160 a8e6a79b8158913bfa3de9a4ef763f95f7197b53 SHA1 68f53438de2af1a325260d6070728d363fffd91f SHA256 c11381cabeb56e65f5277953b7b738d91f406560d88612d44d4295cb24bdae21
+MD5 3804056a14248b7d6a9a0afc965182b6 files/gdal-1.3.2-gcc4-stl.patch 902
+RMD160 a8e6a79b8158913bfa3de9a4ef763f95f7197b53 files/gdal-1.3.2-gcc4-stl.patch 902
+SHA256 c11381cabeb56e65f5277953b7b738d91f406560d88612d44d4295cb24bdae21 files/gdal-1.3.2-gcc4-stl.patch 902
AUX gdal-1.3.2-ruby-install.patch 766 RMD160 bd81796a97d162e238750e0184437ff54cbb38af SHA1 9e440863d68890d585b588fd5f5952fd8aa51d13 SHA256 9a42203279e512e629094ff9aea66c8d613acda3e1656fcf24f6e659c02e1061
MD5 f2b9cec943d95fcf9b3c487af6d96771 files/gdal-1.3.2-ruby-install.patch 766
RMD160 bd81796a97d162e238750e0184437ff54cbb38af files/gdal-1.3.2-ruby-install.patch 766
@@ -46,10 +46,10 @@ EBUILD gdal-1.3.2.ebuild 4717 RMD160 930a8289f45bfc04146531566312ae93c83dafca SH
MD5 a6a772dbebfd4960ebd944991062c10b gdal-1.3.2.ebuild 4717
RMD160 930a8289f45bfc04146531566312ae93c83dafca gdal-1.3.2.ebuild 4717
SHA256 c4b2a0a6be5158239eb3b32bd57bfffa4f00a3ce35b1304cec0763667b27357e gdal-1.3.2.ebuild 4717
-MISC ChangeLog 5474 RMD160 dccfa3e6962e8fbd5dc76a365658d3752301eb09 SHA1 25391a011db52c9fac222b385cec9deeef314b51 SHA256 626c582a0ca27785457e636a5daf5e089ac41a5a116151a796b41152d35b1945
-MD5 04bbd3bebbcf93da2d02b928969560e3 ChangeLog 5474
-RMD160 dccfa3e6962e8fbd5dc76a365658d3752301eb09 ChangeLog 5474
-SHA256 626c582a0ca27785457e636a5daf5e089ac41a5a116151a796b41152d35b1945 ChangeLog 5474
+MISC ChangeLog 5627 RMD160 b03eedcdcf6105cd7b5f55084ee5dd40caca032c SHA1 d3c49c100b204939df62167cc8d8e849dc129df1 SHA256 761c461c1aecf0dcea79a98e370f322d63c38a55fbedcd4076e67f34779f7f5a
+MD5 265c512cc244a55408dd0b4006a5182b ChangeLog 5627
+RMD160 b03eedcdcf6105cd7b5f55084ee5dd40caca032c ChangeLog 5627
+SHA256 761c461c1aecf0dcea79a98e370f322d63c38a55fbedcd4076e67f34779f7f5a ChangeLog 5627
MISC metadata.xml 481 RMD160 bf21d73428ffeb72d05c41556b846820666e6192 SHA1 84bd0e3bd2b57b0e3985a2fe1afbdec9178bce17 SHA256 6e64541abb8c79774ac99aeedeadfabb8771c9ad3da281e967629fbc83300fa4
MD5 dc56f5d75556cdbcd7c4024288ef8fcb metadata.xml 481
RMD160 bf21d73428ffeb72d05c41556b846820666e6192 metadata.xml 481
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 ccf675f68325..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,31 +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: not supported by cvs2svn $
-+ * 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 );