From patchwork Tue Nov 19 07:31:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 70564 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 10A4F27BBE9; Tue, 19 Nov 2024 07:33:23 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7D0BF27BBE2 for ; Tue, 19 Nov 2024 07:33:21 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tDIjW-0002WV-4T; Tue, 19 Nov 2024 02:33:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tDIjR-0002W0-2a for guix-patches@gnu.org; Tue, 19 Nov 2024 02:33:06 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tDIjO-00012L-Nu for guix-patches@gnu.org; Tue, 19 Nov 2024 02:33:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=HlOj7/A8x/cbDnyyngtc4Bi2m/zSU5KdsueoNZ341ec=; b=A9/OVoUfWjF4ERPpbuhCnPxT2PVee0ThVsaBEEdGkfWltNpLcUDvkD1nCmxCINXhYvapkZE4mvNngyse3FdNgIxQg94RI0OzYHfGg9MlnvXPIDBY6XQZ8yDPqa24ShgPoTW5bTY5aNDKED+5qs+irC4VNl/B4W75pgrhy3FG0zXDtifpnAn/gLGnvCUVdlYl2nGnFiqf3BtL+jl2eZ058TBoTeUI5rRRMiAPN2KfedTWOaODLrEZCTrNZ7SxiWNrYKWlQ1ZWQIsHl8jv5OVnO4Mrp0slxo1Ks/Punc+N7R5z81a4zD312oKQvxdFLK2JQg0rhj0WOYsGONa7JZUs5g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tDIjO-0006u0-It for guix-patches@gnu.org; Tue, 19 Nov 2024 02:33:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#73439] [PATCH v5] gnu: libreoffice: Update to 24.8.3.2. References: <20240923122128.14126-1-ngraves@ngraves.fr> In-Reply-To: <20240923122128.14126-1-ngraves@ngraves.fr> Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Nov 2024 07:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73439 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73439@debbugs.gnu.org Cc: ludo@gnu.org, Nicolas Graves Received: via spool by 73439-submit@debbugs.gnu.org id=B73439.173200152826470 (code B ref 73439); Tue, 19 Nov 2024 07:33:02 +0000 Received: (at 73439) by debbugs.gnu.org; 19 Nov 2024 07:32:08 +0000 Received: from localhost ([127.0.0.1]:40773 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIiV-0006ss-U9 for submit@debbugs.gnu.org; Tue, 19 Nov 2024 02:32:08 -0500 Received: from 18.mo550.mail-out.ovh.net ([46.105.35.72]:36551) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIiT-0006sh-1b for 73439@debbugs.gnu.org; Tue, 19 Nov 2024 02:32:06 -0500 Received: from director10.ghost.mail-out.ovh.net (unknown [10.108.17.203]) by mo550.mail-out.ovh.net (Postfix) with ESMTP id 4Xsx5b4lKnz1Rhs for <73439@debbugs.gnu.org>; Tue, 19 Nov 2024 07:32:03 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-86hhx (unknown [10.111.174.174]) by director10.ghost.mail-out.ovh.net (Postfix) with ESMTPS id BADB71FE03; Tue, 19 Nov 2024 07:32:02 +0000 (UTC) Received: from ngraves.fr ([37.59.142.99]) by ghost-submission-5b5ff79f4f-86hhx with ESMTPSA id tLr+DPI+PGcMngYAJ47TVA (envelope-from ); Tue, 19 Nov 2024 07:32:02 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-99G0031a59ca95-354b-468a-b3b8-287fe3720f45, 9D5F92B39B1411DA07333534545EDFC8D0A6424A) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Tue, 19 Nov 2024 08:31:53 +0100 Message-ID: <20241119073200.13650-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 X-Ovh-Tracer-Id: 4535969250970755810 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefuddrfedugddutdekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffogggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeffieelveegfefhtdfhtdeijeefgeelvdduvdeugfegkedvgfdtkedufedtkeejteenucffohhmrghinhepughotghumhgvnhhtfhhouhhnuggrthhiohhnrdhorhhgpdhsvghnugguohgtrdhshhdpghhnuhdrohhrghdplhhisghrvghofhhfihgtvgdrohhrghenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggedpfeejrdehledrudegvddrleelnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeejfeegfeelseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehhedtmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=HlOj7/A8x/cbDnyyngtc4Bi2m/zSU5KdsueoNZ341ec=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1732001523; v=1; b=GdPQAlULntkwqh6Xccl98Nv7LTwnCn+G9BAa2VCu38O8xa/Q2XSDESV3zSm4lpNqZ5g1In3U S0tvxRfhEOdH/savnAtZ5uRFg1wuSA4cGIGb3uFixXqDnoyksu95aFdJMVH2HHYR5iUEeoaUiCi ae/udDPqkokQi8A+LczQrvkmjsGZNcszwtIFca3I/nz5Mp10xGnocuz1MgMURCRYPv2gkQr+GiN yIjHWHDcj0RPGpbH9W3E2Y9a64VVdRaX0WQxDqj+oUVhXq0sVTH+lT+RO8m98RVyaBtPIyv8HUJ b1+xLfGcq4Cv7VXXpYuUua2692cCBgepNjhCAPKBx4orQ== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/libreoffice.scm (libreoffice): Update to 24.8.3.2. [source]: Add secondary uri. [arguments]<#:phases>: Fix build issue related to issue 43579 in phase 'prepare-src. [configure-flags]: Add optimising flags --disable-cve-tests, --enable-readonly-installset, --disable-dependency-tracking. [native-inputs]: Add gcc-toolchain-12. [inputs]: Add argon2, zxcvbn-c. Change-Id: I72e0ebb4d075c47ea168b181f969a97f9249150a --- gnu/packages/libreoffice.scm | 57 ++++++++++++++++++++++++++++++------ 1 file changed, 48 insertions(+), 9 deletions(-) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index ed8dfd432b..22112ccee7 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2018, 2020 Jonathan Brielmaier ;;; Copyright © 2019 Chris Marusich ;;; Copyright © 2020 Marcin Karpezo -;;; Copyright © 2023 Nicolas Graves +;;; Copyright © 2023, 2024 Nicolas Graves ;;; Copyright © 2023 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. @@ -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.8.3.2") ;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 "1sa7bxxh7v26p77vj1mspynhn2l2b1vnz1mpyczhnmcxcan9nw2x")))) (build-system glib-or-gtk-build-system) (arguments (list @@ -908,6 +914,8 @@ (define-public libreoffice ,@%glib-or-gtk-build-system-modules) #:modules `(((guix build python-build-system) #:select (python-version)) (ice-9 textual-ports) + (srfi srfi-1) + (srfi srfi-26) ,@%glib-or-gtk-build-system-modules) #:tests? #f ; Building the tests already fails. #:phases @@ -961,7 +969,29 @@ (define-public libreoffice "shell/source/unix/misc/senddoc.sh") (("/usr/bin/xdg-open") (search-input-file inputs "/bin/xdg-open"))) - (setenv "CPPFLAGS" "-std=c++17"))) + + ;; https://issues.guix.gnu.org/43579 + (substitute* '("sal/rtl/math.cxx" + "sc/source/core/tool/math.cxx") + (("std::(fe[gs]etround|feclearexcept|fetestexcept)" all suffix) + suffix)) + (let ((gcc-11-dir (dirname + (dirname + (dirname + (search-input-directory + inputs "share/doc/gcc-11.4.0")))))) + (setenv + "CPLUS_INCLUDE_PATH" + (string-join + (remove + (cut member <> + (list + (string-append gcc-11-dir "/include/c++") + (string-append gcc-11-dir "/include"))) + (string-split (getenv "CPLUS_INCLUDE_PATH") #\:)) + ":"))) + + (setenv "CPPFLAGS" "-std=c++20"))) (add-after 'install 'reset-zip-timestamps (lambda _ (for-each (lambda (file) @@ -1077,18 +1107,26 @@ (define (install-python-script name) "--enable-lto" ;; Avoid errors rebuilding the Gtk icon cache, at least on i686-linux. "--without-galleries" - "--enable-build-opensymbol"))) + "--enable-build-opensymbol" + ;; Avoid CVE tests. + "--disable-cve-tests" + ;; Do not try to write to the store. + "--enable-readonly-installset" + ;; XXX: This flag should speed-up builds. + "--disable-dependency-tracking"))) (native-inputs (list bison cppunit flex frozen ;header-only library + gcc-12 pkg-config python-wrapper which ziptime)) (inputs - (list bluez + (list argon2 + bluez boost box2d clucene @@ -1168,6 +1206,7 @@ (define (install-python-script name) xdg-utils xmlsec-nss zip + zxcvbn-c zxing-cpp)) (home-page "https://www.libreoffice.org/") (synopsis "Office suite")