nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Marius Bakke 2018-11-23 22:00:42 +01:00
parent 06dd29ef4f
commit b01e89593d
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
gnu/packages/libreoffice.scm
View File

@ -959,8 +959,34 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.")
(sha256 (sha256
(base32 (base32
"0i4gf3qi16fg7dxq2l4vhkwh4f5lx7xd1ilpzcw26vccqkv3hvyl")) "0i4gf3qi16fg7dxq2l4vhkwh4f5lx7xd1ilpzcw26vccqkv3hvyl"))
(patches (search-patches "libreoffice-icu.patch" (patches
"libreoffice-glm.patch")))) (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) (build-system glib-or-gtk-build-system)
(native-inputs (native-inputs
`(("bison" ,bison) `(("bison" ,bison)
@ -1049,6 +1075,13 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.")
"solenv/gbuild/platform/unxgcc.mk") "solenv/gbuild/platform/unxgcc.mk")
(("/bin/sh") (which "sh"))) (("/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 ;; GPGME++ headers are installed in a gpgme++ subdirectory, but
;; files in "xmlsecurity/source/gpg/" and elsewhere expect to ;; files in "xmlsecurity/source/gpg/" and elsewhere expect to
;; find them on the include path without a prefix. ;; find them on the include path without a prefix.