Fix for gcc-4.3. Bug 226857. Thanks to Marek Miller <mlm@shells.pl>.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25.8 i686

4 files changed, 75 insertions, 6 deletions

diff --git a/x11-misc/fbpager/ChangeLog b/x11-misc/fbpager/ChangeLog
index 8e3660b9746e..c174e1613808 100644
--- a/x11-misc/fbpager/ChangeLog
+++ b/x11-misc/fbpager/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/fbpager
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/fbpager/ChangeLog,v 1.9 2006/12/07 02:13:14 flameeyes Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/fbpager/ChangeLog,v 1.10 2008/07/20 21:09:05 loki_val Exp $
+
+  20 Jul 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/fbpager-0.1.4-gcc43.patch, fbpager-0.1.4.ebuild:
+  Fix for gcc-4.3. Bug 226857. Thanks to Marek Miller <mlm@shells.pl>.
 
   07 Dec 2006; Diego Pettenò <flameeyes@gentoo.org> fbpager-0.1.4.ebuild:
   Add ~x86-fbsd keyword as per bug #156873. Thanks to Mark Kowarsky
diff --git a/x11-misc/fbpager/Manifest b/x11-misc/fbpager/Manifest
index 3b2e0c491347..b24a11007637 100644
--- a/x11-misc/fbpager/Manifest
+++ b/x11-misc/fbpager/Manifest
@@ -1,5 +1,6 @@
 AUX fbpager-0.1.4-gcc41.patch 1919 RMD160 b2173c6fa700e81618b103d40d25ecce2bc052c6 SHA1 1381b69eb9ff21790d2aec4432b81ef0ccf0d064 SHA256 d42a024079c2ed9d7e73d8945fade964e2557c0e55596ba7570d4fdd9e95f2f4
+AUX fbpager-0.1.4-gcc43.patch 1519 RMD160 407ece2963fc8c7356b8c7b0babb6589aac68102 SHA1 80a48791046b8dcbd05abd91371f3e59e0d1bbaf SHA256 589aaf312e9c08dcf37837e61811426b4329cb77ff7af9ae7c011ffca0a33b2d
 DIST fbpager-0.1.4.tar.gz 349045 RMD160 326ad3f1800f0a45cccbc7e821f45d40263d3c08 SHA1 73415dd7911f24e338b2b1bfc43f4aeb53daa5b2 SHA256 1aab313d18a938d0bb8f150b4ac3ab1e965f7d21618336e0f5b07c6de999669f
-EBUILD fbpager-0.1.4.ebuild 802 RMD160 eaa9329aa8cb5128305cae897e685f8e7794ac3a SHA1 b5068032e0b506c2ed8ae00196f4406ec740e145 SHA256 38bca291d96fcda0047cd97404e84378d85f4dc3ccc98e36bb0da27f9ee02b86
-MISC ChangeLog 1233 RMD160 41bcfdfea4f74cd437e783e9e60294c2831d890d SHA1 e107b5b5af59faf12e61ec3afea9013a01972206 SHA256 019ac466d3c746161a8b549e10d556207f76d09475e609866cee1993386a7b70
+EBUILD fbpager-0.1.4.ebuild 840 RMD160 0d101e0b4a3a74c600bf48be20534b129ef678b9 SHA1 ea0dda547598d52cd0919f583a8f35be4a17a402 SHA256 6e967cf99e910016116e2306fb3853961316e3985ec5f529361f0b0b5f0bbf01
+MISC ChangeLog 1416 RMD160 d22700ab13e26625e1ef6a68bff37b4ef1b748c3 SHA1 921885d675af327662cb4a68106182c2f160aa84 SHA256 96df9274c478d106dd0d9d7b59cec13a9cb264af3af26c1a077308eb6e51dde5
 MISC metadata.xml 163 RMD160 f3a3f66a62012d6c9635ae33abfe28f549471c0a SHA1 923ee2f9b457e2110de082bbe17302c70c81a1f2 SHA256 058ba1219e0871827744b5cde326ae73cc7d326079e21e492b84333190ff1b6a
diff --git a/x11-misc/fbpager/fbpager-0.1.4.ebuild b/x11-misc/fbpager/fbpager-0.1.4.ebuild
index 7fd3e1233d79..d8a021df1002 100644
--- a/x11-misc/fbpager/fbpager-0.1.4.ebuild
+++ b/x11-misc/fbpager/fbpager-0.1.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/fbpager/fbpager-0.1.4.ebuild,v 1.11 2006/12/07 02:13:14 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/fbpager/fbpager-0.1.4.ebuild,v 1.12 2008/07/20 21:09:05 loki_val Exp $
 
 inherit eutils
 
@@ -22,6 +22,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}/${P}-gcc41.patch"
+	epatch "${FILESDIR}/${P}-gcc43.patch"
 }
 
 src_install() {
diff --git a/x11-misc/fbpager/files/fbpager-0.1.4-gcc43.patch b/x11-misc/fbpager/files/fbpager-0.1.4-gcc43.patch
new file mode 100644
index 000000000000..9289e990bac4
--- /dev/null
+++ b/x11-misc/fbpager/files/fbpager-0.1.4-gcc43.patch
@@ -0,0 +1,63 @@
+--- src/FbTk/StringUtil.cc.orig	2008-06-14 17:36:06.000000000 +0000
++++ src/FbTk/StringUtil.cc	2008-06-14 17:39:56.000000000 +0000
+@@ -23,6 +23,9 @@
+ 
+ #include "StringUtil.hh"
+ 
++
++#include <cstring>
++#include <locale>
+ #include <string>
+ #include <cstdio>
+ #include <cstdlib>
+@@ -37,6 +40,26 @@
+ 
+ namespace StringUtil {
+ 
++
++/* 
++ * structs needed for std::transform() 
++ * See: http://gcc.gnu.org/onlinedocs/libstdc++/22_locale/howto.html#7 
++ */ 
++struct ToUpper { 
++  ToUpper(std::locale const& l) : loc(l) {;} 
++  char operator() (char c) const  { return std::toupper(c,loc); } 
++ private: 
++  std::locale const& loc; 
++}; 
++	 
++struct ToLower { 
++  ToLower(std::locale const& l) : loc(l) {;} 
++  char operator() (char c) const  { return std::tolower(c,loc); } 
++private: 
++  std::locale const& loc; 
++}; 
++
++
+ /**
+    Takes a pointer to string *s as an argument,
+    creates a new string n, copies s to n and
+@@ -160,14 +183,20 @@
+ }
+ 
+ std::string toLower(const std::string &conv) {
++
++    ToLower __tolower(std::locale::classic());
++
+     std::string ret = conv;
+-    std::transform(ret.begin(), ret.end(), ret.begin(), tolower);
++    std::transform(ret.begin(), ret.end(), ret.begin(), __tolower);
+     return ret;
+ }
+ 
+ std::string toUpper(const std::string &conv) {
++
++    ToUpper __toupper(std::locale::classic());
++
+     std::string ret = conv;
+-    std::transform(ret.begin(), ret.end(), ret.begin(), toupper);
++    std::transform(ret.begin(), ret.end(), ret.begin(), __toupper);
+     return ret;
+ }
+ 
+