download.lst | 4 ++--
external/libcmis/UnpackedTarball_libcmis.mk | 1 +
external/libcmis/boost-1.86.0.patch.1 | 12 ++++++++++++
3 files changed, 15 insertions(+), 2 deletions(-)
New commits:
commit c9ee92d38cdb71d9b3fc142fd01a6b391f41b814
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Thu Aug 22 12:13:18 2024 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Thu Aug 22 16:39:30 2024 +0200
boost: upgrade to 1_86_0
<https://dev-www.libreoffice.org/src/boost_1_86_0.tar.xz> has been
generated (on
Debian 12) with
> $ wget
https://boostorg.jfrog.io/artifactory/main/release/1.86.0/source/boost_1_86_0.tar.bz2
> $ printf
'1bed88e40401b2cb7a1f76d4bab499e352fa4d0c5f31c0dbae64e24d34d7513b
boost_1_86_0.tar.bz2' | sha256sum -c # cf.
<https://www.boost.org/users/history/version_1_86_0.html>
> boost_1_86_0.tar.bz2: OK
> $ external/boost/repack_tarball.sh boost_1_86_0.tar.bz2
> Unpacking boost_1_86_0.tar.bz2 ...
> Removing unnecessary files ...
> Creating boost_1_86_0.tar.xz ...
> Cleaning up ...
> efd6d4ce7e8571ba86f77a30bee2d3dd8dccd306721351464fc6998dd00b0c8c
boost_1_86_0.tar.xz
> Done.
Change-Id: I9e22d34b55aa1dd483655df011545c1516ae003a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172247
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/download.lst b/download.lst
index c608d8babcb2..31906e4db561 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 :=
4e23218ff5036d57afd20f7cdab2e94cdbf6ba9c509d656ace643a81c40a985a
-BOOST_TARBALL := boost_1_85_0.tar.xz
+BOOST_SHA256SUM :=
efd6d4ce7e8571ba86f77a30bee2d3dd8dccd306721351464fc6998dd00b0c8c
+BOOST_TARBALL := boost_1_86_0.tar.xz
# three static lines
# so that git cherry-pick
# will not run into conflicts
commit 14f00ee63fba32ccf1b91e71da6de38b57794a32
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Thu Aug 22 12:10:43 2024 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Thu Aug 22 16:39:23 2024 +0200
libcmis: fix build against boost-1.86.0
Based on https://github.com/tdf/libcmis/issues/67
Change-Id: I0de90a423110b03a649bd7b20f7392f3aa5a45c3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172246
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/external/libcmis/UnpackedTarball_libcmis.mk
b/external/libcmis/UnpackedTarball_libcmis.mk
index d0b8e2b5c7bc..69bb6dd4b5c3 100644
--- a/external/libcmis/UnpackedTarball_libcmis.mk
+++ b/external/libcmis/UnpackedTarball_libcmis.mk
@@ -25,6 +25,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libcmis,\
external/libcmis/0001-cppcheck-operatorEqVarError-in-src-libcmis-http-sess.patch
\
external/libcmis/0001-Take-into-account-m_CurlInitProtocolsFunction-in-cop.patch
\
external/libcmis/initprotocols.patch.1 \
+ external/libcmis/boost-1.86.0.patch.1 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/libcmis/boost-1.86.0.patch.1
b/external/libcmis/boost-1.86.0.patch.1
new file mode 100644
index 000000000000..74d6df54f832
--- /dev/null
+++ b/external/libcmis/boost-1.86.0.patch.1
@@ -0,0 +1,12 @@
+--- libcmis/src/libcmis/xml-utils.cxx 2024-08-22 12:06:16.595963754 +0200
++++ libcmis/src/libcmis/xml-utils.cxx 2024-08-22 12:06:29.987877405 +0200
+@@ -536,7 +536,7 @@
+ sha1.process_bytes( str.c_str(), str.size() );
+
+ unsigned int digest[5];
+- sha1.get_digest( digest );
++ sha1.get_digest(
reinterpret_cast<boost::uuids::detail::sha1::digest_type&>(digest) );
+
+ stringstream out;
+ // Setup writing mode. Every number must produce eight
+
