From 02817df07e965c3413e6986966b3e607de47709c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 27 Sep 2018 20:38:18 +0200 Subject: gnu: libreoffice: Update to 6.1.2.1. * gnu/packages/libreoffice.scm (libreoffice): Update to 6.1.2.1. --- gnu/packages/libreoffice.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/libreoffice.scm') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 35d49b0216..68b4e265f3 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -926,7 +926,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") (define-public libreoffice (package (name "libreoffice") - (version "6.1.0.3") + (version "6.1.2.1") (source (origin (method url-fetch) @@ -936,7 +936,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") (version-prefix version 3) "/libreoffice-" version ".tar.xz")) (sha256 (base32 - "1n7b6abc0bp9x8lddx60w5br444wf62mdlkqmfk2zmkmiwkcvv2l")) + "149ziasibplihfxlzafzcm4737ns30hg9175967b43c81yv5f335")) (patches (search-patches "libreoffice-icu.patch" "libreoffice-glm.patch")))) (build-system gnu-build-system) -- cgit v1.2.3 From 994bccd9443032141accede0e403cbfb62f6c63e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 28 Sep 2018 23:30:55 -0400 Subject: gnu: LibreOffice: Fix "File > Open" crash on foreign distros. Fixes . * gnu/packages/libreoffice.scm (libreoffice)[build-system]: Use glib-or-gtk-build-system. [arguments]: Set '#:out-of-source #f'. --- gnu/packages/libreoffice.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu/packages/libreoffice.scm') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 68b4e265f3..881cf2008d 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -28,6 +28,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages libreoffice) + #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (guix download) @@ -939,7 +940,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") "149ziasibplihfxlzafzcm4737ns30hg9175967b43c81yv5f335")) (patches (search-patches "libreoffice-icu.patch" "libreoffice-glm.patch")))) - (build-system gnu-build-system) + (build-system glib-or-gtk-build-system) (native-inputs `(("bison" ,bison) ("cppunit" ,cppunit-1.14) @@ -1017,6 +1018,9 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") (arguments `(#:tests? #f ; Building the tests already fails. #:make-flags '("build-nocheck") ; Do not build unit tests, which fails. + ;; XXX Remove this if glib-or-gtk-build-system changes to in-source-tree + ;; builds by default. + #:out-of-source? #f #:phases (modify-phases %standard-phases (add-before 'configure 'prepare-src -- cgit v1.2.3