From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id 6BMfK3hoSGf3mgAAqHPOHw:P1 (envelope-from ) for ; Thu, 28 Nov 2024 12:56:24 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id 6BMfK3hoSGf3mgAAqHPOHw (envelope-from ) for ; Thu, 28 Nov 2024 13:56:24 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=rTKsOZkQ; dkim=fail ("headers rsa verify failed") header.d=ngraves.fr header.s=ovhmo4487190-selector1 header.b=0oTU+EU2; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1732798584; a=rsa-sha256; cv=none; b=uq1U4XLB4leo6RQeDuP2Yw6Znjn1mL1rPZCsB8o1mwEsCnud2YCwlc/eY9T0DncWWIqTHq 98GzVH+MmbKXUrqyn0CkXFglC7lIO7UUZlGjLLovWKLYaPEXWqGmv49NvRyakZYsjd8Ipm j7+3cQkafDNnZjtRgg48A5SqwENWJOOo5Qe+rjlf3eOGJB9L2EvR6p1+y15FetplkLaQ89 fnjtlKjGw8LBswiyObAEXhPDUK8k2aAfI0YnwNQsbwhgcrh3poTj0IXzeABvAllihz4snR brIbbNelgma7MJUyG8ap2mknY0ib9jHa5ik4VXLIqu+5vsLNYcIAa8Njiw5JFQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=rTKsOZkQ; dkim=fail ("headers rsa verify failed") header.d=ngraves.fr header.s=ovhmo4487190-selector1 header.b=0oTU+EU2; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1732798584; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=HlOj7/A8x/cbDnyyngtc4Bi2m/zSU5KdsueoNZ341ec=; b=cfmIxdjDTd5J6iTRar54Gso3d9UrudFt/mlqqbP71wi1Uzp7Gx0x4QlwfOq2NDX7nzJkVy ygWpLQCX3Uq+k1t4BjuuvGrMUDhouNW9eEvkhbYmF1LwdX9SlpeYQpeKXZHDCjK9bvO6NI tmRcGiBOlEwDNqA7MLlxtqlizlV2xnwZZmNNoTeE4JspozEDUvwFAc9+7K3kCYFGqtdgBP yv+lg11WAl1BW7T5xUgvXzLwwuWrS/WY1B4OkNtR1f/DNJEHH/umFuzSa96uVXv6dt2uVe HL88cIhV7j3LhUKBZg6eZAiOuhydmeBmUMJE7P87yZgnY4IiGn1ykdt3jDZxxg== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 45EE03C71 for ; Thu, 28 Nov 2024 13:56:24 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tGe3x-0005Q7-Ox; Thu, 28 Nov 2024 07:56:05 -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 1tGe3v-0005Hz-E6 for guix-patches@gnu.org; Thu, 28 Nov 2024 07:56:03 -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 1tGe3v-00080C-4Y for guix-patches@gnu.org; Thu, 28 Nov 2024 07:56:03 -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=rTKsOZkQvPbIncekYJDYDes9YI1fQ2c0RmWEXrKONA1JqnHvnxL8Uvj9apYVmy/MRFVSCwIK062gKRh76B7nVpNQLyWVxAfFB2D8rZvqueXqnjyj3s8P3XV1jrozXM3Sg2t6+RvxjVYmbcxunaBWX/+AH2GBHrfBQ6gnScLhg4xnK0bjXNERSUciOHuLna6D8W6eW3P8TrLyUKglOL+k1MRCI0c9X7cYZMi2s8ipcVwpQ8m8I5EflW5pTHvb5p5tYIweiEl+hy7wNS4iaUPOAHhMLSsPnZfDn9r6Mh69jBjAyNsuCDmYe5n3W2Vt9t9jO1PHs/nMo3mMl5AWQSOqFg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tGe3u-0000HQ-B7 for guix-patches@gnu.org; Thu, 28 Nov 2024 07:56:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#73439] [PATCH v6] 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: Thu, 28 Nov 2024 12:56: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.17327985481051 (code B ref 73439); Thu, 28 Nov 2024 12:56:02 +0000 Received: (at 73439) by debbugs.gnu.org; 28 Nov 2024 12:55:48 +0000 Received: from localhost ([127.0.0.1]:37807 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tGe3g-0000Gs-1J for submit@debbugs.gnu.org; Thu, 28 Nov 2024 07:55:48 -0500 Received: from 2.mo560.mail-out.ovh.net ([188.165.53.149]:33473) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tGe3c-0000Gh-VW for 73439@debbugs.gnu.org; Thu, 28 Nov 2024 07:55:47 -0500 Received: from director3.ghost.mail-out.ovh.net (unknown [10.108.9.204]) by mo560.mail-out.ovh.net (Postfix) with ESMTP id 4Xzbrt6wGrz1dfx for <73439@debbugs.gnu.org>; Thu, 28 Nov 2024 12:55:42 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-g75b7 (unknown [10.110.96.35]) by director3.ghost.mail-out.ovh.net (Postfix) with ESMTPS id A124D1FEB2; Thu, 28 Nov 2024 12:55:42 +0000 (UTC) Received: from ngraves.fr ([37.59.142.106]) by ghost-submission-5b5ff79f4f-g75b7 with ESMTPSA id ZkSrFE5oSGccygAAazytdg (envelope-from ); Thu, 28 Nov 2024 12:55:42 +0000 X-OVh-ClientIp: 90.92.117.144 Date: Thu, 28 Nov 2024 13:55:34 +0100 Message-ID: <20241128125539.3085-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 7515944829077807842 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefuddrhedugdeggecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepffeileevgeefhfdthfdtieejfeegledvuddvuefggeekvdfgtdekudeftdekjeetnecuffhomhgrihhnpeguohgtuhhmvghnthhfohhunhgurghtihhonhdrohhrghdpshgvnhguughotgdrshhhpdhgnhhurdhorhhgpdhlihgsrhgvohhffhhitggvrdhorhhgnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrddutdeinecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeejfeegfeelseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehiedtmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=HlOj7/A8x/cbDnyyngtc4Bi2m/zSU5KdsueoNZ341ec=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1732798543; v=1; b=0oTU+EU2YCVau+2t0pf2bGsIJy6WYaxUXoFewB7wR2XoXbKXO9r/1DybqJYHrFD7NSDg8ekV TtIWtl5qbCLOXM451YR/bHNTgvbEsXGH1nNBRwG38VowgSNnZVUuYA6BZ65Pu8c9yQvVpM1RJN2 onBuOE5b0n3ePUyFczA84d1tQ73LwSaD7yUpk0faO0Z6KjCsN/L/l7N6zT08frhczhWf7MxYyQS UkNGgyBx/QV9htNxc4YwGEvbtpEOT3HOYEt6CtJLez7xwo9S77BgMBiUNH+QUafVhs42ib9EgtX VxP4M6T2cLIKVCIS1ovNzmyRY9bLOcI/aan5JfrcjWoQw== 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 From: Nicolas Graves via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: 45EE03C71 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -3.60 X-Spam-Score: -3.60 X-TUID: Us96IiOvkN6S * 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") -- 2.46.0