Fix gcc-4.3/glibc-2.8 compilation problems

svn path=/sunrise/; revision=6339

4 files changed, 92 insertions, 3 deletions

diff --git a/dev-db/soci/ChangeLog b/dev-db/soci/ChangeLog
index 7f19921ed..6a708181c 100644
--- a/dev-db/soci/ChangeLog
+++ b/dev-db/soci/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  18 Jun 2008; Tiziano Müller <dev-zero@gentoo.org> soci-2.2.0.ebuild,
+  +files/soci-2.2.0-gcc43_glibc28.patch:
+  Fix gcc-4.3/glibc-2.8 compilation problems
+
   07 Jun 2008; Tiziano Müller <dev-zero@gentoo.org> soci-2.2.0.ebuild:
   Changed dependency from dev-db/libpq to virtual/postgresql-base
 
diff --git a/dev-db/soci/Manifest b/dev-db/soci/Manifest
index edd7254dc..356b7a273 100644
--- a/dev-db/soci/Manifest
+++ b/dev-db/soci/Manifest
@@ -1,5 +1,6 @@
+AUX soci-2.2.0-gcc43_glibc28.patch 3022 RMD160 a854769e273b53e7ffe26e67261bd4b47109c82b SHA1 42becb7fe19b353b4902fd8ac45f510f07a435b5 SHA256 20079b0ca71def2e2044ddd50ab735d7067b39949e5e1cf4d81234696937e84a
 AUX soci-2.2.0-sqlite_fix.patch 598 RMD160 9fbe42001405c6a787e73f7026cdf056316f9eb1 SHA1 0f624f9e6d0d2d443726f8a7e491084323fcb143 SHA256 27dde3b59b25786d5509ba1c57c86a236525c8f8b8f91444401ec62c660c31d4
 DIST soci-2.2.0.tar.gz 570405 RMD160 0e4098f8ddf1f1ce161116c8bb3a3df689ac7ff5 SHA1 4e726d0a9a59173042cb8a6aba7148640a156dd7 SHA256 01fc160500e9db024a56f0a7553e13885b37fc7b3b23882b07a3d6e8313780fa
