diff options
author | Marius Bakke <mbakke@fastmail.com> | 2019-11-15 20:11:35 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-11-15 20:11:35 +0100 |
commit | f056553c6b8ffa36f4ce9fb1c3602a8f4b1de242 (patch) | |
tree | 80c815216a3717cf00b615c9cb8840c113eaf79f /gnu/packages/libreoffice.scm | |
parent | 2c9d34166983565120f831284df57a07e2edd2f9 (diff) | |
parent | 528b52390d216d8a8cd13dfcd1e6e40a6448e6c2 (diff) | |
download | guix-f056553c6b8ffa36f4ce9fb1c3602a8f4b1de242.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/libreoffice.scm')
-rw-r--r-- | gnu/packages/libreoffice.scm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 6d83d633f9..4476e5a4ad 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.2.8.2") + (version "6.3.3.2") (source (origin (method url-fetch) @@ -939,7 +939,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") (version-prefix version 3) "/libreoffice-" version ".tar.xz")) (sha256 (base32 - "1npxyj0hklls3jnaxx9kj3r6bgydgrbz6nacy05n0zhq8i6zb5ir")) + "1kz5950vhjc33rx7pyl5sw9lxxm90hxrj7v8y86jy34skjrfa3nl")) (patches (search-patches "libreoffice-icu.patch" "libreoffice-glm.patch")) (modules '((guix build utils))) @@ -969,6 +969,8 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") ("gconf" ,gconf) ("glew" ,glew) ("glm" ,glm) + ("gnupg" ,gnupg) + ("gobject-introspection" ,gobject-introspection) ("gperf" ,gperf) ("gpgme" ,gpgme) ("graphite2" ,graphite2) @@ -1112,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 |