diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 09:06:44 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 09:06:44 +0000 |
| commit | ed5640d8b587fbcfed7dd7967f3de04b37a76f26 (patch) | |
| tree | 7a5f7c6c9d02226d7471cb3cc8fbbf631b415303 /external/boost/boost.noiconv.patch | |
| parent | Initial commit. (diff) | |
| download | libreoffice-ed5640d8b587fbcfed7dd7967f3de04b37a76f26.tar.xz libreoffice-ed5640d8b587fbcfed7dd7967f3de04b37a76f26.zip | |
Adding upstream version 4:7.4.7.upstream/4%7.4.7upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'external/boost/boost.noiconv.patch')
| -rw-r--r-- | external/boost/boost.noiconv.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/external/boost/boost.noiconv.patch b/external/boost/boost.noiconv.patch new file mode 100644 index 000000000..1bce0414d --- /dev/null +++ b/external/boost/boost.noiconv.patch @@ -0,0 +1,51 @@ +diff -ru boost.orig/boost/libs/locale/src/encoding/codepage.cpp boost/boost/libs/locale/src/encoding/codepage.cpp +--- foo/misc/boost.orig/libs/locale/src/encoding/codepage.cpp ++++ foo/misc/boost/libs/locale/src/encoding/codepage.cpp +@@ -39,6 +39,7 @@ + char const *from_charset, + method_type how) + { ++ #if defined(BOOST_LOCALE_WITH_ICONV) || defined(BOOST_LOCALE_WITH_ICU) || defined(BOOST_LOCALE_WITH_WCONV) + hold_ptr<converter_between> cvt; + #ifdef BOOST_LOCALE_WITH_ICONV + cvt.reset(new iconv_between()); +@@ -55,6 +56,7 @@ + if(cvt->open(to_charset,from_charset,how)) + return cvt->convert(begin,end); + #endif ++ #endif + throw invalid_charset_error(std::string(to_charset) + " or " + from_charset); + } + +@@ -65,6 +67,7 @@ + char const *charset, + method_type how) + { ++ #if defined(BOOST_LOCALE_WITH_ICONV) || defined(BOOST_LOCALE_WITH_ICU) || defined(BOOST_LOCALE_WITH_WCONV) + hold_ptr<converter_to_utf<CharType> > cvt; + #ifdef BOOST_LOCALE_WITH_ICONV + cvt.reset(new iconv_to_utf<CharType>()); +@@ -81,6 +84,7 @@ + if(cvt->open(charset,how)) + return cvt->convert(begin,end); + #endif ++ #endif + throw invalid_charset_error(charset); + } + +@@ -91,6 +95,7 @@ + char const *charset, + method_type how) + { ++ #if defined(BOOST_LOCALE_WITH_ICONV) || defined(BOOST_LOCALE_WITH_ICU) || defined(BOOST_LOCALE_WITH_WCONV) + hold_ptr<converter_from_utf<CharType> > cvt; + #ifdef BOOST_LOCALE_WITH_ICONV + cvt.reset(new iconv_from_utf<CharType>()); +@@ -107,6 +112,7 @@ + if(cvt->open(charset,how)) + return cvt->convert(begin,end); + #endif ++ #endif + throw invalid_charset_error(charset); + } + |