Fix compiling with gcc 4.4, stable for HPPA (bug #249248).

Package-Manager: portage-2.2_rc33/cvs/Linux i686

4 files changed, 114 insertions, 15 deletions

diff --git a/dev-libs/libpqxx/ChangeLog b/dev-libs/libpqxx/ChangeLog
index 0e501c2cc7a2..72ab445d5d3c 100644
--- a/dev-libs/libpqxx/ChangeLog
+++ b/dev-libs/libpqxx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libpqxx
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpqxx/ChangeLog,v 1.59 2009/07/02 21:31:31 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpqxx/ChangeLog,v 1.60 2009/07/03 00:08:43 jer Exp $
+
+  03 Jul 2009; Jeroen Roovers <jer@gentoo.org> libpqxx-2.6.9.ebuild,
+  +files/libpqxx-2.6.9-gcc44.patch:
+  Fix compiling with gcc 4.4, stable for HPPA (bug #249248).
 
   02 Jul 2009; Markus Meier <maekke@gentoo.org> libpqxx-2.6.9.ebuild:
   amd64 stable, bug #249248
diff --git a/dev-libs/libpqxx/Manifest b/dev-libs/libpqxx/Manifest
index 009b02daa8e5..3417c9c1a14a 100644
--- a/dev-libs/libpqxx/Manifest
+++ b/dev-libs/libpqxx/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX libpqxx-2.5.1-gentoo.patch 2723 RMD160 56627d68aa79c0e98a0ba7189dab12646afee91b SHA1 5028c6dc926f07d4b3e85bc4954af6bcb0cb8f96 SHA256 0e6d7f13bf2117fe3884bf4296209baaf5a28311bb71dc79134a239846788046
 AUX libpqxx-2.6.9-gcc43.patch 1907 RMD160 79149bd560599e5352234a5ba54f2fe4fd411b12 SHA1 3847b1c45bf3ec6f52d4b971531dcf16482b9c3e SHA256 72b489af0d4b7c2d2071abf02ce50af1d3db4da7b0bc3eab2220b291e378e1d7
+AUX libpqxx-2.6.9-gcc44.patch 2384 RMD160 36984c849d7c46cee7d4cdf9454747f206d41531 SHA1 5212b19262ff99fa0d9044e78d12fa13ab76f360 SHA256 848cbad8889ce73301b8ae38d2f6dfc149f4cdcf7865c846779fec168b21ee76
 DIST libpqxx-2.6.8.tar.gz 1690973 RMD160 5a9a57774ac878d827af8940e87f5d92c2a1b86a SHA1 2f963c98b8a79675d537daadc3ba6c313c35f59d SHA256 b3b4a1de89936d36f61ba1da1ca2c0e0f412cdab004a402761f9433b1d0a3a8d
 DIST libpqxx-2.6.9.tar.gz 1639557 RMD160 c456b5a3ed3c96963aad334d3504ed0443a8f63e SHA1 8be9dcd0375337b170d5c94370fa896911d361f1 SHA256 2b2ef5dfb852667299e50727419075cf333bbbeffadaa398d96dc93bac6f7b6a
 EBUILD libpqxx-2.6.8.ebuild 1757 RMD160 14fe70bd6f7b15e54417db1abda9c4e7a8390462 SHA1 57f2cc5f89407763f7c991e6f6d6dc0509a305a3 SHA256 bd241708a8b53e02aac6c844493f44451d6e9e51f2ed3a39d3cd3aa961c82300
-EBUILD libpqxx-2.6.9.ebuild 1892 RMD160 e23cb19c4d799cfb9b019f2c898137c0e5161de3 SHA1 4dfb756c43059d691b05bf6cd94fc0750e9d47e8 SHA256 497cd42539f49593f7d9c561fa1fa93ab661fc4913a204a118b46c4ead2232e7
-MISC ChangeLog 7181 RMD160 a6f5a1058572c66d05095e81c4363a836bd16dd7 SHA1 40576c1fc36d33cebd338a9efad66d0e21d37a1c SHA256 d2d977301e88e77a8cacc1ac1bfb573fc61432c605cde9613fc55f740729f72a
+EBUILD libpqxx-2.6.9.ebuild 1927 RMD160 a31a022d62bb00efb80539962703be0153673f98 SHA1 ced1b04f4344148d03bd7e06585b3fbd63e9495b SHA256 b86f2d88bd6f1bbba24ad71ca693ec92caacaaf728dea549856c2e36fe33005d
+MISC ChangeLog 7345 RMD160 a007ae35654fc818a9c40fddbe35cef122d49fef SHA1 395bc057b0c59620ac5f8abff24267454055b98a SHA256 bcfbbf9b96a9e03ed174601aa555b9003f1ddb53b9d089599c26665b9b67edd2
 MISC metadata.xml 163 RMD160 70bbda1c1e8316a09d467334131898ae833a3205 SHA1 f43b9a4a2a82140936f9b04e4e63b3c9a495141f SHA256 f0699a4c3ad24cc38836c2d4a1ba03e4e403a9a5364b51df405db02014005891
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkpNJ10ACgkQkKaRLQcq0GLb7QCgkiaQkPcwfh1EVYJ7qXoaM8az
-WuoAnjiGGN5CdltoeOlxRgvMLcPBtxfQ
-=Zqpn
------END PGP SIGNATURE-----
diff --git a/dev-libs/libpqxx/files/libpqxx-2.6.9-gcc44.patch b/dev-libs/libpqxx/files/libpqxx-2.6.9-gcc44.patch
new file mode 100644
index 000000000000..d7e6425d1500
--- /dev/null
+++ b/dev-libs/libpqxx/files/libpqxx-2.6.9-gcc44.patch
@@ -0,0 +1,103 @@
+Taken from Debian's patchset to fix compilation with gcc-4.4 - JeR
+
+--- libpqxx-2.6.9.orig/src/transaction_base.cxx
++++ libpqxx-2.6.9/src/transaction_base.cxx
+@@ -18,6 +18,7 @@
+  */
+ #include "pqxx/compiler-internal.hxx"
+ 
++#include <cstring>
+ #include <stdexcept>
+ 
+ #include "pqxx/connection_base"
+--- libpqxx-2.6.9.orig/src/binarystring.cxx
++++ libpqxx-2.6.9/src/binarystring.cxx
+@@ -16,6 +16,7 @@
+  */
+ #include "pqxx/compiler-internal.hxx"
+ 
++#include <cstring>
+ #include <new>
+ #include <stdexcept>
+ 
+--- libpqxx-2.6.9.orig/src/result.cxx
++++ libpqxx-2.6.9/src/result.cxx
+@@ -17,6 +17,8 @@
+  */
+ #include "pqxx/compiler-internal.hxx"
+ 
++#include <cstdlib>
++#include <cstring>
+ #include <stdexcept>
+ 
+ #include "libpq-fe.h"
+@@ -44,7 +46,7 @@
+ pqxx::internal::result_data::~result_data() { PQclear(data); }
+ 
+ 
+-void pqxx::internal::freemem_result_data(result_data *d) throw () { delete d; }
++void PQXX_LIBEXPORT pqxx::internal::freemem_result_data(result_data *d) throw () { delete d; }
+ 
+ 
+ pqxx::result::result(pqxx::internal::pq::PGresult *rhs,
+--- libpqxx-2.6.9.orig/src/cursor.cxx
++++ libpqxx-2.6.9/src/cursor.cxx
+@@ -18,6 +18,7 @@
+ #include "pqxx/compiler-internal.hxx"
+ 
+ #include <cstdlib>
++#include <cstring>
+ 
+ #include "pqxx/cursor"
+ #include "pqxx/result"
+--- libpqxx-2.6.9.orig/src/connection_base.cxx
++++ libpqxx-2.6.9/src/connection_base.cxx
+@@ -21,6 +21,7 @@
+ #include <cassert>
+ #include <cerrno>
+ #include <cstdio>
++#include <cstring>
+ #include <ctime>
+ #include <stdexcept>
+ 
+--- libpqxx-2.6.9.orig/test/test003.cxx
++++ libpqxx-2.6.9/test/test003.cxx
+@@ -1,4 +1,5 @@
+ #include <cstdio>
++#include <cstdlib>
+ #include <iostream>
+ #include <stdexcept>
+ 
+--- libpqxx-2.6.9.orig/test/test092.cxx
++++ libpqxx-2.6.9/test/test092.cxx
+@@ -1,4 +1,5 @@
+ #include <cassert>
++#include <cstring>
+ #include <iostream>
+ #include <list>
+ 
+--- libpqxx-2.6.9.orig/test/test030.cxx
++++ libpqxx-2.6.9/test/test030.cxx
+@@ -1,4 +1,5 @@
+ #include <cstdio>
++#include <cstring>
+ #include <iostream>
+ 
+ #include <pqxx/connection>
+--- libpqxx-2.6.9.orig/test/test022.cxx
++++ libpqxx-2.6.9/test/test022.cxx
+@@ -1,4 +1,5 @@
+ #include <cstdio>
++#include <cstdlib>
+ #include <iostream>
+ #include <stdexcept>
+ 
+--- libpqxx-2.6.9.orig/test/test011.cxx
++++ libpqxx-2.6.9/test/test011.cxx
+@@ -1,4 +1,5 @@
+ #include <cstdio>
++#include <cstring>
+ #include <iostream>
+ 
+ #include <pqxx/connection>
+
diff --git a/dev-libs/libpqxx/libpqxx-2.6.9.ebuild b/dev-libs/libpqxx/libpqxx-2.6.9.ebuild
index 025c256f6696..3764584d1953 100644
--- a/dev-libs/libpqxx/libpqxx-2.6.9.ebuild
+++ b/dev-libs/libpqxx/libpqxx-2.6.9.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpqxx/libpqxx-2.6.9.ebuild,v 1.16 2009/07/02 21:31:31 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpqxx/libpqxx-2.6.9.ebuild,v 1.17 2009/07/03 00:08:43 jer Exp $
 
 inherit eutils
 
-KEYWORDS="alpha amd64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd"
 
 DESCRIPTION="C++ client API for PostgreSQL. The standard front-end for writing C++ programs that use PostgreSQL. Supersedes older libpq++ interface."
 SRC_URI="ftp://pqxx.org/software/${PN}/${P}.tar.gz"
@@ -21,6 +21,7 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}/${P}-gcc43.patch"
+	epatch "${FILESDIR}/${P}-gcc44.patch"
 
 	# should be safe enough to remove the lines directly from configure,
 	# since it's copied directly from configure.ac