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

(Portage version: 2.2_rc33/cvs/Linux i686)

3 files changed, 111 insertions, 3 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/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