unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Nicolas Graves via Guix-patches via <guix-patches@gnu.org>
To: 73439@debbugs.gnu.org
Cc: Nicolas Graves <ngraves@ngraves.fr>
Subject: [bug#73439] [PATCH v3 2/4] gnu: libreoffice: Update to 24.2.0.3.
Date: Thu, 26 Sep 2024 09:50:53 +0200	[thread overview]
Message-ID: <20240926075102.24531-2-ngraves@ngraves.fr> (raw)
In-Reply-To: <20240926075102.24531-1-ngraves@ngraves.fr>

* gnu/packages/libreoffice.scm (libreoffice): Update to 24.2.0.3.

Change-Id: I72e0ebb4d075c47ea168b181f969a97f9249150a
---
 gnu/packages/libreoffice.scm | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index ed8dfd432b..70167d11ea 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -63,6 +63,7 @@ (define-module (gnu packages libreoffice)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages game-development)
+  #:use-module (gnu packages gcc)
   #:use-module (gnu packages ghostscript)
   #:use-module (gnu packages gl)
   #:use-module (gnu packages glib)
@@ -80,6 +81,7 @@ (define-module (gnu packages libreoffice)
   #:use-module (gnu packages maths)
   #:use-module (gnu packages nss)
   #:use-module (gnu packages openldap)
+  #:use-module (gnu packages password-utils)
   #:use-module (gnu packages pdf)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages perl-compression)
@@ -891,16 +893,20 @@ (define dtoa
 (define-public libreoffice
   (package
     (name "libreoffice")
-    (version "7.6.7.2")               ;keep in sync with hunspell dictionaries
+    (version "24.2.0.3")               ;keep in sync with hunspell dictionaries
     (source
      (origin
        (method url-fetch)
        (uri
-        (string-append
-         "https://download.documentfoundation.org/libreoffice/src/"
-         (version-prefix version 3) "/libreoffice-" version ".tar.xz"))
+        (list
+         (string-append
+          "https://download.documentfoundation.org/libreoffice/src/"
+          (version-prefix version 3) "/libreoffice-" version ".tar.xz")
+         (string-append
+          "https://downloadarchive.documentfoundation.org/libreoffice/old/"
+          version "/src/libreoffice-" version ".tar.xz")))
        (sha256
-        (base32 "159vbv4zhibfd4xjdamcqs4h0p3h5y79kcjwrmshvjhs23p55l3m"))))
+        (base32 "0s1m92rmizicd8jgxcjz0xsd79v148wkq0ac9yzz61x2ga8mdx0q"))))
     (build-system glib-or-gtk-build-system)
     (arguments
      (list
@@ -961,6 +967,13 @@ (define-public libreoffice
                              "shell/source/unix/misc/senddoc.sh")
                 (("/usr/bin/xdg-open")
                  (search-input-file inputs "/bin/xdg-open")))
+
+              ;; Probably necessary because we use a custom GCC(>=12)/GLIBC.
+              (substitute* '("sal/rtl/math.cxx"
+                             "sc/source/core/tool/math.cxx")
+                (("std::(fe[gs]etround|feclearexcept|fetestexcept)" all suffix)
+                 suffix))
+
               (setenv "CPPFLAGS" "-std=c++17")))
           (add-after 'install 'reset-zip-timestamps
             (lambda _
@@ -1083,12 +1096,14 @@ (define (install-python-script name)
            cppunit
            flex
            frozen                       ;header-only library
+           gcc-12
            pkg-config
            python-wrapper
            which
            ziptime))
     (inputs
-     (list bluez
+     (list argon2
+           bluez
            boost
            box2d
            clucene
@@ -1100,6 +1115,7 @@ (define (install-python-script name)
            fontforge
            gconf
            glew
+           glibc
            glm
            gnupg
            gobject-introspection
@@ -1168,6 +1184,7 @@ (define (install-python-script name)
            xdg-utils
            xmlsec-nss
            zip
+           zxcvbn-c
            zxing-cpp))
     (home-page "https://www.libreoffice.org/")
     (synopsis "Office suite")
-- 
2.46.0





  reply	other threads:[~2024-09-26  7:56 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-23 12:15 [bug#73439] [PATCH 00/10] Update libreoffice to its latest version Nicolas Graves via Guix-patches via
2024-09-23 12:37 ` [bug#73439] [PATCH 01/10] import: Add %libreoffice-updater Nicolas Graves via Guix-patches via
2024-09-23 12:37   ` [bug#73439] [PATCH 02/10] gnu: libreoffice: Update to 24.2.0.3 Nicolas Graves via Guix-patches via
2024-09-23 12:37   ` [bug#73439] [PATCH 03/10] gnu: libreoffice: Update to 24.2.1.2 Nicolas Graves via Guix-patches via
2024-09-23 12:37   ` [bug#73439] [PATCH 04/10] gnu: libreoffice: Update to 24.2.2.2 Nicolas Graves via Guix-patches via
2024-09-23 12:37   ` [bug#73439] [PATCH 05/10] gnu: libreoffice: Update to 24.2.3.2 Nicolas Graves via Guix-patches via
2024-09-23 12:37   ` [bug#73439] [PATCH 06/10] gnu: libreoffice: Update to 24.2.4.2 Nicolas Graves via Guix-patches via
2024-09-23 12:37   ` [bug#73439] [PATCH 07/10] gnu: libreoffice: Update to 24.2.5.2 Nicolas Graves via Guix-patches via
2024-09-23 12:37   ` [bug#73439] [PATCH 08/10] gnu: libreoffice: Update to 24.2.6.2 Nicolas Graves via Guix-patches via
2024-09-23 12:37   ` [bug#73439] [PATCH 09/10] gnu: libreoffice: Update to 24.8.1.2 Nicolas Graves via Guix-patches via
2024-09-23 12:37   ` [bug#73439] [PATCH 10/10] gnu: hunspell-dictionaries: " Nicolas Graves via Guix-patches via
2024-09-23 18:35 ` [bug#73439] [PATCH 00/10] Update libreoffice to its latest version Liliana Marie Prikler
2024-09-24 14:29   ` Nicolas Graves via Guix-patches via
2024-09-24 17:03     ` Liliana Marie Prikler
2024-09-25  7:52       ` Nicolas Graves via Guix-patches via
2024-09-25 15:43         ` Liliana Marie Prikler
2024-09-25  7:40 ` [bug#73439] [PATCH v2 1/5] import: Add %libreoffice-updater Nicolas Graves via Guix-patches via
2024-09-25  7:40   ` [bug#73439] [PATCH v2 2/5] gnu: libreoffice: Update to 24.2.0.3 Nicolas Graves via Guix-patches via
2024-09-25  7:40   ` [bug#73439] [PATCH v2 3/5] gnu: libreoffice: Update to 24.8.1.2 Nicolas Graves via Guix-patches via
2024-09-25  7:40   ` [bug#73439] [PATCH v2 4/5] gnu: hunspell-dictionaries: " Nicolas Graves via Guix-patches via
2024-09-25  7:40   ` [bug#73439] [PATCH v2 5/5] gnu: Add libreoffice-lts Nicolas Graves via Guix-patches via
2024-09-26  7:50 ` [bug#73439] [PATCH v3 1/4] import: Add %libreoffice-updater Nicolas Graves via Guix-patches via
2024-09-26  7:50   ` Nicolas Graves via Guix-patches via [this message]
2024-09-26  7:50   ` [bug#73439] [PATCH v3 3/4] gnu: libreoffice: Update to 24.2.6.2 Nicolas Graves via Guix-patches via
2024-09-26  7:50   ` [bug#73439] [PATCH v3 4/4] gnu: hunspell-dictionary: " Nicolas Graves via Guix-patches via

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240926075102.24531-2-ngraves@ngraves.fr \
    --to=guix-patches@gnu.org \
    --cc=73439@debbugs.gnu.org \
    --cc=ngraves@ngraves.fr \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).