Added patch to fix compilation problems with gcc-4.3 (bug #218547 thanks to Holger Ackermann)

(Portage version: 2.1.5.4)

3 files changed, 65 insertions, 2 deletions

diff --git a/dev-libs/libpqxx/ChangeLog b/dev-libs/libpqxx/ChangeLog
index e1e716cbcbff..bc4dea0dfac3 100644
--- a/dev-libs/libpqxx/ChangeLog
+++ b/dev-libs/libpqxx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libpqxx
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpqxx/ChangeLog,v 1.50 2008/05/19 19:39:38 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpqxx/ChangeLog,v 1.51 2008/06/14 11:59:49 dev-zero Exp $
+
+  14 Jun 2008; Tiziano Müller <dev-zero@gentoo.org>
+  +files/libpqxx-2.6.9-gcc43.patch, libpqxx-2.6.9.ebuild:
+  Added patch to fix compilation problems with gcc-4.3 (bug #218547 thanks
+  to Holger Ackermann)
 
   19 May 2008; Tiziano Müller <dev-zero@gentoo.org> libpqxx-2.6.8.ebuild,
   libpqxx-2.6.9.ebuild:
diff --git a/dev-libs/libpqxx/files/libpqxx-2.6.9-gcc43.patch b/dev-libs/libpqxx/files/libpqxx-2.6.9-gcc43.patch
new file mode 100644
index 000000000000..24fad40ee69c
--- /dev/null
+++ b/dev-libs/libpqxx/files/libpqxx-2.6.9-gcc43.patch
@@ -0,0 +1,56 @@
+diff -ub ./libpqxx-2.6.9-orig/src/binarystring.cxx ./libpqxx-2.6.9/src/binarystring.cxx
+--- ./libpqxx-2.6.9-orig/src/binarystring.cxx	2008-04-16 19:52:13.000000000 +0200
++++ ./libpqxx-2.6.9/src/binarystring.cxx	2008-04-16 19:52:39.000000000 +0200
+@@ -18,6 +18,7 @@
+ 
+ #include <new>
+ #include <stdexcept>
++#include <cstring>
+ 
+ #include "libpq-fe.h"
+ 
+diff -ub ./libpqxx-2.6.9-orig/src/connection_base.cxx ./libpqxx-2.6.9/src/connection_base.cxx
+--- ./libpqxx-2.6.9-orig/src/connection_base.cxx	2008-04-16 19:52:13.000000000 +0200
++++ ./libpqxx-2.6.9/src/connection_base.cxx	2008-04-16 19:53:10.000000000 +0200
+@@ -22,6 +22,7 @@
+ #include <cerrno>
+ #include <cstdio>
+ #include <ctime>
++#include <cstring>
+ #include <stdexcept>
+ 
+ #ifdef PQXX_HAVE_SYS_SELECT_H
+diff -ub ./libpqxx-2.6.9-orig/src/cursor.cxx ./libpqxx-2.6.9/src/cursor.cxx
+--- ./libpqxx-2.6.9-orig/src/cursor.cxx	2008-04-16 19:52:13.000000000 +0200
++++ ./libpqxx-2.6.9/src/cursor.cxx	2008-04-16 19:53:30.000000000 +0200
+@@ -17,6 +17,7 @@
+  */
+ #include "pqxx/compiler-internal.hxx"
+ 
++#include <cstring>
+ #include <cstdlib>
+ 
+ #include "pqxx/cursor"
+diff -ub ./libpqxx-2.6.9-orig/src/result.cxx ./libpqxx-2.6.9/src/result.cxx
+--- ./libpqxx-2.6.9-orig/src/result.cxx	2008-04-16 19:52:13.000000000 +0200
++++ ./libpqxx-2.6.9/src/result.cxx	2008-04-16 19:54:02.000000000 +0200
+@@ -18,6 +18,8 @@
+ #include "pqxx/compiler-internal.hxx"
+ 
+ #include <stdexcept>
++#include <cstring>
++#include <cstdlib>
+ 
+ #include "libpq-fe.h"
+ 
+diff -ub ./libpqxx-2.6.9-orig/src/transaction_base.cxx ./libpqxx-2.6.9/src/transaction_base.cxx
+--- ./libpqxx-2.6.9-orig/src/transaction_base.cxx	2008-04-16 19:52:13.000000000 +0200
++++ ./libpqxx-2.6.9/src/transaction_base.cxx	2008-04-16 19:54:20.000000000 +0200
+@@ -19,6 +19,7 @@
+ #include "pqxx/compiler-internal.hxx"
+ 
+ #include <stdexcept>
++#include <cstring>
+ 
+ #include "pqxx/connection_base"
+ #include "pqxx/result"
diff --git a/dev-libs/libpqxx/libpqxx-2.6.9.ebuild b/dev-libs/libpqxx/libpqxx-2.6.9.ebuild
index 0cdb822bac03..578023cc7186 100644
--- a/dev-libs/libpqxx/libpqxx-2.6.9.ebuild
+++ b/dev-libs/libpqxx/libpqxx-2.6.9.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/dev-libs/libpqxx/libpqxx-2.6.9.ebuild,v 1.7 2008/05/19 19:39:38 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpqxx/libpqxx-2.6.9.ebuild,v 1.8 2008/06/14 11:59:49 dev-zero Exp $
 
 inherit eutils
 
@@ -20,6 +20,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	epatch "${FILESDIR}/${P}-gcc43.patch"
+
 	# should be safe enough to remove the lines directly from configure,
 	# since it's copied directly from configure.ac
 	sed -i \