boost: upgrade to 1_87_0

* external/boost/0001-Add-a-comma-before-ellipsis-in-constexpr_swap.patch.2
has been fixed upstream

* Add external/boost/armv7.patch.0 based on following patches:
- https://github.com/boostorg/interprocess/commit/f58e968f13e693ffaa78fb283972e8598dc48c9f
- https://github.com/boostorg/unordered/commit/07f6463c1c302c5b1d28aa253e0b768e71c90235
- https://github.com/boostorg/json/commit/57d42f07158b8ea4a713378c90d22b28ca4787f8
- https://github.com/boostorg/outcome/commit/83e5127dd20b15e3f59059e5862e9926283fee80
to fix the problem described in 4f60246a1de68f7b47713ff926902791abe7a9ca
"Revert "boost: upgrade to 1_87_0" for now to unbreak android arm32
build"

<https://dev-www.libreoffice.org/src/boost_1_87_0.tar.xz> has been generated (on
Debian 12) with

> $ wget https://boostorg.jfrog.io/artifactory/main/release/1.87.0/source/boost_1_87_0.tar.bz2
> $ printf 'af57be25cb4c4f4b413ed692fe378affb4352ea50fbe294a11ef548f4d527d89 boost_1_87_0.tar.bz2' | sha256sum -c # cf. <https://www.boost.org/users/history/version_1_87_0.html>
> boost_1_87_0.tar.bz2: OK
> $ external/boost/repack_tarball.sh boost_1_87_0.tar.bz2
> Unpacking boost_1_87_0.tar.bz2 ...
> Removing unnecessary files ...
> Creating boost_1_87_0.tar.xz ...
> Cleaning up ...
> efd6d4ce7e8571ba87f77a30bee2d3dd8dccd306721351464fc6998dd00b0c8c  boost_1_87_0.tar.xz
> Done.

Change-Id: I4bb14ba60f0b19c4908a0ffbdc66cc23c1b2581e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180169
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Tested-by: Jenkins

4 files changed, 69 insertions, 32 deletions

