summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/fbpager/files/fbpager-0.1.4-gcc41.patch76
-rw-r--r--x11-misc/fbpager/files/fbpager-0.1.4-gcc43.patch63
2 files changed, 0 insertions, 139 deletions
diff --git a/x11-misc/fbpager/files/fbpager-0.1.4-gcc41.patch b/x11-misc/fbpager/files/fbpager-0.1.4-gcc41.patch
deleted file mode 100644
index 8f085d5a9724..000000000000
--- a/x11-misc/fbpager/files/fbpager-0.1.4-gcc41.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- fbpager-0.1.4.orig/src/Resources.hh
-+++ fbpager-0.1.4/src/Resources.hh
-@@ -8,8 +8,10 @@
- #include <cstdio>
- #include <cstring>
-
-+namespace FbTk {
-+
- template<>
--void FbTk::Resource<bool>::
-+void Resource<bool>::
- setFromString(char const *strval) {
- if (strcasecmp(strval, "true") == 0 ||
- strcasecmp(strval, "yes") == 0)
-@@ -19,38 +21,37 @@
- }
-
- template<>
--std::string FbTk::Resource<bool>::
-+std::string Resource<bool>::
- getString() {
- return std::string(**this == true ? "true" : "false");
- }
-
- template <>
--void FbTk::Resource<std::string>::setFromString(const char *str) {
-+void Resource<std::string>::setFromString(const char *str) {
- *(*this) = (str ? str : "");
- }
-
- template <>
--std::string FbTk::Resource<std::string>::getString() {
-+std::string Resource<std::string>::getString() {
- return *(*this);
- }
-
- template <>
--void FbTk::Resource<int>::setFromString(const char *str) {
-+void Resource<int>::setFromString(const char *str) {
- if (str == 0)
- return;
- sscanf(str, "%d", &(*(*this)));
- }
-
- template <>
--std::string FbTk::Resource<int>::getString() {
-+std::string Resource<int>::getString() {
- char buff[16];
- sprintf(buff, "%d", (*(*this)));
- return std::string(buff);
- }
-
--namespace FbPager {
- template <>
--void FbTk::Resource<FbPager::Alignment>::setFromString(const char *str) {
-+void Resource<FbPager::FbPager::Alignment>::setFromString(const char *str) {
- if (strcmp("TopToBottom", str) == 0)
- *(*this) = FbPager::FbPager::TOP_TO_BOTTOM;
- else
-@@ -58,7 +59,7 @@
- }
-
- template <>
--std::string FbTk::Resource<FbPager::Alignment>::getString() {
-+std::string Resource<FbPager::FbPager::Alignment>::getString() {
- switch (*(*this)) {
- case FbPager::FbPager::LEFT_TO_RIGHT:
- return "LeftToRight";
-@@ -67,6 +68,6 @@
- }
- }
-
--} // end namespace FbPager
-+} // end namespace FbTk
-
- #endif // RESOURCES
diff --git a/x11-misc/fbpager/files/fbpager-0.1.4-gcc43.patch b/x11-misc/fbpager/files/fbpager-0.1.4-gcc43.patch
deleted file mode 100644
index 9289e990bac4..000000000000
--- a/x11-misc/fbpager/files/fbpager-0.1.4-gcc43.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- 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;
- }
-
-