diff options
Diffstat (limited to 'gnu/packages/libreoffice.scm')
| -rw-r--r-- | gnu/packages/libreoffice.scm | 52 |
1 files changed, 10 insertions, 42 deletions
diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index f8b1433aa3..96a0b8a573 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -929,7 +929,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") (define-public libreoffice (package (name "libreoffice") - (version "6.1.5.2") + (version "6.3.3.2") (source (origin (method url-fetch) @@ -939,36 +939,9 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") (version-prefix version 3) "/libreoffice-" version ".tar.xz")) (sha256 (base32 - "1wh8qhqkmb89nmfcb0w6iwpdzxwqr7c5kzxgpk4gy60xin6gwjgb")) - (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-boost.patch" - "libreoffice-icu.patch" - "libreoffice-glm.patch"))) + "1kz5950vhjc33rx7pyl5sw9lxxm90hxrj7v8y86jy34skjrfa3nl")) + (patches (search-patches "libreoffice-icu.patch" + "libreoffice-glm.patch")) (modules '((guix build utils))) (snippet '(begin @@ -992,9 +965,12 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") ("cups" ,cups) ("dbus-glib" ,dbus-glib) ("fontconfig" ,fontconfig) + ("fontforge" ,fontforge) ("gconf" ,gconf) ("glew" ,glew) ("glm" ,glm) + ("gnupg" ,gnupg) + ("gobject-introspection" ,gobject-introspection) ("gperf" ,gperf) ("gpgme" ,gpgme) ("graphite2" ,graphite2) @@ -1031,6 +1007,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") ("libxt" ,libxt) ("libzmf" ,libzmf) ("lpsolve" ,lpsolve) + ("mariadb" ,mariadb) ("mdds" ,mdds) ("mythes" ,mythes) ("neon" ,neon) @@ -1066,13 +1043,6 @@ 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. @@ -1144,7 +1114,6 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") #:configure-flags (list "--enable-release-build" - "--enable-verbose" ;; Avoid using all cpu cores by default (format #f "--with-parallelism=~d" (parallel-job-count)) "--disable-fetch-external" ; disable downloads @@ -1161,16 +1130,15 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") ;; With java, the build fails since sac.jar is missing. "--without-java" ;; FIXME: Enable once the corresponding inputs are packaged. - "--without-system-npapi-headers" "--disable-coinmp" "--disable-firebird-sdbc" ; embedded firebird - "--disable-gltf" ;; XXX: PDFium support requires fetching an external tarball and ;; patching the build scripts to work with GCC5. Try enabling this ;; when our default compiler is >=GCC 6. "--disable-pdfium" "--disable-gtk" ; disable use of GTK+ 2 - "--without-doxygen"))) + "--without-doxygen" + "--enable-build-opensymbol"))) (home-page "https://www.libreoffice.org/") (synopsis "Office suite") (description "LibreOffice is a comprehensive office suite. It contains |