diff options
author | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2024-04-25 22:58:56 +0200 |
---|---|---|
committer | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2024-04-26 07:29:34 +0200 |
commit | edd6243b1f607f5e60d1bbe869e2e236bc021177 (patch) | |
tree | a0b88d1946cd252c639fa8ec29e879d71ba799ea | |
parent | tdf#157240: also set font color together with font (diff) | |
download | core-edd6243b1f607f5e60d1bbe869e2e236bc021177.tar.gz core-edd6243b1f607f5e60d1bbe869e2e236bc021177.zip |
Upgrade external/boost to latest Boost 1.85.0
<https://dev-www.libreoffice.org/src/boost_1_85_0.tar.xz> has been generated (on
Fedora 40) with
> $ wget https://boostorg.jfrog.io/artifactory/main/release/1.85.0/source/boost_1_85_0.tar.bz2
> $ printf '7009fe1faa1697476bdc7027703a2badb84e849b7b0baad5086b087b971f8617 boost_1_85_0.tar.bz2' | sha256sum -c # cf. <https://www.boost.org/users/history/version_1_85_0.html>
> boost_1_85_0.tar.bz2: OK
> $ external/boost/repack_tarball.sh boost_1_85_0.tar.bz2
> Unpacking boost_1_85_0.tar.bz2 ...
> Removing unnecessary files ...
> Creating boost_1_85_0.tar.xz ...
> Cleaning up ...
> 4e23218ff5036d57afd20f7cdab2e94cdbf6ba9c509d656ace643a81c40a985a boost_1_85_0.tar.xz
> Done.
Three patches failed to apply:
* external/boost/boost_1_59_0.property_tree.wreturn-type.patch ("aka MSVC
warning C4715: not all control paths return a value") should no longer be
necessary after
<https://github.com/boostorg/property_tree/commit/e7c4005098749d878375be9ea8778b420ee89b86>
"Use BOOST_UNREACHABLE_RETURN at the end of function" (the referenced
<https://svn.boost.org/trac/boost/ticket/11501> appears to no longer be
reachable, though).
* The boost/math parts of external/boost/Wundef.patch.0 are obsoleted by
<https://github.com/boostorg/math/commit/30cb6fc1fe871046c2880c8c39b0cea5b91a7f2c>
"Fix -Wundef warnings".
* external/boost/boost-emscripten-noshm.patch.0 is obsoleeted by
<https://github.com/boostorg/interprocess/commit/94ead3e59d197e0d8d908b7e8918673bed51fa34>
"emscripten doesn't support shm".
Change-Id: Id2d86d25a60097f3f0852063b5ac2a8220f6b479
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166656
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
-rw-r--r-- | download.lst | 4 | ||||
-rw-r--r-- | external/boost/UnpackedTarball_boost.mk | 3 | ||||
-rw-r--r-- | external/boost/Wundef.patch.0 | 22 | ||||
-rw-r--r-- | external/boost/boost-emscripten-noshm.patch.0 | 11 | ||||
-rw-r--r-- | external/boost/boost_1_59_0.property_tree.wreturn-type.patch | 14 |
5 files changed, 2 insertions, 52 deletions
diff --git a/download.lst b/download.lst index 9989521f9094..df1a213bbb95 100644 --- a/download.lst +++ b/download.lst @@ -14,8 +14,8 @@ ARGON2_TARBALL := phc-winner-argon2-20190702.tar.gz # so that git cherry-pick # will not run into conflicts # please repack the tarball using external/boost/repack_tarball.sh -BOOST_SHA256SUM := fd4a2ee785ea0e4efc5221a4284e0cf51096e8409871fb70fdaced002eeffc0b -BOOST_TARBALL := boost_1_84_0.tar.xz +BOOST_SHA256SUM := 4e23218ff5036d57afd20f7cdab2e94cdbf6ba9c509d656ace643a81c40a985a +BOOST_TARBALL := boost_1_85_0.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/external/boost/UnpackedTarball_boost.mk b/external/boost/UnpackedTarball_boost.mk index c49a2bc099fc..1d555de9861e 100644 --- a/external/boost/UnpackedTarball_boost.mk +++ b/external/boost/UnpackedTarball_boost.mk @@ -20,8 +20,6 @@ boost_patches += rtti.patch.0 # https://svn.boost.org/trac/boost/ticket/11505 boost_patches += boost_1_59_0.mpl.config.wundef.patch -# https://svn.boost.org/trac/boost/ticket/11501 -boost_patches += boost_1_59_0.property_tree.wreturn-type.patch boost_patches += clang-cl.patch.0 @@ -44,7 +42,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,boost,3)) $(eval $(call gb_UnpackedTarball_add_patches,boost,\ $(foreach patch,$(boost_patches),external/boost/$(patch)) \ - external/boost/boost-emscripten-noshm.patch.0 \ external/boost/boost-emscripten-nowasm.patch.0 \ )) diff --git a/external/boost/Wundef.patch.0 b/external/boost/Wundef.patch.0 index 63dfc4afde00..8cb546464373 100644 --- a/external/boost/Wundef.patch.0 +++ b/external/boost/Wundef.patch.0 @@ -31,25 +31,3 @@ # pragma clang diagnostic pop #endif }}} // namespace boost::locale::detail ---- boost/math/tools/config.hpp -+++ boost/math/tools/config.hpp -@@ -147,7 +147,7 @@ - #endif - - // C++23 --#if __cplusplus > 202002L || _MSVC_LANG > 202002L -+#if __cplusplus > 202002L || (defined _MSVC_LANG && _MSVC_LANG > 202002L) - # if __GNUC__ >= 13 - // libstdc++3 only defines to/from_chars for std::float128_t when one of these defines are set - // otherwise we're right out of luck... ---- boost/math/tools/promotion.hpp -+++ boost/math/tools/promotion.hpp -@@ -27,7 +27,7 @@ - #include <type_traits> - - #if defined __has_include --# if __cplusplus > 202002L || _MSVC_LANG > 202002L -+# if __cplusplus > 202002L || (defined _MSVC_LANG && _MSVC_LANG > 202002L) - # if __has_include (<stdfloat>) - # include <stdfloat> - # endif diff --git a/external/boost/boost-emscripten-noshm.patch.0 b/external/boost/boost-emscripten-noshm.patch.0 deleted file mode 100644 index f9d27b0b6e11..000000000000 --- a/external/boost/boost-emscripten-noshm.patch.0 +++ /dev/null @@ -1,11 +0,0 @@ ---- boost/interprocess/detail/workaround.hpp.orig 2020-12-15 06:31:51.037665526 +0100 -+++ boost/interprocess/detail/workaround.hpp 2020-12-15 06:32:39.741281893 +0100 -@@ -31,7 +31,7 @@ - ////////////////////////////////////////////////////// - //Check for XSI shared memory objects. They are available in nearly all UNIX platforms - ////////////////////////////////////////////////////// -- #if !defined(__QNXNTO__) && !defined(__ANDROID__) && !defined(__HAIKU__) && !(__VXWORKS__) -+ #if !defined(__QNXNTO__) && !defined(__ANDROID__) && !defined(__HAIKU__) && !(__VXWORKS__) && !defined(__EMSCRIPTEN__) - #define BOOST_INTERPROCESS_XSI_SHARED_MEMORY_OBJECTS - #endif - diff --git a/external/boost/boost_1_59_0.property_tree.wreturn-type.patch b/external/boost/boost_1_59_0.property_tree.wreturn-type.patch deleted file mode 100644 index 1673e4bd8669..000000000000 --- a/external/boost/boost_1_59_0.property_tree.wreturn-type.patch +++ /dev/null @@ -1,14 +0,0 @@ -aka MSVC warning C4715: not all control paths return a value - -diff -ru boost.org/boost/property_tree/json_parser/detail/standard_callbacks.hpp boost/boost/property_tree/json_parser/detail/standard_callbacks.hpp ---- foo/misc/boost.org/boost/property_tree/json_parser/detail/standard_callbacks.hpp 2015-07-07 14:20:48.000000000 +0200 -+++ foo/misc/boost/boost/property_tree/json_parser/detail/standard_callbacks.hpp 2015-07-22 08:35:07.764263463 +0200 -@@ -128,7 +128,7 @@ - } - case object: - default: -- BOOST_ASSERT(false); // must start with string, i.e. call new_value -+ std::abort(); - case key: { - l.t->push_back(std::make_pair(key_buffer, Ptree())); - l.k = object; |