diff options
Diffstat (limited to 'games-action/openlierox/files')
| -rw-r--r-- | games-action/openlierox/files/openlierox-0.58_rc1-curl.patch | 72 | ||||
| -rw-r--r-- | games-action/openlierox/files/openlierox-0.58_rc1-icu.patch | 67 |
2 files changed, 139 insertions, 0 deletions
diff --git a/games-action/openlierox/files/openlierox-0.58_rc1-curl.patch b/games-action/openlierox/files/openlierox-0.58_rc1-curl.patch new file mode 100644 index 0000000..d151036 --- /dev/null +++ b/games-action/openlierox/files/openlierox-0.58_rc1-curl.patch @@ -0,0 +1,72 @@ +diff --git a/include/HTTP.h b/include/HTTP.h +index 6be27f9..916193b 100644 +--- a/include/HTTP.h ++++ b/include/HTTP.h +@@ -21,7 +21,12 @@ + + #include <string> + #include <curl/curl.h> +-#include <curl/types.h> ++#if ! defined(LIBCURL_VERSION_PATCH) \ ++ || (LIBCURL_VERSION_MAJOR < 7) \ ++ || ((LIBCURL_VERSION_MAJOR == 7) && (LIBCURL_VERSION_MINOR < 21)) \ ++ || ((LIBCURL_VERSION_MAJOR == 7) && (LIBCURL_VERSION_MINOR == 21) && (LIBCURL_VERSION_PATCH < 7)) ++# include <curl/types.h> ++#endif + #include <curl/easy.h> + + #include "Networking.h" +diff --git a/src/breakpad/external/src/common/linux/http_upload.cc b/src/breakpad/external/src/common/linux/http_upload.cc +index 8748d11..c079aef 100644 +--- a/src/breakpad/external/src/common/linux/http_upload.cc ++++ b/src/breakpad/external/src/common/linux/http_upload.cc +@@ -31,7 +31,12 @@ + #include <dlfcn.h> + #include <curl/curl.h> + #include <curl/easy.h> +-#include <curl/types.h> ++#if ! defined(LIBCURL_VERSION_PATCH) \ ++ || (LIBCURL_VERSION_MAJOR < 7) \ ++ || ((LIBCURL_VERSION_MAJOR == 7) && (LIBCURL_VERSION_MINOR < 21)) \ ++ || ((LIBCURL_VERSION_MAJOR == 7) && (LIBCURL_VERSION_MINOR == 21) && (LIBCURL_VERSION_PATCH < 7)) ++# include <curl/types.h> ++#endif + + #include "common/linux/http_upload.h" + +diff --git a/src/breakpad/external/src/common/linux/libcurl_wrapper.cc b/src/breakpad/external/src/common/linux/libcurl_wrapper.cc +index 5bea3af..1fa6d24 100644 +--- a/src/breakpad/external/src/common/linux/libcurl_wrapper.cc ++++ b/src/breakpad/external/src/common/linux/libcurl_wrapper.cc +@@ -29,7 +29,12 @@ + + #include <curl/curl.h> + #include <curl/easy.h> +-#include <curl/types.h> ++#if ! defined(LIBCURL_VERSION_PATCH) \ ++ || (LIBCURL_VERSION_MAJOR < 7) \ ++ || ((LIBCURL_VERSION_MAJOR == 7) && (LIBCURL_VERSION_MINOR < 21)) \ ++ || ((LIBCURL_VERSION_MAJOR == 7) && (LIBCURL_VERSION_MINOR == 21) && (LIBCURL_VERSION_PATCH < 7)) ++# include <curl/types.h> ++#endif + #include <dlfcn.h> + + #include <string> +diff --git a/src/common/HTTP.cpp b/src/common/HTTP.cpp +index 0782f9c..7f7a852 100644 +--- a/src/common/HTTP.cpp ++++ b/src/common/HTTP.cpp +@@ -25,7 +25,12 @@ + #include <stdlib.h> + #endif + #include <curl/curl.h> +-#include <curl/types.h> ++#if ! defined(LIBCURL_VERSION_PATCH) \ ++ || (LIBCURL_VERSION_MAJOR < 7) \ ++ || ((LIBCURL_VERSION_MAJOR == 7) && (LIBCURL_VERSION_MINOR < 21)) \ ++ || ((LIBCURL_VERSION_MAJOR == 7) && (LIBCURL_VERSION_MINOR == 21) && (LIBCURL_VERSION_PATCH < 7)) ++# include <curl/types.h> ++#endif + #include <curl/easy.h> + + #include "LieroX.h" diff --git a/games-action/openlierox/files/openlierox-0.58_rc1-icu.patch b/games-action/openlierox/files/openlierox-0.58_rc1-icu.patch new file mode 100644 index 0000000..32817c0 --- /dev/null +++ b/games-action/openlierox/files/openlierox-0.58_rc1-icu.patch @@ -0,0 +1,67 @@ +From f30e2447944c5131b9c9502ca8054f847d1a9c0f Mon Sep 17 00:00:00 2001 +From: Albert Zeyer <albert.zeyer@rwth-aachen.de> +Date: Tue, 22 Mar 2011 14:42:15 +0100 +Subject: [PATCH] rename UnicodeString to Unicode32String + +Seems that ICU (unicode/unistr.h) polutes the global namespace and uses this name. See http://bugs.gentoo.org/show_bug.cgi?id=359655 . +--- + include/Unicode.h | 6 +++--- + src/common/Unicode.cpp | 8 ++++---- + 2 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/include/Unicode.h b/include/Unicode.h +index a523b46..5b976ab 100644 +--- a/include/Unicode.h ++++ b/include/Unicode.h +@@ -15,7 +15,7 @@ + #include <string> + + typedef Uint32 UnicodeChar; +-typedef std::basic_string<UnicodeChar> UnicodeString; ++typedef std::basic_string<UnicodeChar> Unicode32String; + #ifdef WIN32 + typedef wchar_t Utf16Char; + typedef std::wstring Utf16String; +@@ -158,8 +158,8 @@ char UnicodeCharToAsciiChar(UnicodeChar c); + std::string RemoveSpecialChars(const std::string &Utf8String); + std::string Utf16ToUtf8(const Utf16String& str); + Utf16String Utf8ToUtf16(const std::string& str); +-std::string UnicodeToUtf8(const UnicodeString& str); +-UnicodeString Utf8ToUnicode(const std::string& str); ++std::string UnicodeToUtf8(const Unicode32String& str); ++Unicode32String Utf8ToUnicode(const std::string& str); + std::string UnicodeToAscii(const std::string& utf8str); + std::string ISO88591ToUtf8(const std::string& isostr); + #ifdef WIN32 +diff --git a/src/common/Unicode.cpp b/src/common/Unicode.cpp +index 5956289..5a58c30 100644 +--- a/src/common/Unicode.cpp ++++ b/src/common/Unicode.cpp +@@ -1055,10 +1055,10 @@ Utf16String Utf8ToUtf16(const std::string& str) + + ////////////////// + // Convert a Unicode string to UTF8 +-std::string UnicodeToUtf8(const UnicodeString& str) ++std::string UnicodeToUtf8(const Unicode32String& str) + { + std::string result; +- for (UnicodeString::const_iterator i = str.begin(); i != str.end(); i++) { ++ for (Unicode32String::const_iterator i = str.begin(); i != str.end(); i++) { + result += GetUtf8FromUnicode(*i); + } + +@@ -1067,9 +1067,9 @@ std::string UnicodeToUtf8(const UnicodeString& str) + + ////////////////// + // Convert a UTF8 string to Unicode +-UnicodeString Utf8ToUnicode(const std::string& str) ++Unicode32String Utf8ToUnicode(const std::string& str) + { +- UnicodeString result; ++ Unicode32String result; + for (std::string::const_iterator it = str.begin(); it != str.end();) + result += GetNextUnicodeFromUtf8(it, str.end()); + +-- +1.7.3.4 + |