[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
48/63: gnu: dealii: Update to 8.4.1.
From: |
Mark H. Weaver |
Subject: |
48/63: gnu: dealii: Update to 8.4.1. |
Date: |
Thu, 4 Aug 2016 07:44:58 +0000 (UTC) |
mhw pushed a commit to branch core-updates-2016-08-01
in repository guix.
commit 101e847294dc403d5a7ef222117ad9070223b86b
Author: Andreas Enge <address@hidden>
Date: Sun Jul 31 15:22:41 2016 +0200
gnu: dealii: Update to 8.4.1.
* gnu/packages/maths.scm (dealii): Update to 8.4.1.
* gnu/packages/patches/dealii-p4est-interface.patch: Remove file.
---
gnu/packages/maths.scm | 5 +-
gnu/packages/patches/dealii-p4est-interface.patch | 62 ---------------------
2 files changed, 2 insertions(+), 65 deletions(-)
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 86643b3..e57eaa0 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -2247,7 +2247,7 @@ revised simplex and the branch-and-bound methods.")
(define-public dealii
(package
(name "dealii")
- (version "8.2.1")
+ (version "8.4.1")
(source
(origin
(method url-fetch)
@@ -2255,8 +2255,7 @@ revised simplex and the branch-and-bound methods.")
"download/v" version "/dealii-" version ".tar.gz"))
(sha256
(base32
- "185jych0gdnpkjwxni7pd0dda149492zwq2457xdjg76bzj78mnp"))
- (patches (search-patches "dealii-p4est-interface.patch"))
+ "1bdksvvyp1rj37df1ndh8j3x9nzpc3sazw8nd0hzvnlw0qnyk800"))
(modules '((guix build utils)))
(snippet
;; Remove bundled sources: UMFPACK, TBB, muParser, and boost
diff --git a/gnu/packages/patches/dealii-p4est-interface.patch
b/gnu/packages/patches/dealii-p4est-interface.patch
deleted file mode 100644
index 4c4125d..0000000
--- a/gnu/packages/patches/dealii-p4est-interface.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From upstream commit f764598c.
-
-The p4est_connectivity_load function used to take an unsigned long as argument,
-but this has been changed to size_t in p4est 1.0. This makes no difference on
-64 bit systems, but leads to compiler errors on 32 bit systems. Fix this.
-
---- a/source/distributed/tria.cc
-+++ b/source/distributed/tria.cc
-@@ -204,7 +204,11 @@ namespace internal
- static
- int (&connectivity_is_valid) (types<2>::connectivity *connectivity);
-
--#if DEAL_II_P4EST_VERSION_GTE(0,3,4,3)
-+#if DEAL_II_P4EST_VERSION_GTE(1,0,0,0)
-+ static
-+ types<2>::connectivity *(&connectivity_load) (const char *filename,
-+ size_t *length);
-+#elif DEAL_II_P4EST_VERSION_GTE(0,3,4,3)
- static
- types<2>::connectivity *(&connectivity_load) (const char *filename,
- long unsigned *length);
-@@ -384,7 +388,12 @@ namespace internal
- *connectivity)
- = p4est_connectivity_is_valid;
-
--#if DEAL_II_P4EST_VERSION_GTE(0,3,4,3)
-+#if DEAL_II_P4EST_VERSION_GTE(1,0,0,0)
-+ types<2>::connectivity *
-+ (&functions<2>::connectivity_load) (const char *filename,
-+ size_t *length)
-+ = p4est_connectivity_load;
-+#elif DEAL_II_P4EST_VERSION_GTE(0,3,4,3)
- types<2>::connectivity *
- (&functions<2>::connectivity_load) (const char *filename,
- long unsigned *length)
-@@ -564,7 +573,11 @@ namespace internal
- static
- int (&connectivity_is_valid) (types<3>::connectivity *connectivity);
-
--#if DEAL_II_P4EST_VERSION_GTE(0,3,4,3)
-+#if DEAL_II_P4EST_VERSION_GTE(1,0,0,0)
-+ static
-+ types<3>::connectivity *(&connectivity_load) (const char *filename,
-+ size_t *length);
-+#elif DEAL_II_P4EST_VERSION_GTE(0,3,4,3)
- static
- types<3>::connectivity *(&connectivity_load) (const char *filename,
- long unsigned *length);
-@@ -747,7 +760,12 @@ namespace internal
- *connectivity)
- = p8est_connectivity_is_valid;
-
--#if DEAL_II_P4EST_VERSION_GTE(0,3,4,3)
-+#if DEAL_II_P4EST_VERSION_GTE(1,0,0,0)
-+ types<3>::connectivity *
-+ (&functions<3>::connectivity_load) (const char *filename,
-+ size_t *length)
-+ = p8est_connectivity_load;
-+#elif DEAL_II_P4EST_VERSION_GTE(0,3,4,3)
- types<3>::connectivity *
- (&functions<3>::connectivity_load) (const char *filename,
- long unsigned *length)
- 50/63: gnu: tcc: Use "kernel-headers" instead of "linux-headers" to designate input., (continued)
- 50/63: gnu: tcc: Use "kernel-headers" instead of "linux-headers" to designate input., Mark H. Weaver, 2016/08/04
- 43/63: gnu: Add glibc 2.22., Mark H. Weaver, 2016/08/04
- 23/63: gnu: r-genomicfeatures: Update to 1.24.5., Mark H. Weaver, 2016/08/04
- 24/63: gnu: r-genomeinfodb: Update to 1.8.3., Mark H. Weaver, 2016/08/04
- 20/63: Merge remote-tracking branch 'origin/master' into core-updates, Mark H. Weaver, 2016/08/04
- 28/63: gnu: r-biostrings: Update to 2.40.2., Mark H. Weaver, 2016/08/04
- 02/63: Merge branch 'master' into core-updates, Mark H. Weaver, 2016/08/04
- 60/63: gnu: texlive-texmf: Mark as non-substitutable., Mark H. Weaver, 2016/08/04
- 52/63: gnu: fastcap: Add input ghostscript., Mark H. Weaver, 2016/08/04
- 58/63: Merge branch 'master' into core-updates, Mark H. Weaver, 2016/08/04
- 48/63: gnu: dealii: Update to 8.4.1.,
Mark H. Weaver <=
- 26/63: gnu: r-genomicalignments: Update to 1.8.4., Mark H. Weaver, 2016/08/04
- 29/63: gnu: r-biocparallel: Update to 1.6.3., Mark H. Weaver, 2016/08/04
- 30/63: gnu: r-annotationdbi: Update to 1.34.4., Mark H. Weaver, 2016/08/04
- 32/63: gnu: r-xvector: Update to 0.12.1., Mark H. Weaver, 2016/08/04
- 22/63: gnu: r-s4vectors: Update to 0.10.2., Mark H. Weaver, 2016/08/04
- 42/63: tests: base: Correct invalid merge., Mark H. Weaver, 2016/08/04
- 36/63: gnu: vlc: Drop -ffast-math from the compilation flags., Mark H. Weaver, 2016/08/04
- 54/63: download: Pass the raw file name to content-addressed mirrors., Mark H. Weaver, 2016/08/04
- 51/63: gnu: zsh: Update to 5.2., Mark H. Weaver, 2016/08/04
- 38/63: Merge branch 'master' into core-updates, Mark H. Weaver, 2016/08/04