Date: Monday, September 17, 2018 @ 23:54:22 Author: foutrelis Revision: 334820
Fix build with boost 1.68 Added: libcmis/trunk/boost-1.68.patch Modified: libcmis/trunk/PKGBUILD ------------------+ PKGBUILD | 3 +++ boost-1.68.patch | 25 +++++++++++++++++++++++++ 2 files changed, 28 insertions(+) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-09-17 23:48:24 UTC (rev 334819) +++ PKGBUILD 2018-09-17 23:54:22 UTC (rev 334820) @@ -10,13 +10,16 @@ depends=('boost-libs' 'curl' 'libxml2') makedepends=('docbook2x' 'cppunit' 'boost') source=("https://github.com/tdf/libcmis/releases/download/v${pkgver}/$pkgname-$pkgver.tar.gz" + boost-1.68.patch google_drive.diff) md5sums=('3270154f0f40d86fce849b161f914101' + '85ceb3467c3b37c277aaaa1dae365d71' '57eede4fdbd4709f48beee9e7b5f1509') validpgpkeys=() prepare() { cd "$pkgname-$pkgver" + patch -Np1 -i ${srcdir}/boost-1.68.patch patch -Np1 -i ${srcdir}/google_drive.diff } Added: boost-1.68.patch =================================================================== --- boost-1.68.patch (rev 0) +++ boost-1.68.patch 2018-09-17 23:54:22 UTC (rev 334820) @@ -0,0 +1,25 @@ +From 3ef3569c4ae1c5319aff0664d52cbd8a8d42c909 Mon Sep 17 00:00:00 2001 +From: rezso <re...@rezso.net> +Date: Tue, 4 Sep 2018 01:18:10 +0200 +Subject: tdf#119344 fix libcmis build with boost 1.68 + +Change-Id: I80d6ea8ecd001dc02b941c1eb8974c9244316045 +Reviewed-on: https://gerrit.libreoffice.org/59958 +Tested-by: Jenkins +Reviewed-by: Michael Stahl <michael.st...@cib.de> + +--- a/src/libcmis/xml-utils.cxx ++++ b/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"