From 48119cf42acef33dedcbba92d3bfb8cf8c9938d1 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Fri, 25 Feb 2022 08:45:17 +0100
Subject: [PATCH] Upgrade external/boost to latest Boost 1.78.0

<https://dev-www.libreoffice.org/src/boost_1_78_0.tar.xz> has been generated (on
Fedora 35) with

> $ wget https://boostorg.jfrog.io/artifactory/main/release/1.78.0/source/boost_1_78_0.tar.bz2
> --2022-02-24 12:05:39--  https://boostorg.jfrog.io/artifactory/main/release/1.78.0/source/boost_1_78_0.tar.bz2
> $ printf '8681f175d4bdb26c52222665793eef08490d7758529330f98d3b29dd0735bccc boost_1_78_0.tar.bz2' | sha256sum -c # cf. <https://www.boost.org/users/history/version_1_78_0.html>
> boost_1_78_0.tar.bz2: OK
> $ external/boost/repack_tarball.sh boost_1_78_0.tar.bz2
> Unpacking boost_1_78_0.tar.bz2 ...
> Removing unnecessary files ...
> Creating boost_1_78_0.tar.xz ...
> Cleaning up ...
> 0df00d3699c2c7c7fd490c5e165a3e72641861ea5d26428de2f008fb9a75659f  boost_1_78_0.tar.xz
> Done.

external/boost/boost_1_60_0.undef.warning.patch was obsoleted by
<https://github.com/boostorg/config/commit/9e80993844cb3d69bfdfa10f059706d7f22eb324>
"Define __clang_major___WORKAROUND_GUARD"

Change-Id: I7e59ef01ace4ff3c28a285e978e63279b119b07d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130514
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
---
 download.lst                                    |  4 ++--
 external/boost/UnpackedTarball_boost.mk         |  1 -
 external/boost/boost_1_60_0.undef.warning.patch | 16 ----------------
 3 files changed, 2 insertions(+), 19 deletions(-)
 delete mode 100644 external/boost/boost_1_60_0.undef.warning.patch

diff --git a/download.lst b/download.lst
index 7102ed63a3b1..38b9ded0ee4d 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 := 9b334d6c6d7af5a0687280788cd84444398b8e0b472cd88e52bbc3c3ef11d98e
-export BOOST_TARBALL := boost_1_77_0.tar.xz
+export BOOST_SHA256SUM := 0df00d3699c2c7c7fd490c5e165a3e72641861ea5d26428de2f008fb9a75659f
+export BOOST_TARBALL := boost_1_78_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 9e6a12bc4116..96bf85583673 100644
--- a/external/boost/UnpackedTarball_boost.mk
+++ b/external/boost/UnpackedTarball_boost.mk
@@ -28,7 +28,6 @@ boost_patches += boost_1_59_0.property_tree.wreturn-type.patch
 
 boost_patches += clang-cl.patch.0
 
-boost_patches += boost_1_60_0.undef.warning.patch
 boost_patches += boost_1_63_0.undef.warning.patch.1
 
 boost_patches += windows-no-utf8-locales.patch.0
diff --git a/external/boost/boost_1_60_0.undef.warning.patch b/external/boost/boost_1_60_0.undef.warning.patch
deleted file mode 100644
index 1e72d4e17a90..000000000000
--- a/external/boost/boost_1_60_0.undef.warning.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/b/boost/boost/config/workaround.hpp
-+++ a/b/boost/boost/config/workaround.hpp
-@@ -237,6 +237,13 @@
- #else
- #define BOOST_INTEL_WORKAROUND_GUARD 0
- #endif
-+
-+#ifndef __clang_major__
-+#define __clang_major___WORKAROUND_GUARD 1
-+#else
-+#define __clang_major___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
-