diff options
| author | Xisco Fauli <xiscofauli@libreoffice.org> | 2024-08-22 12:10:43 +0200 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2024-08-22 16:39:23 +0200 |
| commit | 14f00ee63fba32ccf1b91e71da6de38b57794a32 (patch) | |
| tree | 8c3ae6b8557ce31b5347051566fc8e07209e934e /external/libcmis | |
| parent | 20b8f3922a374378cef7b87ee30cde2ae1d6264e (diff) | |
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 <xiscofauli@libreoffice.org>
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Diffstat (limited to 'external/libcmis')
| -rw-r--r-- | external/libcmis/UnpackedTarball_libcmis.mk | 1 | ||||
| -rw-r--r-- | external/libcmis/boost-1.86.0.patch.1 | 12 |
2 files changed, 13 insertions, 0 deletions
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 + |