Kaydet (Commit) 3ef3569c authored tarafından rezso's avatar rezso Kaydeden (comit) Michael Stahl

tdf#119344 fix libcmis build with boost 1.68

Change-Id: I80d6ea8ecd001dc02b941c1eb8974c9244316045
Reviewed-on: https://gerrit.libreoffice.org/59958
Tested-by: Jenkins
Reviewed-by: 's avatarMichael Stahl <Michael.Stahl@cib.de>
üst c134154d
......@@ -21,6 +21,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libcmis, \
external/libcmis/libcmis-sharepoint-repository-root.patch \
external/libcmis/libcmis-fix-error-handling.patch \
external/libcmis/c++17.patch.0 \
external/libcmis/boost-1.68.patch.0 \
))
ifeq ($(OS),WNT)
......
--- src/libcmis/xml-utils.cxx.orig 2016-03-01 16:14:26 UTC
+++ src/libcmis/xml-utils.cxx
@@ -31,7 +31,12 @@
#include <sstream>
#include <stdlib.h>
+#include <boost/version.hpp>
+#if (BOOST_VERSION >= 106800)
+#include <boost/uuid/detail/sha1.hpp>
+#else
#include <boost/uuid/sha1.hpp>
+#endif
#include <curl/curl.h>
#include "xml-utils.hxx"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment