Ticket #20263: libreoffice-24.8.0.3-boost_1.86.0_build_failure-1.patch

File libreoffice-24.8.0.3-boost_1.86.0_build_failure-1.patch, 2.1 KB (added by martyj19, 4 weeks ago)

Updated boost patch

  • external/libcmis/boost_1.86.0_build_failure.patch.1

    diff -Naur libreoffice-24.2.5.2.orig/external/libcmis/boost_1.86.0_build_failure.patch.1 libreoffice-24.2.5.2/external/libcmis/boost_1.86.0_build_failure.patch.1
    old new  
     1diff -ur libcmis.org/src/libcmis/xml-utils.cxx libcmis/src/libcmis/xml-utils.cxx
     2--- libcmis.org/src/libcmis/xml-utils.cxx       2024-08-15 15:56:04.039673015 -0400
     3+++ libcmis/src/libcmis/xml-utils.cxx   2024-08-15 15:57:42.787321115 -0400
     4@@ -535,7 +535,7 @@
     5         boost::uuids::detail::sha1 sha1;
     6         sha1.process_bytes( str.c_str(), str.size() );
     7 
     8-        unsigned int digest[5];
     9+        unsigned char digest[20];
     10         sha1.get_digest( digest );
     11 
     12         stringstream out;
     13@@ -543,8 +543,9 @@
     14         // hexadecimal digits, including possible leading 0s, or we get
     15         // less than 40 digits as result.
     16         out << hex << setfill('0') << right;
     17+       unsigned int * idigest = reinterpret_cast<unsigned int *>(&digest[0]);
     18         for ( int i = 0; i < 5; ++i )
     19-            out << setw(8) << digest[i];
     20+            out << setw(8) << idigest[i];
     21         return out.str();
     22     }
     23 
  • external/libcmis/UnpackedTarball_libcmis.mk

    diff -Naur libreoffice-24.8.0.3.orig/external/libcmis/UnpackedTarball_libcmis.mk libreoffice-24.8.0.3/external/libcmis/UnpackedTarball_libcmis.mk
    old new  
    1818$(eval $(call gb_UnpackedTarball_add_patches,libcmis,\
    1919        external/libcmis/0001-cid-1545775-COPY_INSTEAD_OF_MOVE.patch \
    2020        external/libcmis/0001-Fix-warning-C4589-when-building-with-MSVC.patch \
     21        external/libcmis/boost_1.86.0_build_failure.patch.1 \
    2122        external/libcmis/http-session-cleanup.patch.1 \
    2223        external/libcmis/factory-no-retry-ssl.patch.1 \
    2324        external/libcmis/sharepoint-auth.patch.1 \