01/01: gnu: libreoffice: Fix build with Poppler >= 0.62.0.

[Leo Famulari]

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

commit eb096cdebab56680375b26069ec524ddec60267e
Author: Leo Famulari <address@hidden>
Date:   Tue Jan 30 04:02:34 2018 -0500

    gnu: libreoffice: Fix build with Poppler >= 0.62.0.
    
    * gnu/packages/libreoffice.scm (libreoffice)[arguments]: Patch header and
    function names in 'prepare-src' phase.
---
 gnu/packages/libreoffice.scm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index 799b062..3c04ba8 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -946,6 +946,12 @@ and to return information on pronunciations, meanings and 
synonyms.")
              (lambda* (#:key inputs #:allow-other-keys)
                (let ((xmlsec (assoc-ref inputs "xmlsec-src")))
                  (substitute*
+                   "sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx"
+                   ;; This header was renamed in Poppler 0.62.0.
+                   (("UTF8.h") "UnicodeMapFuncs.h")
+                   ;; And mapUCS2() was renamed to mapUTF16().
+                   (("UCS2") "UTF16"))
+                 (substitute*
                    (list "sysui/CustomTarget_share.mk"
                          "solenv/gbuild/gbuild.mk"
                          "solenv/gbuild/platform/unxgcc.mk")