From patchwork Tue Jun 20 01:40:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul A. Patience" X-Patchwork-Id: 51089 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 C932027BBE2; Tue, 20 Jun 2023 02:42:25 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 0FB1A27BBE9 for ; Tue, 20 Jun 2023 02:42:24 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qBQNg-0003Mu-Sp; Mon, 19 Jun 2023 21:42:04 -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 1qBQNe-0003Ml-WD for guix-patches@gnu.org; Mon, 19 Jun 2023 21:42:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qBQNe-0006E3-N8 for guix-patches@gnu.org; Mon, 19 Jun 2023 21:42:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qBQNe-0003b0-Fy for guix-patches@gnu.org; Mon, 19 Jun 2023 21:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64181] [PATCH] gnu: mmg: Update to 5.7.1. Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 20 Jun 2023 01:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 64181 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64181@debbugs.gnu.org Cc: "Paul A. Patience" X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168722527013729 (code B ref -1); Tue, 20 Jun 2023 01:42:02 +0000 Received: (at submit) by debbugs.gnu.org; 20 Jun 2023 01:41:10 +0000 Received: from localhost ([127.0.0.1]:57617 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qBQMn-0003ZN-F3 for submit@debbugs.gnu.org; Mon, 19 Jun 2023 21:41:09 -0400 Received: from lists.gnu.org ([209.51.188.17]:35866) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qBQMl-0003ZD-JN for submit@debbugs.gnu.org; Mon, 19 Jun 2023 21:41:08 -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 1qBQMl-0003JR-C9 for guix-patches@gnu.org; Mon, 19 Jun 2023 21:41:07 -0400 Received: from mail-4018.proton.ch ([185.70.40.18]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qBQMg-00060S-Vh for guix-patches@gnu.org; Mon, 19 Jun 2023 21:41:06 -0400 Date: Tue, 20 Jun 2023 01:40:51 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail; t=1687225259; x=1687484459; bh=ZQRgJIswrHu6X+EDKwNj/PGrWIoN0nielkViUjRvBDo=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=bQO2z8OJhbEeNqiYM5l9rlewBg4qzlMKfKdchi5tDzVQtRRKIkMsWUMJwlMT37CrF CG3j8fAx4nQiOQnfFXJgtrrRo6AwysLOHjpB9c+QmT7ToKH3UXn3+oWjM4C6fbjB5v VG1tiOyPqJkhso1vblkvykHqzP8T/4u0bCKzir04dJ4Hjf4plcxEMLHAtlxUzW4tyf mk5lGxDvLYjcR8L737tfUF7EI3bT2ij/rrnTDyq5ihhIKkwHZFBNAfASvsTw4ne8gW 8AS6yGl03lN/x8CxQ0k3CS4jCF3I1FcPjnkerXVJ+kCtBbxFaUA2SWm5zQQDlHgiYB 5ObWbbaYqya3Q== From: "Paul A. Patience" Message-ID: Feedback-ID: 19227857:user:proton MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.40.18; envelope-from=paul@apatience.com; helo=mail-4018.proton.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , 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/graphics.scm (mmg): Update to 5.7.1. [arguments]<#:configure-flags>: Set -DCMAKE_INSTALL_MANDIR. Add -DBUILD_DOC=ON and -DUSE_SCOTCH=ON, the defaults of which changed since the last version. Scotch is still autodetected, but explicitly enabling it causes the configuration to fail if it is not found. <#:phases>: Do not copy the manual pages, because the build now does it. --- gnu/packages/graphics.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) base-commit: d884fc9e2efecfba09af4694f5a13ad7fc6f704f prerequisite-patch-id: 52027b181c066ac91bc56fc0af511a34f3516651 diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 3a65b96919..2a7a86d9a0 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -2395,7 +2395,7 @@ (define-public discregrid (define-public mmg (package (name "mmg") - (version "5.6.0") + (version "5.7.1") (source (origin (method git-fetch) @@ -2404,7 +2404,7 @@ (define-public mmg (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "173biz5skbwg27i5w6layg7mydjzv3rmi1ywhra4rx9rjf5c0cc5")))) + (base32 "0skb7yzsw6y44zp9gb729i5xks7qd97nvn3z6jhz4jksqksx7lz0")))) (build-system cmake-build-system) (outputs '("out" "lib" "doc")) (arguments @@ -2414,11 +2414,14 @@ (define-public mmg ;; The build doesn't honor -DCMAKE_INSTALL_BINDIR, hence ;; the adjust-bindir phase. ;;(string-append "-DCMAKE_INSTALL_BINDIR=" #$output "/bin") + (string-append "-DCMAKE_INSTALL_MANDIR=" #$output "/share/man") "-DBUILD_SHARED_LIBS=ON" + "-DBUILD_DOC=ON" "-DBUILD_TESTING=ON" ;; The longer tests are for continuous integration and ;; depend on input data which must be downloaded. "-DONLY_VERY_SHORT_TESTS=ON" + "-DUSE_SCOTCH=ON" ;; TODO: Add Elas (from ;; https://github.com/ISCDtoolbox/LinearElasticity). "-DUSE_ELAS=OFF" @@ -2443,9 +2446,6 @@ (define-public mmg (invoke "make" "doc"))) (add-after 'install 'install-doc (lambda _ - (copy-recursively - "../source/doc/man" (string-append #$output - "/share/man/man1")) (copy-recursively "doc" (string-append #$output:doc "/share/doc/" #$name "-" #$version))))