From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id iEfLNwjbamJK7QAAbAwnHQ (envelope-from ) for ; Thu, 28 Apr 2022 20:20:56 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id oNUGOAjbamIzdQAAauVa8A (envelope-from ) for ; Thu, 28 Apr 2022 20:20:56 +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 6BE2D395EC for ; Thu, 28 Apr 2022 20:20:56 +0200 (CEST) Received: from localhost ([::1]:39006 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nk8l5-0000JU-Kf for larch@yhetil.org; Thu, 28 Apr 2022 14:20:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38570) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nk8kG-0007kn-TX for guix-patches@gnu.org; Thu, 28 Apr 2022 14:20:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56026) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nk8kG-0004vq-Jr for guix-patches@gnu.org; Thu, 28 Apr 2022 14:20:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nk8kG-00038k-Fj for guix-patches@gnu.org; Thu, 28 Apr 2022 14:20:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55170] [PATCH 5/5] gnu: dealii: Update to 9.3.3. Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 Apr 2022 18:20:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55170 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55170@debbugs.gnu.org Cc: ludovic.courtes@inria.fr, paul@apatience.com Received: via spool by 55170-submit@debbugs.gnu.org id=B55170.165116999212011 (code B ref 55170); Thu, 28 Apr 2022 18:20:04 +0000 Received: (at 55170) by debbugs.gnu.org; 28 Apr 2022 18:19:52 +0000 Received: from localhost ([127.0.0.1]:49919 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nk8k4-00037e-77 for submit@debbugs.gnu.org; Thu, 28 Apr 2022 14:19:52 -0400 Received: from mail-4022.proton.ch ([185.70.40.22]:10982) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nk8jz-000373-EI for 55170@debbugs.gnu.org; Thu, 28 Apr 2022 14:19:48 -0400 Date: Thu, 28 Apr 2022 18:19:35 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail2; t=1651169981; bh=058B6tEF1RvyJ2m9IcPEbyJxihWny7k4utf0c6KxuW8=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:In-Reply-To: References:Feedback-ID:From:To:Cc:Date:Subject:Reply-To: Feedback-ID:Message-ID; b=ciNDbaqEgjJzbRu0otEcdmheHrlnelqVdt3qGfE9FxaNzyGyOtIegN710Jb8wXMgr f2Bhx9/W+eWGYZj1hS9w3QvvH1kIyeNfgaGf9k7oVAPEQ5jNV5VvkCQiO66Sc137/Z y/xIY6elQN8KrxEJPKybq6o5dDS11eEKLTA/f2MHKHMWF7diMp9kifGPCqNh9Ytrq8 GVy7HKt6PDe7G+vY/6wryTroJhi7GwDNCutwG9kdME802gfFmYLVEqBXH/PKx7Lz7l Ly0kEjtDsCQyWzbNtPHhvcjzr/Fk6zXM/j93rmjzO4FyjqK3yoPcdDq5lajdMMmGaA Bwk6HD9FlNt1Q== From: "Paul A. Patience" Message-ID: <20220428181919.281837-5-paul@apatience.com> In-Reply-To: <20220428181919.281837-1-paul@apatience.com> References: <20220428181919.281837-1-paul@apatience.com> Feedback-ID: 19227857:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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: , Reply-To: "Paul A. Patience" Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1651170056; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: 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=058B6tEF1RvyJ2m9IcPEbyJxihWny7k4utf0c6KxuW8=; b=rPw/zSZNLvm3ZoYAvwn51Z00Q/CrD3bxCrXc7UmdPIs8i+Q43cKwgm0Z9B4h3m81HuggZb DB/Nn1D4ruYxxFCbGPCC2gquaG1irVizkz8cV6Ul2pC2A8d77JUfF6INxJ71c72A2lunTj YdefKoo3u1hzOaWnQtiCo1nc5v5YHjnGInLsMMIjozBT7e8raH8zVZttiuJjikI3yhRPYR EOdxl8DQKegc7GgG+qS0UsNmFyaKF24YEEDQFRNLhDQUM5d4l5i3tcni69FzZW6B4EVM6h A5JrNY/YWTuMrjofRiWZfZWe4Z3A344TIbi97ezzMLb36IA0hYeN9gjJ0sjDdA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1651170056; a=rsa-sha256; cv=none; b=mUDU+TD429Xe/xHND4Gb1SxNnCvYw02zp3emCbFsJEgV6f/qK9Wzq6cLSYNqNi4zyKQ9dn AdZFpefLoguvyeGuVaCRD4ypuuDrop9qGCDBVauW/xFqbNaEAM05/ffdhIg1yrz1uDTAYl 3xn6sOx91U1PS6iQ09eL8zHDYfR51/ubTPZsyAuZIpfbc/gM3xT1XubqNh69euKyTnNJxF RwSWQBvpMRdkyBJwTnDfro7zOzpw7TkfP2gTz0NyhNv/fbP/SXcXKOh0LKdjM0DX8KJ68B 1e9bfysUELE6Fbv+cgoghM/3ZrPP8r/hSMvpqERmROMGmRwcpsr379Fls1VoZw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=apatience.com header.s=protonmail2 header.b=ciNDbaqE; dmarc=none; 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" X-Migadu-Spam-Score: 2.00 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=apatience.com header.s=protonmail2 header.b=ciNDbaqE; dmarc=none; 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" X-Migadu-Queue-Id: 6BE2D395EC X-Spam-Score: 2.00 X-Migadu-Scanner: scn1.migadu.com X-TUID: q55NeUjOboln * gnu/packages/maths.scm (dealii): Update to 9.3.3. * gnu/packages/patches/dealii-fix-compiliation-with-boost-1.78.patch: Delete file. * gnu/packages/patches/dealii-fix-sundials.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- gnu/local.mk | 2 - gnu/packages/maths.scm | 6 +- ...lii-fix-compiliation-with-boost-1.78.patch | 40 ------------- .../patches/dealii-fix-sundials.patch | 60 ------------------- 4 files changed, 2 insertions(+), 106 deletions(-) delete mode 100644 gnu/packages/patches/dealii-fix-compiliation-with-boost= -1.78.patch delete mode 100644 gnu/packages/patches/dealii-fix-sundials.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9bad87710c..d84d2bee3d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -994,8 +994,6 @@ dist_patch_DATA =3D=09=09=09=09=09=09\ %D%/packages/patches/dbus-c++-gcc-compat.patch=09=09\ %D%/packages/patches/dbus-c++-threading-mutex.patch=09=09\ %D%/packages/patches/dbxfs-remove-sentry-sdk.patch=09=09\ - %D%/packages/patches/dealii-fix-compiliation-with-boost-1.78.patch=09\ - %D%/packages/patches/dealii-fix-sundials.patch=09=09\ %D%/packages/patches/debops-constants-for-external-program-names.patch \ %D%/packages/patches/debops-debops-defaults-fall-back-to-less.patch \ %D%/packages/patches/dee-vapi.patch=09=09=09\ diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index c74f055a07..2d3e67a6b4 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5171,16 +5171,14 @@ (define trilinos-for-dealii-openmpi (define-public dealii (package (name "dealii") - (version "9.3.2") + (version "9.3.3") (source (origin (method url-fetch) (uri (string-append "https://github.com/dealii/dealii/releases/" "download/v" version "/dealii-" version ".tar.g= z")) (sha256 - (base32 "1s0kawnljg24jj6nibwrif5gxdgg2daqfylhqqpl1lvmzmmxfhak")) - (patches (search-patches "dealii-fix-compiliation-with-boost-1.78.p= atch" - "dealii-fix-sundials.patch")) + (base32 "0a8s4yxcbvzmfgv5qcg27h2ss4fcnyhrhhs35glqj59l9cbmkysx")) (modules '((guix build utils))) (snippet ;; Remove bundled boost, muparser, TBB and UMFPACK. diff --git a/gnu/packages/patches/dealii-fix-compiliation-with-boost-1.78.p= atch b/gnu/packages/patches/dealii-fix-compiliation-with-boost-1.78.patch deleted file mode 100644 index 1937aa9afc..0000000000 --- a/gnu/packages/patches/dealii-fix-compiliation-with-boost-1.78.patch +++ /dev/null @@ -1,40 +0,0 @@ -From cbef761731627cece2a6f0276b87dacabbdc8a72 Mon Sep 17 00:00:00 2001 -From: David Wells -Date: Tue, 4 Jan 2022 12:46:30 -0500 -Subject: [PATCH] Fix compilation with boost 1.78. - -I bisected (fortunately Boost.Geometry a header-only library so adding the -include directory sufficed) and -https://github.com/boostorg/geometry/commit/6eb9e238bcb37e26dc31d16acf8267= 84a2ba30f4 -is where this problem starts for us. See also -https://github.com/boostorg/geometry/issues/792 - the easiest fix for all = such -issues is to just include the project header `boost/geometry/geometry.hpp`= . - -In this particular case, if you look at the commit which causes grid_tools= .cc -fails to compile, its because we were relying on some implicit includes. I= n -particular, we need the distance header to find the distance between point= s and -boxes, but that was previously included in another file. - -This patch has been adapted from -e0e76835519d122fd12b5858e16d08641a641c6a to apply to dealii 9.3.2. - -See https://github.com/dealii/dealii/pull/13165. ---- - include/deal.II/numerics/rtree.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/deal.II/numerics/rtree.h b/include/deal.II/numerics/r= tree.h -index 1b9d04dacd..1e1bfd2932 100644 ---- a/include/deal.II/numerics/rtree.h -+++ b/include/deal.II/numerics/rtree.h -@@ -26,6 +26,7 @@ - #include - - DEAL_II_DISABLE_EXTRA_DIAGNOSTICS -+#include - #include - #include - DEAL_II_ENABLE_EXTRA_DIAGNOSTICS --- -2.30.2 - diff --git a/gnu/packages/patches/dealii-fix-sundials.patch b/gnu/packages/= patches/dealii-fix-sundials.patch deleted file mode 100644 index 7dd5df45da..0000000000 --- a/gnu/packages/patches/dealii-fix-sundials.patch +++ /dev/null @@ -1,60 +0,0 @@ -From af73f368f7f9d4a00df075d1a9f50fc495f8e87a Mon Sep 17 00:00:00 2001 -From: Timo Heister -Date: Sat, 25 Dec 2021 12:30:45 -0500 -Subject: [PATCH] fix sundials compilation - ---- - include/deal.II/sundials/n_vector.templates.h | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -diff --git a/include/deal.II/sundials/n_vector.templates.h b/include/deal.= II/sundials/n_vector.templates.h -index 2b49e3efc9..746f63a03b 100644 ---- a/include/deal.II/sundials/n_vector.templates.h -+++ b/include/deal.II/sundials/n_vector.templates.h -@@ -253,13 +253,13 @@ namespace SUNDIALS - template < - typename VectorType, - typename std::enable_if_t::value, int>= =3D 0> -- MPI_Comm -+ const MPI_Comm & - get_communicator(N_Vector v); - - template < - typename VectorType, - typename std::enable_if_t::value, int> = =3D 0> -- MPI_Comm -+ const MPI_Comm & - get_communicator(N_Vector v); - - /** -@@ -481,7 +481,7 @@ SUNDIALS::internal::NVectorOperations::destroy(N_Vecto= r v) - - template ::value, int>> --MPI_Comm -+const MPI_Comm & - SUNDIALS::internal::NVectorOperations::get_communicator(N_Vector v) - { - return unwrap_nvector_const(v)->block(0).get_mpi_communicat= or(); -@@ -491,7 +491,7 @@ SUNDIALS::internal::NVectorOperations::get_communicato= r(N_Vector v) - - template ::value, int>> --MPI_Comm -+const MPI_Comm & - SUNDIALS::internal::NVectorOperations::get_communicator(N_Vector v) - { - return unwrap_nvector_const(v)->get_mpi_communicator(); -@@ -519,7 +519,8 @@ SUNDIALS::internal::NVectorOperations::get_communicato= r_as_void_ptr(N_Vector v) - (void)v; - return nullptr; - # else -- return get_communicator(v); -+ // We need to cast away const here, as SUNDIALS demands a pure `void *`= . -+ return &(const_cast(get_communicator(v))); - # endif - } - --- -2.30.2 - -- 2.36.0