From patchwork Thu Nov 14 20:21:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 70410 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 0B63B27BBEA; Thu, 14 Nov 2024 20:23:26 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, 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 A29BD27BBE2 for ; Thu, 14 Nov 2024 20:23:25 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tBgMz-0003co-JR; Thu, 14 Nov 2024 15:23:13 -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 1tBgMo-0003WT-Qs for guix-patches@gnu.org; Thu, 14 Nov 2024 15:23:02 -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 1tBgMo-0006S8-DG for guix-patches@gnu.org; Thu, 14 Nov 2024 15:23:02 -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:References:In-Reply-To:Date:From:To:Subject; bh=H+OfvTjM7EMX1TEuC2Opz80HJPKekYYQYnl/0pUVHZU=; b=exsfcEUj2NI4hV+L3uC8bidPUegAGFQquIosAxk0LwSMdsmCh8JLDwcmBlLStm4dRz2TwTcKoYyPct8F34z5LXlqE3qHmOdC0sDUMZ23O5v+xHGIiRaOhOgNFCo6eZjqSn3I6wM2zPF/nU9uNqki/qI3oL9gjkdmjkTekmd5PpLVROXY55Jnp3EG5Uoed2Iol9AcfgA+B5CglFGf+EowxhZauSi6HOKMSjqh2el6qhpWn8c1wOgYVVU7Ndw5c/9OdRtVTv46vYQUQCh2NGFI85dcF8RHFWOOpoz4b1PumaHlobWtWAudXqfsdM4Cj318ROAVO+SybcFmoK24Lwermw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tBgMo-0001we-8F for guix-patches@gnu.org; Thu, 14 Nov 2024 15:23:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74356] [PATCH 04/10] gnu: dune-grid: Update to 2.10.0. Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 14 Nov 2024 20:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74356 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74356@debbugs.gnu.org Cc: Felix Gruber , andreas@enge.fr, sharlatanus@gmail.com, bavier@posteo.net Received: via spool by 74356-submit@debbugs.gnu.org id=B74356.17316157327278 (code B ref 74356); Thu, 14 Nov 2024 20:23:02 +0000 Received: (at 74356) by debbugs.gnu.org; 14 Nov 2024 20:22:12 +0000 Received: from localhost ([127.0.0.1]:47376 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tBgLz-0001tJ-VT for submit@debbugs.gnu.org; Thu, 14 Nov 2024 15:22:12 -0500 Received: from mout02.posteo.de ([185.67.36.66]:57291) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tBgLx-0001ss-KL for 74356@debbugs.gnu.org; Thu, 14 Nov 2024 15:22:10 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 25774240101 for <74356@debbugs.gnu.org>; Thu, 14 Nov 2024 21:22:03 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1731615724; bh=lnbHcii86mbanEyUA78v0wjQAwHeLB4QnI5DAFBDA84=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=dHrrLAbAtEmXWqRBj9uP15sOXpiupU4eeHrIEV84Nf44TWAs30ykRLswNexMXc3d4 GPmiLmfcAf5BSqrdjlFP+026d4M6QIT9k63mZxUrBsI0Q17OhrQJ4BHiLjEn5HH2X4 M0TFrTDjQBXwm/XLfF3c29PYKDynSodDpIGj1KBVq2xaE5f6wemKs45gHM8Mq7eK2B uXWPoxEe1Lgoftcj2IVBDgl1BddF+PZm8u24K/1m4C3vRE1L+1howDQV5ewL015PVR s9EhjzJYQ252NyR8hdh7XTt4BVrYWBjC7gkttCIawH0pwTLmYqAqSPF1/mmWlyupNE prj7c7Qp09HRQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4XqBQL6d2Mz9rxK; Thu, 14 Nov 2024 21:22:02 +0100 (CET) From: Felix Gruber Date: Thu, 14 Nov 2024 20:21:00 +0000 Message-ID: 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.10.0. [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: I793f9151ace3c5104fd2b8d74ace128e73133cf3 --- 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 1f48fddc9e..dcc1aa201a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1167,7 +1167,6 @@ dist_patch_DATA = \ %D%/packages/patches/dtc-meson-cell-overflow.patch \ %D%/packages/patches/duc-fix-test-sh.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/durden-shadow-arcan.patch \ %D%/packages/patches/dvd+rw-tools-add-include.patch \ diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index d29db6fcc0..bb40f046dd 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -8493,7 +8493,7 @@ (define-public dune-uggrid (define-public dune-grid (package (name "dune-grid") - (version "2.9.0") + (version "2.10.0") (source (origin (method url-fetch) @@ -8501,9 +8501,7 @@ (define-public dune-grid version "/dune-grid-" version ".tar.gz")) (sha256 (base32 - "17l2vlr8q3rfifxv80r3jlzamx478xn0vfjkrl3ns1akk7miycq8")) - (patches (search-patches - "dune-grid-add-missing-include-cassert.patch")))) + "0mh06g3sryx3s0d7zgzsz6j18vbzb0f46wq7aw6ahj2hswb7rsrg")))) (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 -