[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Petr Mladek]

 patches/dev300/apply                                      |    3 -
 patches/dev300/i18nutil-glibc-braindamage-workaround.diff |   23 --------------
 2 files changed, 26 deletions(-)

New commits:
commit c8e3418dea57bf049ccac6b318fa404672c8c440
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Apr 27 16:04:28 2011 +0200

    pushed i18nutil-glibc-braindamage-workaround.diff into git

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 41b572b..33f42fd 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -356,9 +356,6 @@ sensible-browser.diff
 # add missing #include <stdio.h> in autodoc, breaks when building with STLport5
 #autodoc-add-missing-stdio-h.diff, rengelha
 
-# Workaround for compile failure with glibc 2.4's langinfo.h
-i18nutil-glibc-braindamage-workaround.diff, brosenk
-
 [ DebianOnly ]
 open-url-support-iceanimals.diff
 
diff --git a/patches/dev300/i18nutil-glibc-braindamage-workaround.diff b/patches/dev300/i18nutil-glibc-braindamage-workaround.diff
deleted file mode 100644
index 161861b..0000000
--- a/patches/dev300/i18nutil-glibc-braindamage-workaround.diff
+++ /dev/null
@@ -1,23 +0,0 @@
----
- i18nutil/source/utility/unicode.cxx |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git i18nutil/source/utility/unicode.cxx i18nutil/source/utility/unicode.cxx
-index 6e14509..6772da7 100644
---- i18nutil/source/utility/unicode.cxx
-+++ i18nutil/source/utility/unicode.cxx
-@@ -30,6 +30,11 @@
- #include <i18nutil/unicode.hxx>
- #include "unicode_data.h"
- 
-+// Workaround for glibc braindamage:
-+// glibc 2.4's langinfo.h does "#define CURRENCY_SYMBOL __CURRENCY_SYMBOL"
-+// which (obviously) breaks UnicodeType::CURRENCY_SYMBOL
-+#undef CURRENCY_SYMBOL
-+
- using namespace ::com::sun::star::i18n;
- 
- static ScriptTypeList defaultTypeList[] = {
--- 
-1.7.0.1
-