From eb096cdebab56680375b26069ec524ddec60267e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 30 Jan 2018 04:02:34 -0500 Subject: 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(+) (limited to 'gnu/packages/libreoffice.scm') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 799b062439..3c04ba8c49 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -945,6 +945,12 @@ (define-public libreoffice (add-before 'configure 'prepare-src (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" -- cgit v1.2.3