diff mbox series

[bug#68176,4/9] gnu: dune-grid: Update to 2.9.1.

Message ID 9eca4bc10f8452bad54bd63ab63cbf741fe1f7d0.1704037288.git.felgru@posteo.net
State New
Headers show
Series Update dune-* to 2.9.1. | expand

Commit Message

Felix Gruber Dec. 31, 2023, 3:47 p.m. UTC 
* 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 mbox series

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 <simon.praetorius@tu-dresden.de>
-Date: Tue, 6 Dec 2022 13:39:44 +0100
-Subject: [PATCH] Add missing include <cassert>
-
----
- 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 <config.h>
- 
- #include <array>
-+#include <cassert>
- #include <iostream>
- 
- #include <dune/common/filledarray.hh>
--- 
-2.39.2
-