download.lst | 4 ++-- external/boost/UnpackedTarball_boost.mk | 3 --- external/boost/boost.utility.Wundef.warnings.patch | 11 ----------- 3 files changed, 2 insertions(+), 16 deletions(-)
New commits: commit 869a5897cfe8de5f69b2a72f296a443467907c02 Author: Stephan Bergmann <[email protected]> AuthorDate: Thu May 5 16:58:18 2022 +0200 Commit: Stephan Bergmann <[email protected]> CommitDate: Thu May 5 21:39:05 2022 +0200 Upgrade external/boost to latest Boost 1.79.0 <https://dev-www.libreoffice.org/src/boost_1_79_0.tar.xz> has been generated (on Fedora 35) with > $ wget https://boostorg.jfrog.io/artifactory/main/release/1.79.0/source/boost_1_79_0.tar.bz2 > $ printf '475d589d51a7f8b3ba2ba4eda022b170e562ca3b760ee922c146b6c65856ef39 boost_1_79_0.tar.bz2' | sha256sum -c # cf. <https://www.boost.org/users/history/version_1_79_0.html> > boost_1_79_0.tar.bz2: OK > $ external/boost/repack_tarball.sh boost_1_79_0.tar.bz2 > Unpacking boost_1_79_0.tar.bz2 ... > Removing unnecessary files ... > Creating boost_1_79_0.tar.xz ... > Cleaning up ... > 2058aa88758a0e1aaac1759b3c4bad2526f899c6ecc6eeea79aa5e8fd3ea95dc boost_1_79_0.tar.xz > Done. boost.utility.Wundef.warnings.patch was obsoleted by <https://github.com/boostorg/utility/commit/c3aab6a18411e637842247e0dd845c58ce8c6d6b> "Use #ifdef to test for BOOST_MSVC." Change-Id: I959f8ab42c3e20b9424cc3054421af60f6edd0d0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133895 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/download.lst b/download.lst index 5299b7b11a3b..c648a5323edb 100644 --- a/download.lst +++ b/download.lst @@ -6,8 +6,8 @@ export ABW_SHA256SUM := e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed export ABW_TARBALL := libabw-0.1.3.tar.xz # please repack the tarball using external/boost/repack_tarball.sh -export BOOST_SHA256SUM := 0df00d3699c2c7c7fd490c5e165a3e72641861ea5d26428de2f008fb9a75659f -export BOOST_TARBALL := boost_1_78_0.tar.xz +export BOOST_SHA256SUM := 2058aa88758a0e1aaac1759b3c4bad2526f899c6ecc6eeea79aa5e8fd3ea95dc +export BOOST_TARBALL := boost_1_79_0.tar.xz export BOX2D_SHA256SUM := d6b4650ff897ee1ead27cf77a5933ea197cbeef6705638dd181adc2e816b23c2 export BOX2D_TARBALL := box2d-2.4.1.tar.gz export BREAKPAD_SHA256SUM := c44a2e898895cfc13b42d2371ba4b88b0777d7782214d6cdc91c33720f3b0d91 diff --git a/external/boost/UnpackedTarball_boost.mk b/external/boost/UnpackedTarball_boost.mk index 96bf85583673..91a0e264a926 100644 --- a/external/boost/UnpackedTarball_boost.mk +++ b/external/boost/UnpackedTarball_boost.mk @@ -12,9 +12,6 @@ boost_patches := #https://svn.boost.org/trac/boost/ticket/6142 boost_patches += boost.6142.warnings.patch.1 -# https://svn.boost.org/trac/boost/ticket/9903 -boost_patches += boost.utility.Wundef.warnings.patch - boost_patches += boost.noiconv.patch boost_patches += boost.between.warning.patch boost_patches += boost.fallback.encoding.patch diff --git a/external/boost/boost.utility.Wundef.warnings.patch b/external/boost/boost.utility.Wundef.warnings.patch deleted file mode 100644 index 034709e26033..000000000000 --- a/external/boost/boost.utility.Wundef.warnings.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- foo/foo/foo/boost/utility/result_of.hpp -+++ foo/foo/foo/boost/utility/result_of.hpp -@@ -72,7 +72,7 @@ - // There doesn't seem to be any other way to turn this off such that the presence of - // the user-defined operator,() below doesn't cause spurious warning all over the place, - // so unconditionally turn it off. --#if BOOST_MSVC -+#if defined(BOOST_MSVC) && BOOST_MSVC - # pragma warning(disable: 4913) // user defined binary operator ',' exists but no overload could convert all operands, default built-in binary operator ',' used - #endif -
