Adding gcc-4.3 patch, bug 226007

(Portage version: 2.2_pre8/cvs/Linux 2.6.25-hh4 i686)

3 files changed, 40 insertions, 2 deletions

diff --git a/x11-misc/obpager/ChangeLog b/x11-misc/obpager/ChangeLog
index f51f9f25fe6b..fa7a7aa01af0 100644
--- a/x11-misc/obpager/ChangeLog
+++ b/x11-misc/obpager/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/obpager
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/obpager/ChangeLog,v 1.10 2008/02/18 00:29:58 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/obpager/ChangeLog,v 1.11 2008/06/16 14:13:35 yngwin Exp $
+
+  16 Jun 2008; Ben de Groot <yngwin@gentoo.org>
+  +files/obpager-1.8-gcc43.patch, obpager-1.8.ebuild:
+  Added gcc-4.3 patch by loki_val in bug 226007.
 
   18 Feb 2008; David Shakaryan <omp@gentoo.org>
   +files/obpager-1.8-as-needed.patch, obpager-1.8.ebuild:
diff --git a/x11-misc/obpager/files/obpager-1.8-gcc43.patch b/x11-misc/obpager/files/obpager-1.8-gcc43.patch
new file mode 100644
index 000000000000..04c01b7c5934
--- /dev/null
+++ b/x11-misc/obpager/files/obpager-1.8-gcc43.patch
@@ -0,0 +1,33 @@
+diff -NrU5 obpager-1.8.orig/src/main.cc obpager-1.8/src/main.cc
+--- obpager-1.8.orig/src/main.cc	2008-06-15 00:11:45.000000000 +0200
++++ obpager-1.8/src/main.cc	2008-06-15 00:12:04.000000000 +0200
+@@ -24,11 +24,11 @@
+ 
+ // Other system necessary headers
+ 
+ #include <sys/types.h>
+ #include <unistd.h>
+-
++#include <cstdlib>
+ 
+ // Include the headers for the pager class and also the spiffy custom exception class
+ 
+ #include "OBPager.h"
+ #include "VerboseException.h"
+diff -NrU5 obpager-1.8.orig/src/OBPager.cc obpager-1.8/src/OBPager.cc
+--- obpager-1.8.orig/src/OBPager.cc	2008-06-15 00:11:45.000000000 +0200
++++ obpager-1.8/src/OBPager.cc	2008-06-15 00:14:43.000000000 +0200
+@@ -20,11 +20,12 @@
+ #include "OBPager.h"
+ #include "VerboseException.h"
+ 
+ #include <string>
+ #include <sstream>
+-
++#include <cstdlib>
++#include <memory>
+ 
+ // We need to work with these properties
+ 
+ #define UTF8_STRING_PROP "UTF8_STRING"
+ #define NET_CURRENT_DESKTOP_PROP "_NET_CURRENT_DESKTOP"
diff --git a/x11-misc/obpager/obpager-1.8.ebuild b/x11-misc/obpager/obpager-1.8.ebuild
index 6effa53456e0..b7cdf6a0d950 100644
--- a/x11-misc/obpager/obpager-1.8.ebuild
+++ b/x11-misc/obpager/obpager-1.8.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/x11-misc/obpager/obpager-1.8.ebuild,v 1.11 2008/02/18 00:29:58 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/obpager/obpager-1.8.ebuild,v 1.12 2008/06/16 14:13:35 yngwin Exp $
 
 inherit eutils
 
@@ -24,6 +24,7 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}/${P}-as-needed.patch"
+	epatch "${FILESDIR}/${P}-gcc43.patch"
 
 	# this makes it compile :-)
 	sed -i -e '18s/^.*$/#include <errno.h>/' src/main.cc