mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

boost: upgrade to 1_87_0

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

<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: I9aaa9fc435b5b1890f9038ccfbfa26707a57a8da
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178574
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Tested-by: Jenkins
This commit is contained in:
Xisco Fauli
2024-12-16 11:55:38 +01:00
parent 1f7aceea7a
commit 25e7e1677b
3 changed files with 2 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
download.lst
View File

@@ -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

28
external/boost/0001-Add-a-comma-before-ellipsis-in-constexpr_swap.patch.2 vendored
View File

@@ -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

2
external/boost/UnpackedTarball_boost.mk vendored
View File

@@ -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