diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2023-04-17 13:27:27 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2023-04-17 18:59:32 +0200 |
| commit | 8daa8eef06fa485f5271503921585a3fbef26567 (patch) | |
| tree | 3724e3e80aa27b0e8f8b9c3b87d582313dc5a6b3 /external | |
| parent | e7617af8b463e31faabde6e409cc347c0c648364 (diff) | |
Upgrade external/boost to latest Boost 1.82.0
<https://dev-www.libreoffice.org/src/boost_1_82_0.tar.xz> has been generated (on
Fedora 38) with
> $ wget https://boostorg.jfrog.io/artifactory/main/release/1.82.0/source/boost_1_82_0.tar.bz2
> $ printf 'a6e1ab9b0860e6a2881dd7b21fe9f737a095e5f33a3a874afc6a345228597ee6 boost_1_82_0.tar.bz2' | sha256sum -c # cf. <https://www.boost.org/users/history/version_1_82_0.html>
> boost_1_82_0.tar.bz2: OK
> $ external/boost/repack_tarball.sh boost_1_82_0.tar.bz2
> Unpacking boost_1_82_0.tar.bz2 ...
> Removing unnecessary files ...
> Creating boost_1_82_0.tar.xz ...
> Cleaning up ...
> e48ab6953fbd68ba47234bea5173e62427e9f6a7894e152305142895cfe955de boost_1_82_0.tar.xz
> Done.
* Updating StaticLibrary_boost_locale.mk is needed to avoid
> workdir/UnpackedTarball/boost/libs/locale/src/boost/locale/util/locale_data.cpp:137: error: undefined reference to 'boost::locale::util::normalize_encoding(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)'
Change-Id: Iff3f5249df0fcf75f5a50e7eb35ef64373af8184
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150516
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external')
| -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 |
3 files changed, 16 insertions, 9 deletions
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); } |