Adding gcc-4.3 patch, bug 226007

Package-Manager: portage-2.2_pre8/cvs/Linux 2.6.25-hh4 i686

4 files changed, 43 insertions, 14 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/Manifest b/x11-misc/obpager/Manifest
index d6eea2db6fe4..145829499760 100644
--- a/x11-misc/obpager/Manifest
+++ b/x11-misc/obpager/Manifest
@@ -1,15 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX obpager-1.8-as-needed.patch 595 RMD160 97ff9c6f116ee2ada9e824858d65770991f8d396 SHA1 f7ce28bd59f0c0fc1fec2e5087c9e6c844fd7242 SHA256 5685a8cca151db8f3b45551957a62e331707923ff7a2b2d88df38f7969ebd7c2
+AUX obpager-1.8-gcc43.patch 974 RMD160 6056932b4be9edd6e008fba8be6de350413caf91 SHA1 a6fa26aec2a1fb34b6ef437bb306cc787ebab90c SHA256 19dfc582c1be8315b665a1102ed1684df62c60ac0c0f0e7117cdef935d352b23
 DIST obpager-1.8.tar.gz 23773 RMD160 45ca48aa8745fae522e7b0caf7b5a99d956e5413 SHA1 e97ecf8f44d5b787cdb5bfa853ab76eac919323a SHA256 160b688d757b577ae0e2c3c47f2e2504fafe35f2bfa224e344797d0953d35dc9
-EBUILD obpager-1.8.ebuild 878 RMD160 a668e9b4c4cf3cc0cc6d3585c011dceba52cc03a SHA1 e79eb37ad86d210d97e1a39d9f3e2140319f7cad SHA256 3f07c0d2724a833172e5239c5e6e1bb549aeeebdb26c8772743d928308003492
-MISC ChangeLog 1435 RMD160 7af0568783f62d16a51764126d5c11646896c752 SHA1 1501f51d67517b97889e87c12321e5bc350defd0 SHA256 873c9a978f6cdbf2e46bdb3f38ebba4ef22ebbfafe04ceeb530bd0e14a02b5f8
+EBUILD obpager-1.8.ebuild 920 RMD160 b7368091738788146d1c492431a694c409ef951e SHA1 36fe72ee35bc8d1ed8b53d09289c4b4dee572643 SHA256 219711289b0a83c63df8b26ddbeecb73dfff5d6b2c363585c70e66bc9cffe38d
+MISC ChangeLog 1590 RMD160 a4ef92d2288e09e0e36303a187b776a3c099a9b7 SHA1 35c2ef34827a186086297bef8c6518b414b0def1 SHA256 7cbe2a173269b4e51c294c38fa4c8da628583291c7f9e65a2994f8a57d431718
 MISC metadata.xml 313 RMD160 efa9a7e5a28661291f22d7630180bdaf78d36975 SHA1 da5ce48ae19dca2621a0a07d5d75211eb681070d SHA256 b0b932eaf667db6c69049ee0f7f8f59f8cdbb35cd6af36503447e850f94bb5b4
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHuNGZvSApE0uP4UsRAoz8AJwJgIgAlhRkKfazqInckS/Q3WyOgACfehdD
-CQA6WJMhTu08BKNZm4NejlM=
-=koX3
------END PGP SIGNATURE-----
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