unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Leo Famulari <leo@famulari.name>
To: 30292@debbugs.gnu.org
Subject: [bug#30292] [PATCH] gnu: libreoffice: Fix build with Poppler >= 0.62.0.
Date: Tue, 30 Jan 2018 04:08:24 -0500	[thread overview]
Message-ID: <b8070e4a952abb6f071127c0a3f9b769ac25d68f.1517303265.git.leo@famulari.name> (raw)

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	other threads:[~2018-01-30  9:09 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-30  9:08 Leo Famulari [this message]
2018-01-30 20:38 ` [bug#30292] [PATCH] gnu: libreoffice: Fix build with Poppler >= 0.62.0 Leo Famulari
2018-01-30 21:14   ` Leo Famulari
2018-01-30 21:42     ` Leo Famulari
2018-02-01 20:51   ` bug#30292: " Leo Famulari
2018-01-30 20:39 ` [bug#30292] " Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=b8070e4a952abb6f071127c0a3f9b769ac25d68f.1517303265.git.leo@famulari.name \
    --to=leo@famulari.name \
    --cc=30292@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).