diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-10-05 19:15:39 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-10-05 19:15:39 +0200 |
| commit | cf6db76d2af2f287f12928df160447ab4165b3e5 (patch) | |
| tree | 49a1309c0e04c00090ab106f7ae3495a6da328c1 /gnu/packages/libreoffice.scm | |
| parent | e65b2181e8b436278e3dd0b405602a400fbd0a75 (diff) | |
| parent | a6798218bea0d6b2df598042d1ced29f74bb4250 (diff) | |
| download | patches-cf6db76d2af2f287f12928df160447ab4165b3e5.tar patches-cf6db76d2af2f287f12928df160447ab4165b3e5.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/libreoffice.scm')
| -rw-r--r-- | gnu/packages/libreoffice.scm | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 18edfcd35a..5c4b928163 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -28,6 +28,7 @@ ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. (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) @@ -935,7 +936,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) @@ -945,10 +946,10 @@ 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) + (build-system glib-or-gtk-build-system) (native-inputs `(("bison" ,bison) ("cppunit" ,cppunit-1.14) @@ -1026,6 +1027,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 |