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

Package-Manager: portage-2.1.5.4

4 files changed, 68 insertions, 4 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/Manifest b/dev-libs/libpqxx/Manifest
index ee9c97cdd4c5..1129f2ba3a59 100644
--- a/dev-libs/libpqxx/Manifest
+++ b/dev-libs/libpqxx/Manifest
@@ -1,7 +1,8 @@
 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
 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 1854 RMD160 3565e5fb3615dadfa1a46a83e92709a3a5194abe SHA1 eaf290f828bfcfb8fdae5b4ac5777b86d216f68e SHA256 200f43e1523a7872c70577a664ef227ce5b208afe5778eef0965ce0afe649b53
-MISC ChangeLog 6140 RMD160 0e412bd34241b08737f7a624a2357b58c6ef8da8 SHA1 809e173a820e301b48fe3f244da249b7018b89c0 SHA256 4f2df25697ac0e8343350cb10bcec83eb5aefa3ab3169223ce9dcc147296c39e
+EBUILD libpqxx-2.6.9.ebuild 1894 RMD160 9b04d2c0fdbc7dac4da4fddc5d4754e58b9921d6 SHA1 2a56bb7135d06a8ab8c805d8a72b23ad40162ba3 SHA256 07146686112cf0512f510eb9bb4fc9739b1bf613a96135785e42cf222d100c37
+MISC ChangeLog 6350 RMD160 bc22f0cecd501bfefe95f60b3915cf67e1ebaef9 SHA1 2f0181b68e161bf018ccfdc36c347367230e05ea SHA256 f26bb9eb351d4ab8fed1260825e37e3f0bbc922cb06a73ea35e5edce2a3818a9
 MISC metadata.xml 163 RMD160 70bbda1c1e8316a09d467334131898ae833a3205 SHA1 f43b9a4a2a82140936f9b04e4e63b3c9a495141f SHA256 f0699a4c3ad24cc38836c2d4a1ba03e4e403a9a5364b51df405db02014005891
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 \