From patchwork Thu Sep 26 07:50:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 31489 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 3ADB827BBEA; Thu, 26 Sep 2024 08:56:59 +0100 (BST) 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_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham 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 5067027BBE9 for ; Thu, 26 Sep 2024 08:56:58 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1stjM6-0007eM-Ez; Thu, 26 Sep 2024 03:56:06 -0400 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 1stjLc-0005gk-PK for guix-patches@gnu.org; Thu, 26 Sep 2024 03:55:49 -0400 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 1stjLc-0007WN-D7 for guix-patches@gnu.org; Thu, 26 Sep 2024 03:55:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=KQ4bFZWI8ve+62kiZe5qLFfbKld63nUCNAkEYdTSaFs=; b=s2JH8raJQOBw9x2BmkQYyDTBXmYNtSWS4jOfznarVNK/Xv8kDMhbKao3h4uFL2EZw0umHdovLB076yC9LmXNKP4z/ygdwjmMEEXT2Ud2fLZ2XWc8Addkl6uH26Hr6xAciR4CbjY1iMxLL2yNqbb8eTRfpuvITvfCYt3NemrXh+urrvJGoJcHyMuBLI0o2WXKcUCdAA6pjyIzSBSYhpk8co7famF5bJrrHZz1mlQfvAV6XjeWM/Uneu5RAP5ltq/zYFN91mdrnYKkK5B82YDdx9VPK0wxAFr6SqzU/fetdr1TW9NRpuFdZj21R8FcNPe1mGCWyEfTjQh0If6PMhHqCQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1stjM3-0003Ch-6g for guix-patches@gnu.org; Thu, 26 Sep 2024 03:56:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73439] [PATCH v3 2/4] gnu: libreoffice: Update to 24.2.0.3. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 26 Sep 2024 07:56:03 +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: Nicolas Graves Received: via spool by 73439-submit@debbugs.gnu.org id=B73439.172733732711692 (code B ref 73439); Thu, 26 Sep 2024 07:56:03 +0000 Received: (at 73439) by debbugs.gnu.org; 26 Sep 2024 07:55:27 +0000 Received: from localhost ([127.0.0.1]:51784 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1stjLS-00032Q-Cr for submit@debbugs.gnu.org; Thu, 26 Sep 2024 03:55:26 -0400 Received: from 18.mo581.mail-out.ovh.net ([188.165.56.163]:53265) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1stjHk-0002pR-99 for 73439@debbugs.gnu.org; Thu, 26 Sep 2024 03:51:37 -0400 Received: from director9.ghost.mail-out.ovh.net (unknown [10.109.148.20]) by mo581.mail-out.ovh.net (Postfix) with ESMTP id 4XDm4W06BLz1M6Q for <73439@debbugs.gnu.org>; Thu, 26 Sep 2024 07:51:06 +0000 (UTC) Received: from ghost-submission-55b549bf7b-wvdh8 (unknown [10.110.96.193]) by director9.ghost.mail-out.ovh.net (Postfix) with ESMTPS id AB70F1FE5B; Thu, 26 Sep 2024 07:51:05 +0000 (UTC) Received: from ngraves.fr ([37.59.142.109]) by ghost-submission-55b549bf7b-wvdh8 with ESMTPSA id 0R2BGGkS9WYEDwAAxxOEKA (envelope-from ); Thu, 26 Sep 2024 07:51:05 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-109S003b5194590-525d-4938-b443-1b59c4009cd7, F3497EA57BFAF455E9B2B7BFF8E68EC8FD7A9CC5) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 80.215.102.97 Date: Thu, 26 Sep 2024 09:50:53 +0200 Message-ID: <20240926075102.24531-2-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240926075102.24531-1-ngraves@ngraves.fr> References: <20240926075102.24531-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 1326873041556988642 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvddtiedguddviecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeekteeltdfhudeivdeileeutdevtdejgfefjeehffffuedvkefffedvtedvgfejjeenucffohhmrghinhepughotghumhgvnhhtfhhouhhnuggrthhiohhnrdhorhhgpdhsvghnugguohgtrdhshhdplhhisghrvghofhhfihgtvgdrohhrghenucfkphepuddvjedrtddrtddruddpkedtrddvudehrddutddvrdeljedpfeejrdehledrudegvddruddtleenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjeefgeefleesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekuddpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=KQ4bFZWI8ve+62kiZe5qLFfbKld63nUCNAkEYdTSaFs=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1727337067; v=1; b=CGibGzeoRPOkl0aQAeNXTE0XJS5oOQZVS9uC8UYovYidreFzOU/3LjBaeH4xvX5nKbgcyL59 1YKtee0lt26FAKhp2hZCDYUZV5W021NmYNhyAyeOlPf4x4X/gk4CSP/0K1bIrqxT+Ew1t4Jmdns xiMW/F9OrBvNPtvY3Aa4R4aYGEA7Us/0ZZNL21vKiQrEHGQzI/DiOxAK5aFvxtWrOvfFbN3AGgo 2Y7jhPuo+OeOxwI4S93rJXLa6igc/ubJZ6ygEJmn3EmHLkYzTSl1LLKZ1b5TqTAirdm0uBB3s5k dF5tSE8830cVlsKTrT4Od+vomPpYzHXCBCE0L9heYXd6g== 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.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")