diff --git a/download.lst b/download.lst
index 8b1740a609ee..e2327fdd6827 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 := efd6d4ce7e8571ba86f77a30bee2d3dd8dccd306721351464fc6998dd00b0c8c
-BOOST_TARBALL := boost_1_86_0.tar.xz
+BOOST_SHA256SUM := 750cbad72488ffbd6000f77d4fc40246e96141da556ee99000c1dc8664ea1157
+BOOST_TARBALL := boost_1_87_0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/boost/0001-Add-a-comma-before-ellipsis-in-constexpr_swap.patch.2 b/external/boost/0001-Add-a-comma-before-ellipsis-in-constexpr_swap.patch.2
deleted file mode 100644
index 3c3c8755fbfa..000000000000
--- a/external/boost/0001-Add-a-comma-before-ellipsis-in-constexpr_swap.patch.2
+++ /dev/null
@@ -1,28 +0,0 @@
-From 2dfe66886d71b9a341433ea8b6ff225cc07da80b Mon Sep 17 00:00:00 2001
-From: Andrey Semashev <andrey.semashev@gmail.com>
-Date: Mon, 2 Dec 2024 19:22:20 +0300
-Subject: Add a comma before ellipsis in constexpr_swap.
-
-gcc 15 complains that the comma is required before vararg ellipsis.
-
-Fixes https://github.com/boostorg/integer/issues/35.
----
- include/boost/integer/common_factor_rt.hpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/boost/integer/common_factor_rt.hpp b/include/boost/integer/common_factor_rt.hpp
-index d6765d4..817682f 100644
---- a/include/boost/integer/common_factor_rt.hpp
-+++ b/include/boost/integer/common_factor_rt.hpp
-@@ -64,7 +64,7 @@ namespace boost {
-             return a.swap(b);
-          }
-          template <class T, class U>
--         inline constexpr void constexpr_swap(T&a, U& b...) BOOST_GCD_NOEXCEPT(T)
-+         inline constexpr void constexpr_swap(T& a, U& b, ...) BOOST_GCD_NOEXCEPT(T)
-          {
-             T t(static_cast<T&&>(a));
-             a = static_cast<T&&>(b);
--- 
-2.47.1
-
diff --git a/external/boost/UnpackedTarball_boost.mk b/external/boost/UnpackedTarball_boost.mk
index 3a8033bbea1e..34500445e3ed 100644
--- a/external/boost/UnpackedTarball_boost.mk
+++ b/external/boost/UnpackedTarball_boost.mk
@@ -36,8 +36,6 @@ boost_patches += Wundef.patch.0
 
 boost_patches += boost.spirit.noreturn.patch
 
-boost_patches += 0001-Add-a-comma-before-ellipsis-in-constexpr_swap.patch.2
-
 # Sent upstream as <https://github.com/boostorg/move/pull/58> "Avoid
 # -Wdeprecated-variadic-comma-omission with GCC 15 trunk -std=c++26":
 boost_patches += 0001-Avoid-Wdeprecated-variadic-comma-omission-with-GCC-1.patch.2
@@ -51,6 +49,7 @@ $(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-nowasm.patch.0 \
+    external/boost/armv7.patch.0 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/boost/armv7.patch.0 b/external/boost/armv7.patch.0
new file mode 100644
index 000000000000..8b633e4c5e35
--- /dev/null
+++ b/external/boost/armv7.patch.0
@@ -0,0 +1,66 @@
+--- boost/interprocess/interprocess_printers.hpp	2025-01-13 11:32:51.113041026 +0100
++++ boost/interprocess/interprocess_printers.hpp	2025-01-13 11:33:32.201805786 +0100
+@@ -13,7 +13,7 @@
+ #pragma clang diagnostic push
+ #pragma clang diagnostic ignored "-Woverlength-strings"
+ #endif
+-__asm__(".pushsection \".debug_gdb_scripts\", \"MS\",@progbits,1\n"
++__asm__(".pushsection \".debug_gdb_scripts\", \"MS\",%progbits,1\n"
+         ".ascii \"\\4gdb.inlined-script.BOOST_INTERPROCESS_INTERPROCESS_PRINTERS_HPP\\n\"\n"
+         ".ascii \"import gdb.printing\\n\"\n"
+
+--- boost/unordered/unordered_printers.hpp	2025-01-13 12:23:26.189995185 +0100
++++ boost/unordered/unordered_printers.hpp	2025-01-13 12:23:42.549919517 +0100
+@@ -13,7 +13,7 @@
+ #pragma clang diagnostic push
+ #pragma clang diagnostic ignored "-Woverlength-strings"
+ #endif
+-__asm__(".pushsection \".debug_gdb_scripts\", \"MS\",@progbits,1\n"
++__asm__(".pushsection \".debug_gdb_scripts\", \"MS\",%progbits,1\n"
+         ".ascii \"\\4gdb.inlined-script.BOOST_UNORDERED_UNORDERED_PRINTERS_HPP\\n\"\n"
+         ".ascii \"import gdb.printing\\n\"\n"
+         ".ascii \"import gdb.xmethod\\n\"\n"
+--- boost/json/detail/gdb_printers.hpp	2025-01-13 12:30:40.399720177 +0100
++++ boost/json/detail/gdb_printers.hpp	2025-01-13 12:30:58.751614803 +0100
+@@ -23,7 +23,7 @@
+ #endif
+
+ __asm__(
+-  ".pushsection \".debug_gdb_scripts\", \"MS\",@progbits,1\n"
++  ".pushsection \".debug_gdb_scripts\", \"MS\",%progbits,1\n"
+   ".ascii \"\\4gdb.inlined-script.BOOST_JSON_DETAIL_GDB_PRINTERS_HPP\\n\"\n"
+   ".ascii \"import gdb\\n\"\n"
+   ".ascii \"import gdb.printing\\n\"\n"
+--- libs/json/pretty_printers/generate-gdb-header.py	2025-01-13 12:32:02.711243483 +0100
++++ libs/json/pretty_printers/generate-gdb-header.py	2025-01-13 12:32:19.715143756 +0100
+@@ -27,7 +27,7 @@
+ #endif
+
+ __asm__(
+-  ".pushsection \\\".debug_gdb_scripts\\\", \\\"MS\\\",@progbits,1\\n"
++  ".pushsection \\\".debug_gdb_scripts\\\", \\\"MS\\\",%progbits,1\\n"
+   ".ascii \\\"\\\\4gdb.inlined-script.{script_id}\\\\n\\\"\\n"
+ '''
+
+--- boost/outcome/outcome_gdb.h	2025-01-13 12:36:51.489504194 +0100
++++ boost/outcome/outcome_gdb.h	2025-01-13 12:37:05.345418709 +010
+@@ -32,7 +32,7 @@
+ #pragma clang diagnostic push
+ #pragma clang diagnostic ignored "-Woverlength-strings"
+ #endif
+-__asm__(".pushsection \".debug_gdb_scripts\", \"MS\",@progbits,1\n"
++__asm__(".pushsection \".debug_gdb_scripts\", \"MS\",%progbits,1\n"
+         ".ascii \"\\4gdb.inlined-script.BOOST_OUTCOME_INLINE_GDB_PRETTY_PRINTER_H\\n\"\n"
+         ".ascii \"import gdb.printing\\n\"\n"
+         ".ascii \"import os\\n\"\n"
+--- boost/outcome/experimental/status-code/status_code.hpp	2025-01-13 12:37:25.193295991 +0100
++++ boost/outcome/experimental/status-code/status_code.hpp	2025-01-13 12:37:34.281239705 +0100
+@@ -722,7 +722,7 @@
+ #pragma clang diagnostic ignored "-Woverlength-strings"
+ #endif
+ __asm__(
+-".pushsection \".debug_gdb_scripts\", \"MS\",@progbits,1\n"
++".pushsection \".debug_gdb_scripts\", \"MS\",%progbits,1\n"
+ ".ascii \"\\4gdb.inlined-script.BOOST_OUTCOME_SYSTEM_ERROR2_INLINE_GDB_PRETTY_PRINTERS_H\\n\"\n"
+ ".ascii \"import gdb.printing\\n\"\n"
+ ".ascii \"import gdb\\n\"\n"