From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id 4GdqDBu0OWQCIgAASxT56A (envelope-from ) for ; Fri, 14 Apr 2023 22:14:19 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id WCONCxu0OWRUWgAAG6o9tA (envelope-from ) for ; Fri, 14 Apr 2023 22:14:19 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id D70E81C52A for ; Fri, 14 Apr 2023 22:14:18 +0200 (CEST) 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 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1681503258; a=rsa-sha256; cv=none; b=ACDcbORB5VfSrC5KYYByVNULJ6Lcm6oB8ffVJtiI6AzeIGhoz3WMj8nzIqPzj6A87Ev5i3 FB99kCa32gXl/8sJZ3AhyliQVRophr/fvXqEomjisOkk/X31gL4oD6TPQE/hZwByfPqG4C XUcCHzmstslw8St1VvaBLYe5erOZ4tuw5jIv6cTKdRBslVrD6P/sJ6DDgecD7T5mqRiGxD RduYNb3J8Hb3PM0eXqeaNtz39ypaU69lw3AP/APnK3SkfOIbFx7PzJYwme0Z84QQVUcPje ObdELc7QD3WSddkZWMD+w7xuB3P6x0IZXW0KbhGomKN0XovlquEsMTNqxQPwVg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=gsRKkGYb; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1681503258; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=eDxw+v2JQ1rWZzE5ReccGuG9rRy+LV44bQ3BNXPJ8U0=; b=gYyMt7mPLhHwaYbKNWbIiNV7peKgUjQZPjXVkXF04u2z/Z397O1ilGZgb4/TqyaDGxzBZC PALeRHoVjYNGTmZ/s+oSv2EBZ7OIy35nHBcUQK9nNB/6dsEVPsvvW+dncyh5KALnBBso23 5ZzFGzZaBxsu60okzfvPY63ELykFMzdsQ1GtJ61nMnYHkdkwCbuGOaCb8FHZv/mIZOM4uR 06ioJVgFQTVG/jcVwBrepQomjawMIAL9fD+Gtgfy7+6jVwZI+DxwZf5CV8F+fmocGbZ1Ha XLVQ/vATSLdyb4iWMefYyP9TiQ8zU2ST642BZfzX5RujmJQjIUP5LKLwhAuhBw== X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -0.82 X-Spam-Score: -0.82 X-Migadu-Queue-Id: D70E81C52A Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=gsRKkGYb; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none) X-TUID: mdsbOfAJ7zjb * 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 + -- 2.39.2