From patchwork Fri Apr 14 19:27:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 49161 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 02190175A1; Fri, 14 Apr 2023 20:43:44 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 341CF27BE30 for ; Fri, 14 Apr 2023 20:28:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pnP5b-0001RS-SY; Fri, 14 Apr 2023 15:28:07 -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 1pnP5Z-0001GQ-LF for guix-patches@gnu.org; Fri, 14 Apr 2023 15:28:06 -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 1pnP5Y-0000zZ-4f for guix-patches@gnu.org; Fri, 14 Apr 2023 15:28:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pnP5X-00080n-LS for guix-patches@gnu.org; Fri, 14 Apr 2023 15:28:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62842] [PATCH 04/11] gnu: dune-grid: Update to 2.9.0. Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 14 Apr 2023 19:28:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62842 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62842@debbugs.gnu.org Cc: Felix Gruber Received: via spool by 62842-submit@debbugs.gnu.org id=B62842.168150048230771 (code B ref 62842); Fri, 14 Apr 2023 19:28:03 +0000 Received: (at 62842) by debbugs.gnu.org; 14 Apr 2023 19:28:02 +0000 Received: from localhost ([127.0.0.1]:47697 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pnP5V-000805-Hh for submit@debbugs.gnu.org; Fri, 14 Apr 2023 15:28:02 -0400 Received: from mout02.posteo.de ([185.67.36.66]:53065) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pnP5R-0007yu-2m for 62842@debbugs.gnu.org; Fri, 14 Apr 2023 15:27:57 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 8D29F2403B8 for <62842@debbugs.gnu.org>; Fri, 14 Apr 2023 21:27:51 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1681500471; bh=/xmqVTldAQ2G/0BdSfB6bvINOuv512lOy7TKLkDVbFM=; h=From:To:Cc:Subject:Date:From; b=gsRKkGYb5/xRem8LDETssR1FntWS+LsA5VcHZy0aJvXISw2NWSig2aeMPeFnEeuEX JDB51c70h1oZowSWR2pw0/8pOxiMZBbTrWX1PDt2U0NsXZrI8FIHklqM6CNcad0nQq 4Y8Qc0mUASZhLurqGEM9mX4kDdxU19hYx3mkxiaUUtJIXF1SaDIJNq/5Eqo0VVnWaZ PJCuRtrBElwDlggiq3QDXa/rPoiEkmTE8nPQQOb7snqGu6pWNQ2hSBme5YL46JzmPT UpOT9UtegzZXYAhNn3j0q4ptKGsJPAuadqiSnRdotaXyqi+SqewrbkUqjBX+kSvYW7 g74VcACwIeXVQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4PymgW1hYQz6tv5; Fri, 14 Apr 2023 21:27:51 +0200 (CEST) From: Felix Gruber Date: Fri, 14 Apr 2023 19:27:29 +0000 Message-Id: <20230414192736.41322-4-felgru@posteo.net> In-Reply-To: <20230414192518.41188-1-felgru@posteo.net> References: <20230414192518.41188-1-felgru@posteo.net> MIME-Version: 1.0 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/maths.scm (dune-grid): Update to 2.9.0. [source](patches): Add patch to fix build. * gnu/packages/patches/dune-grid-add-missing-include-cassert.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/maths.scm | 6 +++-- ...une-grid-add-missing-include-cassert.patch | 24 +++++++++++++++++++ 3 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/dune-grid-add-missing-include-cassert.patch diff --git a/gnu/local.mk b/gnu/local.mk index 8088e8170b..96d5aad909 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1056,6 +1056,7 @@ dist_patch_DATA = \ %D%/packages/patches/dovecot-trees-support-dovecot-2.3.patch \ %D%/packages/patches/dstat-fix-crash-when-specifying-delay.patch \ %D%/packages/patches/dstat-skip-devices-without-io.patch \ + %D%/packages/patches/dune-grid-add-missing-include-cassert.patch \ %D%/packages/patches/dvd+rw-tools-add-include.patch \ %D%/packages/patches/dynaconf-unvendor-deps.patch \ %D%/packages/patches/efivar-211.patch \ diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 7177f8c60d..95e2eb3ef7 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -6898,7 +6898,7 @@ (define-public dune-uggrid (define-public dune-grid (package (name "dune-grid") - (version "2.7.1") + (version "2.9.0") (source (origin (method url-fetch) @@ -6906,7 +6906,9 @@ (define-public dune-grid version "/dune-grid-" version ".tar.gz")) (sha256 (base32 - "15iws03hkbmr4a4rqqb0rriz1m8szl96wdr7gw0jmrcnlzbdbbx5")))) + "17l2vlr8q3rfifxv80r3jlzamx478xn0vfjkrl3ns1akk7miycq8")) + (patches (search-patches + "dune-grid-add-missing-include-cassert.patch")))) (build-system cmake-build-system) (arguments `(#:phases diff --git a/gnu/packages/patches/dune-grid-add-missing-include-cassert.patch b/gnu/packages/patches/dune-grid-add-missing-include-cassert.patch new file mode 100644 index 0000000000..7462b11934 --- /dev/null +++ b/gnu/packages/patches/dune-grid-add-missing-include-cassert.patch @@ -0,0 +1,24 @@ +From ef843b1a66308247ba4d2e2c116ff5517421a91b Mon Sep 17 00:00:00 2001 +From: Simon Praetorius +Date: Tue, 6 Dec 2022 13:39:44 +0100 +Subject: [PATCH] Add missing include + +--- + dune/grid/test/yasp/test-yaspgrid-partitioner.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/dune/grid/test/yasp/test-yaspgrid-partitioner.cc b/dune/grid/test/yasp/test-yaspgrid-partitioner.cc +index 93ae042b0..9a4530201 100644 +--- a/dune/grid/test/yasp/test-yaspgrid-partitioner.cc ++++ b/dune/grid/test/yasp/test-yaspgrid-partitioner.cc +@@ -6,6 +6,7 @@ + #include + + #include ++#include + #include + + #include +-- +2.39.2 +