updated 1.5.2 for newer xerces-c interface prior to stablization

(Portage version: 2.2_rc12/cvs/Linux 2.6.26.5 x86_64)

3 files changed, 63 insertions, 5 deletions

diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index 2c2e5eafb8ea..3019801673e1 100644
--- a/sci-libs/gdal/ChangeLog
+++ b/sci-libs/gdal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/gdal
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.48 2008/10/18 19:08:36 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.49 2008/11/09 01:42:16 nerdboy Exp $
+
+  09 Nov 2008; Steve Arnold <nerdboy@gentoo.org>
+  +files/gdal-1.5.2-xerces-64-bit.patch, gdal-1.5.2.ebuild:
+  Updated 1.5.2 for newer xerces-c interface prior to stablization
+  (a patched 1.5.3 will follow shortly).
 
 *gdal-1.5.3 (18 Oct 2008)
 
diff --git a/sci-libs/gdal/files/gdal-1.5.2-xerces-64-bit.patch b/sci-libs/gdal/files/gdal-1.5.2-xerces-64-bit.patch
new file mode 100644
index 000000000000..be0a2b47e161
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-1.5.2-xerces-64-bit.patch
@@ -0,0 +1,52 @@
+Index: ogr/ogrsf_frmts/ili/iom/iom_utilities.cpp
+===================================================================
+--- ogr/ogrsf_frmts/ili/iom/iom_utilities.cpp	(révision 15504)
++++ ogr/ogrsf_frmts/ili/iom/iom_utilities.cpp	(copie de travail)
+@@ -168,33 +168,33 @@
+ */
+ char *iom_toUTF8(const XMLCh *src)
+ {
+-	unsigned int srcLen=XMLString::stringLen(src);
+-	int destLen=srcLen+10;
+-	char *dest;
+-	dest=dbgnew char[destLen+1];
+-	unsigned int eaten;
+-	unsigned int endDest;
+-	endDest=utf8_transcoder->transcodeTo(src,srcLen,(unsigned char *)dest,destLen,eaten,XMLTranscoder::UnRep_RepChar);
++	XMLSize_t srcLen=XMLString::stringLen(src);
++	XMLSize_t destLen=srcLen+10;
++	XMLByte *dest;
++	dest=dbgnew XMLByte[destLen+1];
++	XMLSize_t eaten;
++	XMLSize_t endDest;
++	endDest=utf8_transcoder->transcodeTo(src,srcLen,dest,destLen,eaten,XMLTranscoder::UnRep_RepChar);
+ 	while(eaten<srcLen){
+ 		delete[] dest;
+ 		destLen=destLen+srcLen-eaten+10;
+-		dest=dbgnew char[destLen+1];
+-		endDest=utf8_transcoder->transcodeTo(src,srcLen,(unsigned char *)dest,destLen,eaten,XMLTranscoder::UnRep_RepChar);
++		dest=dbgnew XMLByte[destLen+1];
++		endDest=utf8_transcoder->transcodeTo(src,srcLen,dest,destLen,eaten,XMLTranscoder::UnRep_RepChar);
+ 	}
+ 	dest[endDest]=0;
+-	return dest;
++	return (char*)dest; /* should be a unsigned char* == XMLByte* instead */
+ }
+ 
+ /** transcode an utf8 encoded string to a xerces unicode one.
+ */
+ XMLCh *iom_fromUTF8(const char *src)
+ {
+-	int srcLen=XMLString::stringLen(src);
+-	int destLen=srcLen;
++	XMLSize_t srcLen=XMLString::stringLen(src);
++	XMLSize_t destLen=srcLen;
+ 	XMLCh *dest=dbgnew XMLCh[destLen+1];
+ 	unsigned char *charSizes=dbgnew unsigned char[destLen];
+-	unsigned int eaten;
+-	unsigned int endDest=utf8_transcoder->transcodeFrom((unsigned char *)src,srcLen,dest,destLen,eaten,charSizes);
++	XMLSize_t eaten;
++	XMLSize_t endDest=utf8_transcoder->transcodeFrom((const XMLByte *)src,srcLen,dest,destLen,eaten,charSizes);
+ 	dest[endDest]=0;
+ 	delete[] charSizes;
+ 	return dest;
diff --git a/sci-libs/gdal/gdal-1.5.2.ebuild b/sci-libs/gdal/gdal-1.5.2.ebuild
index 7ba9dd0ef97a..6327e2b0ffdb 100644
--- a/sci-libs/gdal/gdal-1.5.2.ebuild
+++ b/sci-libs/gdal/gdal-1.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.5.2.ebuild,v 1.3 2008/10/18 19:08:36 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.5.2.ebuild,v 1.4 2008/11/09 01:42:16 nerdboy Exp $
 
 WANT_AUTOCONF="2.5"
 inherit autotools distutils eutils perl-module toolchain-funcs
@@ -14,7 +14,7 @@ SRC_URI="http://download.osgeo.org/gdal/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 # need to get these arches updated on several libs first
 #KEYWORDS="~alpha ~hppa"
 
@@ -32,7 +32,7 @@ RDEPEND=">=sys-libs/zlib-1.1.4
 	ruby? ( >=dev-lang/ruby-1.8.4.20060226 )
 	fits? ( sci-libs/cfitsio )
 	ogdi? ( sci-libs/ogdi )
-	gml? ( =dev-libs/xerces-c-2.8* )
+	gml? ( >=dev-libs/xerces-c-3 )
 	hdf5? ( >=sci-libs/hdf5-1.6.4 )
 	postgres? ( virtual/postgresql-server )
 	|| (
@@ -70,7 +70,8 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-1.4.2-datadir.patch \
 	    "${FILESDIR}"/${PN}-1.5.0-soname.patch \
 	    "${FILESDIR}"/${PN}-1.5.0-makefile.patch \
-	    "${FILESDIR}"/${PN}-1.5.1-python-install.patch
+	    "${FILESDIR}"/${PN}-1.5.1-python-install.patch \
+	    "${FILESDIR}"/${P}-xerces-64-bit.patch
 
 	if useq netcdf && useq hdf; then
 	    einfo	"Checking if HDF4 is compiled with szip..."