02/04: gnu: libreoffice: Fix build with Poppler 0.86.

[guix-commits]

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

commit 976ae7eab6d14a8a82bf185e39f58abac0c4b915
Author: Marius Bakke <address@hidden>
AuthorDate: Fri Apr 3 15:58:22 2020 +0200

    gnu: libreoffice: Fix build with Poppler 0.86.
    
    * gnu/packages/patches/libreoffice-poppler-compat.patch: New file.
    * gnu/local.mk (dist_patch_DATA): Adjust accordingly.
    * gnu/packages/libreoffice.scm (libreoffice)[source](patches): New field.
---
 gnu/local.mk                                          |  1 +
 gnu/packages/libreoffice.scm                          |  1 +
 gnu/packages/patches/libreoffice-poppler-compat.patch | 19 +++++++++++++++++++
 3 files changed, 21 insertions(+)

diff --git a/gnu/local.mk b/gnu/local.mk
index 1599b09..f5ca0e3 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1143,6 +1143,7 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/libmpeg2-global-symbol-test.patch       \
   %D%/packages/patches/libmygpo-qt-fix-qt-5.11.patch           \
   %D%/packages/patches/libmygpo-qt-missing-qt5-modules.patch   \
+  %D%/packages/patches/libreoffice-poppler-compat.patch                \
   %D%/packages/patches/libsndfile-armhf-type-checks.patch      \
   %D%/packages/patches/libsndfile-CVE-2017-8361-8363-8365.patch        \
   %D%/packages/patches/libsndfile-CVE-2017-8362.patch          \
diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index 225bf78..a3a6ea5 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -1006,6 +1006,7 @@ converting QuarkXPress file format.  It supports versions 
3.1 to 4.1.")
         (string-append
          "https://download.documentfoundation.org/libreoffice/src/";
          (version-prefix version 3) "/libreoffice-" version ".tar.xz"))
+       (patches (search-patches "libreoffice-poppler-compat.patch"))
        (sha256
         (base32
          "06acm41q9nda8r30b13cn9zafsw1gszjdphh6lx90s09d2sf7f23"))))
diff --git a/gnu/packages/patches/libreoffice-poppler-compat.patch 
b/gnu/packages/patches/libreoffice-poppler-compat.patch
new file mode 100644
index 0000000..8dc0b60
--- /dev/null
+++ b/gnu/packages/patches/libreoffice-poppler-compat.patch
@@ -0,0 +1,19 @@
+Fix type mismatch with Poppler 0.86.
+
+Taken from Arch Linux:
+https://git.archlinux.org/svntogit/packages.git/tree/trunk/libreoffice-poppler-0.86.patch?h=packages/libreoffice-fresh
+
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+@@ -563,7 +563,9 @@ void PDFOutDev::processLink(Link* link, Catalog*)
+     if (!(pAction && pAction->getKind() == actionURI))
+         return;
+ 
+-#if POPPLER_CHECK_VERSION(0, 72, 0)
++#if POPPLER_CHECK_VERSION(0, 86, 0)
++    const char* pURI = static_cast<LinkURI*>(pAction)->getURI().c_str();
++#elif POPPLER_CHECK_VERSION(0, 72, 0)
+     const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->c_str();
+ #else
+     const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->getCString();