03/18: gnu: libcmis: Fix FTBFS with Boost >= 1.68.0.

[Marius Bakke]

mbakke pushed a commit to branch core-updates
in repository guix.

commit f6f8645cc9337309eeae21e0d036a3167c4a85bc
Author: Marius Bakke <address@hidden>
Date:   Tue Sep 4 13:32:54 2018 +0200

    gnu: libcmis: Fix FTBFS with Boost >= 1.68.0.
    
    * gnu/packages/libreoffice.scm (libcmis)[arguments]: Add phase to substitute
    header file name.
---
 gnu/packages/libreoffice.scm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index 3dc7a4b..690fa80 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -316,7 +316,16 @@ working with graphics in the WPG (WordPerfect Graphics) 
format.")
           ;; During configure, the boost headers are found, but linking
           ;; fails without the following flag.
           (string-append "--with-boost="
-                         (assoc-ref %build-inputs "boost")))))
+                         (assoc-ref %build-inputs "boost")))
+        #:phases (modify-phases %standard-phases
+                   (add-before 'build 'fix-boost-include
+                     (lambda _
+                       ;; This library moved in Boost and the compatibility
+                       ;; redirect is no longer available since version 1.68.0.
+                       (substitute* "src/libcmis/xml-utils.cxx"
+                         (("boost/uuid/sha1.hpp")
+                          "boost/uuid/detail/sha1.hpp"))
+                       #t)))))
     (home-page "https://github.com/tdf/libcmis";)
     (synopsis "CMIS client library")
     (description "LibCMIS is a C++ client library for the CMIS interface.  It