-EBUILD soci-2.2.0.ebuild 1112 RMD160 49e4de1d557bd5bebf47df82df3e3277f076890c SHA1 92e3e90dba2a50b081a2366c153cfe8ca95114d4 SHA256 72c5dd502d496fcf04efd81b191b0b824f46ee6dd2ec0837e44203d1aa3a8465
-MISC ChangeLog 899 RMD160 d8a8cea031e4802ca00a906ed76502ddd0f3f08c SHA1 a5f32c5ea4012557f586b365a6eff5a51c03d8c6 SHA256 b73887ba3a7992532582a85cb84a62dbe36e282351ea31ef4bf9e0d6a2a4062a
+EBUILD soci-2.2.0.ebuild 1159 RMD160 734dc328d650051476044a78723ca21fa93f1e51 SHA1 673d29ce72d4c86e2818249573d3ac5221546cd0 SHA256 50fe31ad724faba387617371b936df6c2a30dd6054bb55b5994b8affb05fee85
+MISC ChangeLog 1058 RMD160 75d5c45537c2b0bc4a3ddb3ac787c4f4067efbcb SHA1 c576631095682ed8b3be8b1cc0b9f159c24889eb SHA256 47312d0fa30c35f9b09145cc741bd52e8694919cc4c77c515d282329f7ffc652
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/dev-db/soci/files/soci-2.2.0-gcc43_glibc28.patch b/dev-db/soci/files/soci-2.2.0-gcc43_glibc28.patch
new file mode 100644
index 000000000..acd7eb1a6
--- /dev/null
+++ b/dev-db/soci/files/soci-2.2.0-gcc43_glibc28.patch
@@ -0,0 +1,82 @@
+diff -Naur soci-2.2.0.orig/src/backends/empty/test/test-empty.cpp soci-2.2.0/src/backends/empty/test/test-empty.cpp
+--- soci-2.2.0.orig/src/backends/empty/test/test-empty.cpp	2008-06-18 18:37:17.000000000 +0200
++++ soci-2.2.0/src/backends/empty/test/test-empty.cpp	2008-06-18 18:42:08.000000000 +0200
+@@ -9,6 +9,7 @@
+ #include "soci-empty.h"
+ #include <iostream>
+ #include <string>
++#include <cstdlib>
+ #include <cassert>
+ #include <ctime>
+ 
+diff -Naur soci-2.2.0.orig/src/backends/mysql/common.h soci-2.2.0/src/backends/mysql/common.h
+--- soci-2.2.0.orig/src/backends/mysql/common.h	2008-06-18 18:37:17.000000000 +0200
++++ soci-2.2.0/src/backends/mysql/common.h	2008-06-18 18:47:10.000000000 +0200
+@@ -9,6 +9,7 @@
+ #define MYSQL_COMMON_H_INCLUDED
+ 
+ #include "soci-mysql.h"
++#include <ctime>
+ 
+ namespace SOCI {
+ 
+diff -Naur soci-2.2.0.orig/src/backends/mysql/session.cpp soci-2.2.0/src/backends/mysql/session.cpp
+--- soci-2.2.0.orig/src/backends/mysql/session.cpp	2008-06-18 18:37:17.000000000 +0200
++++ soci-2.2.0/src/backends/mysql/session.cpp	2008-06-18 18:50:01.000000000 +0200
+@@ -12,7 +12,8 @@
+ #include <cctype>
+ #include <cerrno>
+ #include <ciso646>
+-
++#include <cstdlib>
++#include <climits>
+ 
+ #ifdef _MSC_VER
+ #pragma warning(disable:4355)
+diff -Naur soci-2.2.0.orig/src/backends/mysql/standard-into-type.cpp soci-2.2.0/src/backends/mysql/standard-into-type.cpp
+--- soci-2.2.0.orig/src/backends/mysql/standard-into-type.cpp	2008-06-18 18:37:17.000000000 +0200
++++ soci-2.2.0/src/backends/mysql/standard-into-type.cpp	2008-06-18 18:51:40.000000000 +0200
+@@ -11,7 +11,8 @@
+ #include <soci.h>
+ #include <soci-platform.h>
+ #include "common.h"
+-
++#include <cstdlib>
++#include <cstring>
+ #include <ciso646>
+ 
+ #ifdef _MSC_VER
+diff -Naur soci-2.2.0.orig/src/backends/mysql/standard-use-type.cpp soci-2.2.0/src/backends/mysql/standard-use-type.cpp
+--- soci-2.2.0.orig/src/backends/mysql/standard-use-type.cpp	2008-06-18 18:37:17.000000000 +0200
++++ soci-2.2.0/src/backends/mysql/standard-use-type.cpp	2008-06-18 18:54:01.000000000 +0200
+@@ -13,6 +13,7 @@
+ #include <soci-platform.h>
+ #include <ciso646>
+ #include <limits>
++#include <cstring>
+ 
+ #ifdef _MSC_VER
+ #pragma warning(disable:4355)
+diff -Naur soci-2.2.0.orig/src/backends/mysql/vector-into-type.cpp soci-2.2.0/src/backends/mysql/vector-into-type.cpp
+--- soci-2.2.0.orig/src/backends/mysql/vector-into-type.cpp	2008-06-18 18:37:17.000000000 +0200
++++ soci-2.2.0/src/backends/mysql/vector-into-type.cpp	2008-06-18 18:59:01.000000000 +0200
+@@ -12,6 +12,7 @@
+ #include <soci.h>
+ #include <soci-platform.h>
+ #include <ciso646>
++#include <cstdlib>
+ 
+ #ifdef _MSC_VER
+ #pragma warning(disable:4355)
+diff -Naur soci-2.2.0.orig/src/core/soci.h soci-2.2.0/src/core/soci.h
+--- soci-2.2.0.orig/src/core/soci.h	2008-06-18 18:37:17.000000000 +0200
++++ soci-2.2.0/src/core/soci.h	2008-06-18 18:40:27.000000000 +0200
+@@ -13,6 +13,8 @@
+ #include <vector>
+ #include <ostream>
+ #include <sstream>
++#include <typeinfo>
++#include <memory>
+ #include <ctime>
+ #include <cassert>
+ 
diff --git a/dev-db/soci/soci-2.2.0.ebuild b/dev-db/soci/soci-2.2.0.ebuild
index 0abb2fa07..995b662dc 100644
--- a/dev-db/soci/soci-2.2.0.ebuild
+++ b/dev-db/soci/soci-2.2.0.ebuild
@@ -21,7 +21,9 @@ DEPEND="firebird? ( dev-db/firebird )
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}/${P}-sqlite_fix.patch"
+	epatch \
+		"${FILESDIR}/${P}-sqlite_fix.patch" \
+		"${FILESDIR}/${P}-gcc43_glibc28.patch"
 }
 
 src_compile() {