edd6243b1f
<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 <e7c4005098> "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 <30cb6fc1fe> "Fix -Wundef warnings". * external/boost/boost-emscripten-noshm.patch.0 is obsoleeted by <94ead3e59d> "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>
33 lines
1 KiB
Text
33 lines
1 KiB
Text
--- boost/config/workaround.hpp
|
|
+++ boost/config/workaround.hpp
|
|
@@ -264,6 +264,10 @@
|
|
#else
|
|
#define BOOST_CLANG_VERSION_WORKAROUND_GUARD 0
|
|
#endif
|
|
+
|
|
+#if !defined BOOST_LIBSTDCXX_VERSION_WORKAROUND_GUARD
|
|
+#define BOOST_LIBSTDCXX_VERSION_WORKAROUND_GUARD 0
|
|
+#endif
|
|
|
|
// Always define to zero, if it's used it'll be defined my MPL:
|
|
#define BOOST_MPL_CFG_GCC_WORKAROUND_GUARD 0
|
|
--- boost/locale/detail/facet_id.hpp
|
|
+++ boost/locale/detail/facet_id.hpp
|
|
@@ -12,7 +12,7 @@
|
|
|
|
/// \cond INTERNAL
|
|
namespace boost { namespace locale { namespace detail {
|
|
-#if BOOST_CLANG_VERSION >= 40900
|
|
+#if defined BOOST_CLANG_VERSION && BOOST_CLANG_VERSION >= 40900
|
|
# pragma clang diagnostic push
|
|
# pragma clang diagnostic ignored "-Wundefined-var-template"
|
|
#endif
|
|
@@ -25,7 +25,7 @@
|
|
struct BOOST_LOCALE_DECL facet_id {
|
|
static std::locale::id id;
|
|
};
|
|
-#if BOOST_CLANG_VERSION >= 40900
|
|
+#if defined BOOST_CLANG_VERSION && BOOST_CLANG_VERSION >= 40900
|
|
# pragma clang diagnostic pop
|
|
#endif
|
|
}}} // namespace boost::locale::detail
|