diff options
author | Christopher Baines <mail@cbaines.net> | 2024-04-20 11:47:50 +0100 |
---|---|---|
committer | Christopher Baines <mail@cbaines.net> | 2024-04-20 11:47:50 +0100 |
commit | da77ea23daa0bfa4a73290dff99b22d6825ff80b (patch) | |
tree | 748d24e62b93c8ab8f999d6415d9f65c3d317da2 /gnu/packages/libreoffice.scm | |
parent | 4eeb6922449285f9bce615f6e4ffe4375fa0233f (diff) | |
parent | 949f97f7f98ac74306b9de79c93790337d804e32 (diff) | |
download | guix-da77ea23daa0bfa4a73290dff99b22d6825ff80b.tar guix-da77ea23daa0bfa4a73290dff99b22d6825ff80b.tar.gz |
Merge commit '949f97f7f9' into core-update-new-2chris-core-updates-no-duplicates-attempt
Change-Id: Ibbd851541da42cc052ba58195fee033daadd57e5
Conflicts:
gnu/local.mk
gnu/packages/bioinformatics.scm
gnu/packages/dictionaries.scm
gnu/packages/display-managers.scm
gnu/packages/engineering.scm
gnu/packages/geo.scm
gnu/packages/gl.scm
gnu/packages/glib.scm
gnu/packages/gnome-xyz.scm
gnu/packages/gnome.scm
gnu/packages/gtk.scm
gnu/packages/image-processing.scm
gnu/packages/linux.scm
gnu/packages/llvm.scm
gnu/packages/mail.scm
gnu/packages/patches/eudev-rules-directory.patch
gnu/packages/plotutils.scm
gnu/packages/sdl.scm
gnu/packages/syndication.scm
Diffstat (limited to 'gnu/packages/libreoffice.scm')
-rw-r--r-- | gnu/packages/libreoffice.scm | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 79b30cecaf..925a4f1001 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 John Darrington <jmd@gnu.org> ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr> -;;; Copyright © 2016, 2018-2021, 2023 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016, 2018-2021, 2023, 2024 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr> @@ -118,7 +118,7 @@ their dependencies automatically upon calculation.") (define-public orcus (package (name "orcus") - (version "0.19.0") + (version "0.19.2") (source (origin ;; The test suite requires data files store with Git Large ;; File Storage. @@ -129,7 +129,7 @@ their dependencies automatically upon calculation.") (file-name (git-file-name name version)) (sha256 (base32 - "02prj6kgph56fkr89k8wlqarrmx65cq92863i4rrny5sqr8c2llr")))) + "03q72z91azq35l8jfvjizd6yghjrgrss221iwh5zjwvxgzcbkl7v")))) (build-system gnu-build-system) (arguments (list #:configure-flags #~(list "--disable-static"))) (native-inputs (list autoconf automake libtool pkg-config)) @@ -354,7 +354,7 @@ working with graphics in the WPG (WordPerfect Graphics) format.") (name "libcmis") ;; Note: Use an unreleased version because libreoffice requires it and ;; is the only user (see <https://github.com/tdf/libcmis/pull/43>). - (version "0.6.0") + (version "0.6.2") (home-page "https://github.com/tdf/libcmis") (source (origin @@ -364,7 +364,7 @@ working with graphics in the WPG (WordPerfect Graphics) format.") (file-name (git-file-name name version)) (sha256 (base32 - "17jx9fb7nmyp6jhz9nlmb3wcp8k03vhcv7sqql6a7jhsjnw3hq0k")))) + "0g0wr31gfhxcdfvr0l36zallz349rrxd2d8n03b0b5ffm10b4y0x")))) (build-system gnu-build-system) (native-inputs (list autoconf automake libtool cppunit pkg-config)) @@ -380,13 +380,7 @@ working with graphics in the WPG (WordPerfect Graphics) format.") ;; it once this is available. "--without-man" ;; XXX: A configure test fails with GCC7 when including Boost headers. - "--disable-werror" - ;; During configure, the boost headers are found, but linking - ;; fails without the following flag. - (string-append "--with-boost=" - (dirname (dirname - (search-input-directory %build-inputs - "include/boost"))))) + "--disable-werror") #:phases #~(modify-phases %standard-phases (replace 'bootstrap |