Fix compilation on amd64 with patch by Dan Hirsch <thequux AT gmail DOT com>; bug #117652

Package-Manager: paludis-0.1.0 svn 68:104M/

4 files changed, 35 insertions, 11 deletions

diff --git a/dev-db/libodbc++/ChangeLog b/dev-db/libodbc++/ChangeLog
index a32b9d809199..716bbe329b2e 100644
--- a/dev-db/libodbc++/ChangeLog
+++ b/dev-db/libodbc++/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/libodbc++
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libodbc++/ChangeLog,v 1.6 2005/09/19 22:19:25 halcy0n Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libodbc++/ChangeLog,v 1.7 2006/01/15 22:34:36 halcy0n Exp $
+
+  15 Jan 2006; Mark Loeser <halcy0n@gentoo.org>
+  +files/libodbc++-0.2.3-std-streamsize.patch, libodbc++-0.2.3-r1.ebuild:
+  Fix compilation on amd64 with patch by Dan Hirsch <thequux AT gmail DOT
+  com>; bug #117652
 
   19 Sep 2005; Mark Loeser <halcy0n@gentoo.org> metadata.xml:
   Adding to cpp herd
diff --git a/dev-db/libodbc++/Manifest b/dev-db/libodbc++/Manifest
index 15875c97f6db..4a78b701d274 100644
--- a/dev-db/libodbc++/Manifest
+++ b/dev-db/libodbc++/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 6700c98dced31e2934a36b472769844d ChangeLog 896
-MD5 f1d669f0715bb24791f15c96b9413849 libodbc++-0.2.3-r1.ebuild 1994
-MD5 c0d850ab79376dbc9aef722e2f88b242 libodbc++-0.2.3.ebuild 1393
-MD5 514696112b44a9f879fd54be4de53dc5 metadata.xml 219
+MD5 fe0f38624f7d70f3db19e389b96d4b6a ChangeLog 1113
 MD5 76859551271b481b467298625eca2fbf files/digest-libodbc++-0.2.3 67
 MD5 76859551271b481b467298625eca2fbf files/digest-libodbc++-0.2.3-r1 67
+MD5 a99a6a9bdf9dffba15a2aeeb1d2bcecb files/libodbc++-0.2.3-std-streamsize.patch 358
+MD5 ec335ee1e74b97bfc82a7b995a76b098 libodbc++-0.2.3-r1.ebuild 2089
+MD5 c0d850ab79376dbc9aef722e2f88b242 libodbc++-0.2.3.ebuild 1393
+MD5 514696112b44a9f879fd54be4de53dc5 metadata.xml 219
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDLzl9CRZPokWLroQRAm8pAKDNCW+xSLSUcUAZqz1WjFmYDH78oQCdGNXY
-Zsyic3BxOz8HuzAFAUmjVTc=
-=pK4C
+iD8DBQFDys4GCRZPokWLroQRAigOAJ441MuG6+XN7pbkUZEgsUqBsYxDjgCfWV6d
+5v7bfOpBBejiLWwhLCCKEGE=
+=abhn
 -----END PGP SIGNATURE-----
diff --git a/dev-db/libodbc++/files/libodbc++-0.2.3-std-streamsize.patch b/dev-db/libodbc++/files/libodbc++-0.2.3-std-streamsize.patch
new file mode 100644
index 000000000000..197388982745
--- /dev/null
+++ b/dev-db/libodbc++/files/libodbc++-0.2.3-std-streamsize.patch
@@ -0,0 +1,11 @@
+--- libodbc++-0.2.3/src/datastream.h	2003-04-21 09:28:38.000000000 -0700
++++ libodbc++-0.2.3/src/datastream.h	2006-01-03 12:24:13.000000000 -0800
+@@ -63,7 +63,7 @@
+       return 0;
+     }
+     
+-    virtual int showmanyc() {
++    virtual std::streamsize showmanyc() {
+       if(this->gptr() < this->egptr()) {
+ 	return this->egptr() - this->gptr();
+       }
diff --git a/dev-db/libodbc++/libodbc++-0.2.3-r1.ebuild b/dev-db/libodbc++/libodbc++-0.2.3-r1.ebuild
index 6f2026bdcecb..a76d0892dab0 100644
--- a/dev-db/libodbc++/libodbc++-0.2.3-r1.ebuild
+++ b/dev-db/libodbc++/libodbc++-0.2.3-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libodbc++/libodbc++-0.2.3-r1.ebuild,v 1.1 2005/07/02 20:55:03 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libodbc++/libodbc++-0.2.3-r1.ebuild,v 1.2 2006/01/15 22:34:36 halcy0n Exp $
+
+inherit eutils
 
 DESCRIPTION="Libodbc++ is a c++ class library that provides a subset of the well-known JDBC 2.0(tm) and runs on top of ODBC."
 SRC_URI="mirror://sourceforge/libodbcxx/${P}.tar.gz"
@@ -17,6 +19,11 @@ SB_MT="${S}-build-mt"
 SB_QT="${S}-build_qt"
 SB_QT_MT="${S}-build_qt-mt"
 
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${P}-std-streamsize.patch
+}
+
 src_compile() {
 	local commonconf
 	commonconf="--with-odbc=/usr --without-tests"