ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 05:18:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: dealii: Update to 8.4.1.

Browse source 
* gnu/packages/maths.scm (dealii): Update to 8.4.1.
* gnu/packages/patches/dealii-p4est-interface.patch: Remove file.
This commit is contained in:
Andreas Enge 2016-07-31 15:22:41 +02:00
parent 7b995c7bcb
commit 101e847294
No known key found for this signature in database
GPG key ID: F7D5C9BF765C61E3
2 changed files with 2 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gnu/packages/maths.scm
View file

@ -2247,7 +2247,7 @@ (define-public lpsolve
(define-public dealii
(package
(name "dealii")
(version "8.2.1")
(version "8.4.1")
(source
(origin
(method url-fetch)
@ -2255,8 +2255,7 @@ (define-public dealii
"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

62
gnu/packages/patches/dealii-p4est-interface.patch
View file

@ -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)