From: Felix Gruber <felgru@posteo.net>
To: 68176@debbugs.gnu.org
Cc: Felix Gruber <felgru@posteo.net>
Subject: [bug#68176] [PATCH 4/9] gnu: dune-grid: Update to 2.9.1.
Date: Sun, 31 Dec 2023 15:47:12 +0000 [thread overview]
Message-ID: <9eca4bc10f8452bad54bd63ab63cbf741fe1f7d0.1704037288.git.felgru@posteo.net> (raw)
In-Reply-To: <cover.1704037288.git.felgru@posteo.net>
* 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 <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
-
--
2.41.0
next prev parent reply other threads:[~2023-12-31 15:49 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-31 15:44 [bug#68176] [PATCH 0/9] Update dune-* to 2.9.1 Felix Gruber
2023-12-31 15:47 ` [bug#68176] [PATCH 1/9] gnu: dune-common: Update " Felix Gruber
2023-12-31 15:47 ` [bug#68176] [PATCH 2/9] gnu: dune-geometry: " Felix Gruber
2023-12-31 15:47 ` [bug#68176] [PATCH 3/9] gnu: dune-uggrid: " Felix Gruber
2023-12-31 15:47 ` Felix Gruber [this message]
2023-12-31 15:47 ` [bug#68176] [PATCH 5/9] gnu: dune-istl: " Felix Gruber
2023-12-31 15:47 ` [bug#68176] [PATCH 6/9] gnu: dune-localfunctions: " Felix Gruber
2023-12-31 15:47 ` [bug#68176] [PATCH 7/9] gnu: dune-alugrid: " Felix Gruber
2023-12-31 15:47 ` [bug#68176] [PATCH 8/9] gnu: dune-typetree: " Felix Gruber
2023-12-31 15:47 ` [bug#68176] [PATCH 9/9] gnu: dune-functions: " Felix Gruber
[not found] ` <handler.68176.B.170403751610759.ack@debbugs.gnu.org>
2024-11-14 20:25 ` bug#68176: [PATCH 0/9] Update dune-* " Felix Gruber
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9eca4bc10f8452bad54bd63ab63cbf741fe1f7d0.1704037288.git.felgru@posteo.net \
--to=felgru@posteo.net \
--cc=68176@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).