Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=5b7aeee46f5ea5a04be82d64ee4c587f07c56a4f

commit 5b7aeee46f5ea5a04be82d64ee4c587f07c56a4f
Author: bouleetbil <bouleet...@frogdev.info>
Date:   Thu Jun 18 10:04:21 2009 +0200

fbpager-0.1.4-5-i686
*rebuild with new xorg
*added gcc43 patch

diff --git a/source/x11-extra/fbpager/FrugalBuild 
b/source/x11-extra/fbpager/FrugalBuild
index 72f4daa..f387c41 100644
--- a/source/x11-extra/fbpager/FrugalBuild
+++ b/source/x11-extra/fbpager/FrugalBuild
@@ -4,18 +4,19 @@

pkgname=fbpager
pkgver=0.1.4
-pkgrel=4
+pkgrel=5
pkgdesc="FBpager is a pager application for fluxbox"
url="http://www.fluxbox.org/fbpager/";
-makedepends=('mesa')
-depends=('libsm' 'libxrender' 'libstdc++')
+makedepends=('mesa>=7.4.2-5')
+depends=('libsm>=1.1.0' 'libxrender' 'libstdc++')
rodepends=('fluxbox')
groups=('x11-extra')
archs=('i686' 'x86_64')
-up2date="lynx -dump http://fluxbox.sourceforge.net/fbpager/ |Flasttar"
-source=(http://www.fluxbox.org/download/$pkgname-$pkgver.tar.gz 
g++-4.1_namespace.patch)
+up2date="lynx -dump http://fluxbox.sourceforge.net/fbpager/ |Flasttar"
+source=(http://www.fluxbox.org/download/$pkgname-$pkgver.tar.gz 
g++-4.1_namespace.patch gcc43.diff)
sha1sums=('73415dd7911f24e338b2b1bfc43f4aeb53daa5b2' \
-          '0182937480fd7c0511217736c3e43ab129eaa01d')
+          '0182937480fd7c0511217736c3e43ab129eaa01d' \
+          'ed643a86e48e41ebd72566b1088cb140fc7fcdf6')
unset MAKEFLAGS

# optimization OK
diff --git a/source/x11-extra/fbpager/gcc43.diff 
b/source/x11-extra/fbpager/gcc43.diff
new file mode 100644
index 0000000..2ff0834
--- /dev/null
+++ b/source/x11-extra/fbpager/gcc43.diff
@@ -0,0 +1,64 @@
+--- 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;
+ }
+
+
+
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to