guix-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[bug#30292] [PATCH] gnu: libreoffice: Fix build with Poppler >= 0.62.0.


From: Leo Famulari
Subject: [bug#30292] [PATCH] gnu: libreoffice: Fix build with Poppler >= 0.62.0.
Date: Tue, 30 Jan 2018 04:08:24 -0500

I'll push this if and when the build finishes and I confirm that
LibreOffice is still working.

* 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 799b06243..3c04ba8c4 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -945,6 +945,12 @@ and to return information on pronunciations, meanings and 
synonyms.")
            (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"
-- 
2.16.1






reply via email to

[Prev in Thread] Current Thread [Next in Thread]