diff options
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/boost/StaticLibrary_boost_locale.mk | 1 | ||||
| -rw-r--r-- | external/boost/boost.between.warning.patch | 8 | ||||
| -rw-r--r-- | external/boost/boost.fallback.encoding.patch | 16 |
4 files changed, 18 insertions, 11 deletions
diff --git a/download.lst b/download.lst index 3257a3d06caa..284d73d2ff70 100644 --- a/download.lst +++ b/download.lst @@ -9,8 +9,8 @@ ABW_TARBALL := libabw-0.1.3.tar.xz # so that git cherry-pick # will not run into conflicts # please repack the tarball using external/boost/repack_tarball.sh -BOOST_SHA256SUM := 1deb0a5a9e33a6626fcaa1d2efd4c0e74ca2b0eea87c1559e3917f3066b633d6 -BOOST_TARBALL := boost_1_81_0.tar.xz +BOOST_SHA256SUM := e48ab6953fbd68ba47234bea5173e62427e9f6a7894e152305142895cfe955de +BOOST_TARBALL := boost_1_82_0.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/external/boost/StaticLibrary_boost_locale.mk b/external/boost/StaticLibrary_boost_locale.mk index 03e3bbc76b66..1193867a6d0e 100644 --- a/external/boost/StaticLibrary_boost_locale.mk +++ b/external/boost/StaticLibrary_boost_locale.mk @@ -44,6 +44,7 @@ $(eval $(call gb_StaticLibrary_add_generated_exception_objects,boost_locale,\ UnpackedTarball/boost/libs/locale/src/boost/locale/std/std_backend \ UnpackedTarball/boost/libs/locale/src/boost/locale/util/codecvt_converter \ UnpackedTarball/boost/libs/locale/src/boost/locale/util/default_locale \ + UnpackedTarball/boost/libs/locale/src/boost/locale/util/encoding \ UnpackedTarball/boost/libs/locale/src/boost/locale/util/gregorian \ UnpackedTarball/boost/libs/locale/src/boost/locale/util/info \ UnpackedTarball/boost/libs/locale/src/boost/locale/util/locale_data \ diff --git a/external/boost/boost.between.warning.patch b/external/boost/boost.between.warning.patch index 8c9ba65a1d39..349a9065ce62 100644 --- a/external/boost/boost.between.warning.patch +++ b/external/boost/boost.between.warning.patch @@ -1,6 +1,14 @@ 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/boost/locale/encoding/codepage.cpp +@@ -8,6 +8,7 @@ + #include <boost/locale/hold_ptr.hpp> + #include <memory> + #include <string> ++#include <string.h> + + #include "boost/locale/encoding/conv.hpp" + #if BOOST_LOCALE_USE_WIN32_API @@ -58,6 +58,9 @@ return cvt->convert(begin, end); #endif diff --git a/external/boost/boost.fallback.encoding.patch b/external/boost/boost.fallback.encoding.patch index 3ad39c47b638..8aa5ed6d1276 100644 --- a/external/boost/boost.fallback.encoding.patch +++ b/external/boost/boost.fallback.encoding.patch @@ -1,13 +1,11 @@ --- foo/misc/boost.orig/libs/locale/src/util/locale_data.cpp.new 2022-02-17 22:41:27.730549039 +0000 +++ foo/misc/boost/libs/locale/src/boost/locale/util/locale_data.cpp -@@ -18,8 +18,8 @@ - language = "C"; - country.clear(); - variant.clear(); -- encoding = "us-ascii"; -- utf8 = false; -+ encoding = "UTF-8"; -+ utf8 = true; - parse_from_lang(locale_name); +@@ -50,6 +50,8 @@ + bool locale_data::parse(const std::string& locale_name) + { + reset(); ++ encoding_ = "UTF-8"; ++ utf8_ = true; + return parse_from_lang(locale_name); } |