From d5c04238908c055dd5a04abc6d2b4a0430be8830 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Sun, 1 Sep 2024 14:40:46 +0100 Subject: [PATCH] use final upstream merged fix for this boost issue MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I33a347d3c0efc4a38389d525f3c9e5f41a957d47 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172723 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- .../0001-Fix-boost-1.86-breakage.patch | 47 +++++++++++++++++++ external/libcmis/UnpackedTarball_libcmis.mk | 2 +- external/libcmis/boost-1.86.0.patch.1 | 12 ----- 3 files changed, 48 insertions(+), 13 deletions(-) create mode 100644 external/libcmis/0001-Fix-boost-1.86-breakage.patch delete mode 100644 external/libcmis/boost-1.86.0.patch.1 diff --git a/external/libcmis/0001-Fix-boost-1.86-breakage.patch b/external/libcmis/0001-Fix-boost-1.86-breakage.patch new file mode 100644 index 000000000000..ef398dfcc98b --- /dev/null +++ b/external/libcmis/0001-Fix-boost-1.86-breakage.patch @@ -0,0 +1,47 @@ +From dfcb642a491f7ec2ae52e3e83d31bb6cdf3670c2 Mon Sep 17 00:00:00 2001 +From: David Seifert +Date: Sat, 31 Aug 2024 12:39:39 +0200 +Subject: [PATCH] Fix boost 1.86 breakage + +The fix does not break building against <1.86 since we're now accessing the +object representation of the return value. + +Fixes #67 +--- + src/libcmis/xml-utils.cxx | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +diff --git a/src/libcmis/xml-utils.cxx b/src/libcmis/xml-utils.cxx +index e487d17..cdf088f 100644 +--- a/src/libcmis/xml-utils.cxx ++++ b/src/libcmis/xml-utils.cxx +@@ -531,16 +531,22 @@ namespace libcmis + boost::uuids::detail::sha1 sha1; + sha1.process_bytes( str.c_str(), str.size() ); + +- unsigned int digest[5]; ++ // on boost < 1.86.0, digest_type is typedef'd as unsigned int[5] ++ // on boost >= 1.86.0, digest_type is typedef'd as unsigned char[20] ++ boost::uuids::detail::sha1::digest_type digest; + sha1.get_digest( digest ); + ++ // by using a pointer to unsigned char, we can read the ++ // object representation of either typedef. ++ const unsigned char* ptr = reinterpret_cast( digest ); ++ + stringstream out; +- // Setup writing mode. Every number must produce eight ++ // Setup writing mode. Every number must produce two + // hexadecimal digits, including possible leading 0s, or we get + // less than 40 digits as result. + out << hex << setfill('0') << right; +- for ( int i = 0; i < 5; ++i ) +- out << setw(8) << digest[i]; ++ for ( int i = 0; i < sizeof( digest ); ++ptr, ++i ) ++ out << setw(2) << static_cast( *ptr ); + return out.str(); + } + +-- +2.45.1 + diff --git a/external/libcmis/UnpackedTarball_libcmis.mk b/external/libcmis/UnpackedTarball_libcmis.mk index 69bb6dd4b5c3..e47c7f81ef63 100644 --- a/external/libcmis/UnpackedTarball_libcmis.mk +++ b/external/libcmis/UnpackedTarball_libcmis.mk @@ -25,7 +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 \ + external/libcmis/0001-Fix-boost-1.86-breakage.patch \ )) # 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 deleted file mode 100644 index 74d6df54f832..000000000000 --- a/external/libcmis/boost-1.86.0.patch.1 +++ /dev/null @@ -1,12 +0,0 @@ ---- 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(digest) ); - - stringstream out; - // Setup writing mode. Every number must produce eight -