From patchwork Sun Dec 31 15:47:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 58258 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 6316727BBEA; Sun, 31 Dec 2023 15:49:16 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 A64D927BBE2 for ; Sun, 31 Dec 2023 15:49:15 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rJy3p-0005UL-Tp; Sun, 31 Dec 2023 10:49:09 -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 1rJy3h-0005TQ-JC for guix-patches@gnu.org; Sun, 31 Dec 2023 10:49:01 -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 1rJy3h-00038U-93 for guix-patches@gnu.org; Sun, 31 Dec 2023 10:49:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rJy3i-0004sz-FU for guix-patches@gnu.org; Sun, 31 Dec 2023 10:49:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68176] [PATCH 4/9] gnu: dune-grid: Update to 2.9.1. Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 31 Dec 2023 15:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68176 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68176@debbugs.gnu.org Cc: Felix Gruber Received: via spool by 68176-submit@debbugs.gnu.org id=B68176.170403768318401 (code B ref 68176); Sun, 31 Dec 2023 15:49:02 +0000 Received: (at 68176) by debbugs.gnu.org; 31 Dec 2023 15:48:03 +0000 Received: from localhost ([127.0.0.1]:46849 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJy2k-0004mN-Qf for submit@debbugs.gnu.org; Sun, 31 Dec 2023 10:48:03 -0500 Received: from mout02.posteo.de ([185.67.36.66]:41247) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJy2i-0004l0-6y for 68176@debbugs.gnu.org; Sun, 31 Dec 2023 10:48:01 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id ED956240103 for <68176@debbugs.gnu.org>; Sun, 31 Dec 2023 16:47:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1704037673; bh=gIf14lAiTkwoAprj2I5aaojnBvEV3lKW5xOjzlqirv4=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=QuXibQ7JMaVtPk1LX97lLrNFq4ku3VNcsme7C7FoWxWONeF9Qc9ChCjKMo1/z22+N TbE+FPh8cnSQeMYiV8QBFpyJmaM0T46N5p+SD6Q0edaIjVYSQmybuDQO35UMO4i+Hz U4dmhR+/Yf9IBoaDxei4RjFbBwwvbGd6VywT0XAD9bVDJ1xAVq64XYW4+5yHGHoWS+ V4HYajBR4gRc2Q1z/2CigQePIL/2s85MoLZvDVYLvu9uM/XveFAKEUAwOQWck/U7gF VO5A+uYdqkl2rjqaThsZoJk6Jkqs7GSZD1nirB+YImGfHjPFaUKw6vslylfoWZ3iK9 oyPXizM+ol6kw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4T33RD2WnDz6trs; Sun, 31 Dec 2023 16:47:52 +0100 (CET) From: Felix Gruber Date: Sun, 31 Dec 2023 15:47:12 +0000 Message-ID: <9eca4bc10f8452bad54bd63ab63cbf741fe1f7d0.1704037288.git.felgru@posteo.net> In-Reply-To: References: 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.1. [source]: Remove patch that has been applied upstream. * gnu/packages/patches/dune-grid-add-missing-include-cassert.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. Change-Id: I75b07067c4e1be9479a115b31fa646a55af6552b --- gnu/local.mk | 1 - gnu/packages/maths.scm | 6 ++--- ...une-grid-add-missing-include-cassert.patch | 24 ------------------- 3 files changed, 2 insertions(+), 29 deletions(-) delete mode 100644 gnu/packages/patches/dune-grid-add-missing-include-cassert.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3e9ac33945..d1593ab8d7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1092,7 +1092,6 @@ dist_patch_DATA = \ %D%/packages/patches/dstat-fix-crash-when-specifying-delay.patch \ %D%/packages/patches/dstat-skip-devices-without-io.patch \ %D%/packages/patches/dune-common-skip-failing-tests.patch \ - %D%/packages/patches/dune-grid-add-missing-include-cassert.patch \ %D%/packages/patches/dune-istl-fix-solver-playground.patch \ %D%/packages/patches/dvd+rw-tools-add-include.patch \ %D%/packages/patches/dynaconf-unvendor-deps.patch \ diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 66d67d6f05..781af666b9 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -8209,7 +8209,7 @@ (define-public dune-uggrid (define-public dune-grid (package (name "dune-grid") - (version "2.9.0") + (version "2.9.1") (source (origin (method url-fetch) @@ -8217,9 +8217,7 @@ (define-public dune-grid version "/dune-grid-" version ".tar.gz")) (sha256 (base32 - "17l2vlr8q3rfifxv80r3jlzamx478xn0vfjkrl3ns1akk7miycq8")) - (patches (search-patches - "dune-grid-add-missing-include-cassert.patch")))) + "1nyihhk6rk8654cp3c6xzcmpn2skr5kzy3k8hp95vm11n6ghjn0h")))) (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 deleted file mode 100644 index 7462b11934..0000000000 --- a/gnu/packages/patches/dune-grid-add-missing-include-cassert.patch +++ /dev/null @@ -1,24 +0,0 @@ -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 -