Re: Fixing LibreOffice on ‘core-updates’

[Marius Bakke <mbakke@fastmail.com>]

[-- Attachment #1.1: Type: text/plain, Size: 1252 bytes --]

ludo@gnu.org (Ludovic Courtès) writes:

> Hello Guix,
>
> As briefly discussed with Marius on IRC, we both tried to fix
> LibreOffice on ‘core-updates’.  The initial problem is that some of the
> libraries it depends on fail to build with the new Boost.
>
> I started upgrading the whole shebang but eventually got stuck with
> LibreOffice itself, which fails to build like this:
>
> --8<---------------cut here---------------start------------->8---
> [build PAG] writer
> [build MOD] embedserv
> [build CUS] extras/glade
> [build XSL] Classy_Red/styles.xml
> make[1]: *** No rule to make target '/tmp/guix-build-libreoffice-6.2.0.0.alpha1.drv-0/libreoffice-6.2.0.0.alpha1/external/tarballs/49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf', needed by '/tmp/guix-build-libreoffice-6.2.0.0.alpha1.drv-0/libreoffice-6.2.0.0.alpha1/workdir/CustomTarget/extras/fonts/opens___.ttf'.  Stop.
> make[1]: *** Waiting for unfinished jobs....
> make: *** [Makefile:286: build] Error 2
> --8<---------------cut here---------------end--------------->8---
>
> Below is what I have so far.  Help welcome!

I am currently building libreoffice with this patch (along with the
package updates you mentioned):


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-gnu-libreoffice-Fix-build-with-MDDS-1.4-and-Orcus-0..patch --]
[-- Type: text/x-patch, Size: 3735 bytes --]

From a89c47bf5ea6850d15735d262a2497f7df20896e Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Fri, 23 Nov 2018 22:00:42 +0100
Subject: [PATCH] gnu: libreoffice: Fix build with MDDS 1.4 and Orcus 0.14.

* gnu/packages/libreoffice.scm (libreoffice)[source](patches): Add two patches
from Arch Linux.
[arguments]: Add substitutions so the libraries are found.
---
 gnu/packages/libreoffice.scm | 37 ++++++++++++++++++++++++++++++++++--
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index cf2e0b0e0..1968f57a7 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -959,8 +959,34 @@ converting QuarkXPress file format.  It supports versions 3.1 to 4.1.")
        (sha256
         (base32
          "0i4gf3qi16fg7dxq2l4vhkwh4f5lx7xd1ilpzcw26vccqkv3hvyl"))
-       (patches (search-patches "libreoffice-icu.patch"
-                                "libreoffice-glm.patch"))))
+       (patches
+        (append (list (origin
+                        ;; Support newer versions of Orcus and MDDS.  These patches
+                        ;; are taken from upstream, but we use the patches from Arch
+                        ;; because they are adapted for the release tarball.
+                        ;; Note: remove the related substitutions below when these
+                        ;; are no longer needed.
+                        (method url-fetch)
+                        (uri (string-append "https://git.archlinux.org/svntogit"
+                                            "/packages.git/plain/trunk/"
+                                            "0001-Update-orcus-to-0.14.0.patch?&id="
+                                            "4002fa927f2a143bd2ec008a0c400b2ce9f2c8a7"))
+                        (file-name "libreoffice-orcus.patch")
+                        (sha256
+                         (base32
+                          "0v1knblrmfzkb4g9pm5mdnrmjib59bznvca1ygbwlap2ln1h4mk0")))
+                      (origin
+                        (method url-fetch)
+                        (uri (string-append "https://git.archlinux.org/svntogit"
+                                            "/packages.git/plain/trunk/"
+                                            "0001-Update-mdds-to-1.4.1.patch?&id="
+                                            "4002fa927f2a143bd2ec008a0c400b2ce9f2c8a7"))
+                        (file-name "libreoffice-mdds.patch")
+                        (sha256
+                         (base32
+                          "0apbmammmp4pk473xiv5vk50r4c5gjvqzf9jkficksvz58q6114f"))))
+                (search-patches "libreoffice-icu.patch"
+                                "libreoffice-glm.patch")))))
     (build-system glib-or-gtk-build-system)
     (native-inputs
      `(("bison" ,bison)
@@ -1049,6 +1075,13 @@ converting QuarkXPress file format.  It supports versions 3.1 to 4.1.")
                          "solenv/gbuild/platform/unxgcc.mk")
                  (("/bin/sh") (which "sh")))
 
+               ;; XXX: Adjust the checks for MDDS and liborcus to avoid having
+               ;; to re-bootstrap the whole thing.  Remove this with the related
+               ;; patches above.
+               (substitute* "configure"
+                 (("mdds-1.2 >= 1.2.3") "mdds-1.4 >= 1.4.1")
+                 (("liborcus-0.13 >= 0.13.3") "liborcus-0.14 >= 0.14.0"))
+
                ;; GPGME++ headers are installed in a gpgme++ subdirectory, but
                ;; files in "xmlsecurity/source/gpg/" and elsewhere expect to
                ;; find them on the include path without a prefix.
-- 
2.19.2


[-- Attachment #1.3: Type: text/plain, Size: 24 bytes --]


So far so good.  WDYT?

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]