Chase hdf5 upgrade and unbreak.

6 files changed, 26 insertions, 6 deletions

diff --git a/science/gnudatalanguage/files/patch-CMakeLists.txt b/science/gnudatalanguage/files/patch-CMakeLists.txt
index 1e14652565b9..8fc7a05a8585 100644
--- a/science/gnudatalanguage/files/patch-CMakeLists.txt
+++ b/science/gnudatalanguage/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2015-04-22 19:37:22 UTC
+--- CMakeLists.txt.orig	2016-04-29 17:03:25 UTC
 +++ CMakeLists.txt
-@@ -871,7 +871,7 @@ if(NOT PYTHON_MODULE)
+@@ -925,7 +925,7 @@ if(NOT PYTHON_MODULE)
  endif(NOT PYTHON_MODULE)
  
  install(FILES ${CMAKE_SOURCE_DIR}/AUTHORS ${CMAKE_SOURCE_DIR}/README DESTINATION ${CMAKE_INSTALL_PREFIX}/${GDL_DATA_DIR})
diff --git a/science/gnudatalanguage/files/patch-CMakeModules_Findlibps.cmake b/science/gnudatalanguage/files/patch-CMakeModules_Findlibps.cmake
index f46be9a04957..ba2630cad671 100644
--- a/science/gnudatalanguage/files/patch-CMakeModules_Findlibps.cmake
+++ b/science/gnudatalanguage/files/patch-CMakeModules_Findlibps.cmake
@@ -1,4 +1,4 @@
---- CMakeModules/Findlibps.cmake.orig	2015-04-22 19:37:22 UTC
+--- CMakeModules/Findlibps.cmake.orig	2016-04-29 17:03:25 UTC
 +++ CMakeModules/Findlibps.cmake
 @@ -1,4 +1,4 @@
 -find_path(LIBPSPKG libps.pc PATH_SUFFIXES lib lib/pkgconfig lib64/pkgconfig)
diff --git a/science/gnudatalanguage/files/patch-src__basic_fun.cpp b/science/gnudatalanguage/files/patch-src__basic_fun.cpp
index 600136ae2898..660a3951739a 100644
--- a/science/gnudatalanguage/files/patch-src__basic_fun.cpp
+++ b/science/gnudatalanguage/files/patch-src__basic_fun.cpp
@@ -1,4 +1,4 @@
---- src/basic_fun.cpp.orig	2016-01-04 19:52:38 UTC
+--- src/basic_fun.cpp.orig	2016-04-29 17:03:25 UTC
 +++ src/basic_fun.cpp
 @@ -6523,7 +6523,7 @@ namespace lib {
  	  {
diff --git a/science/gnudatalanguage/files/patch-src__file.cpp b/science/gnudatalanguage/files/patch-src__file.cpp
index 68cfcee311a2..d55ba2a942a4 100644
--- a/science/gnudatalanguage/files/patch-src__file.cpp
+++ b/science/gnudatalanguage/files/patch-src__file.cpp
@@ -1,4 +1,4 @@
---- src/file.cpp.orig	2016-01-04 20:50:45 UTC
+--- src/file.cpp.orig	2016-04-29 17:03:25 UTC
 +++ src/file.cpp
 @@ -242,10 +242,11 @@ extern "C"
  #endif
diff --git a/science/gnudatalanguage/files/patch-src__gshhs.cpp b/science/gnudatalanguage/files/patch-src__gshhs.cpp
index 1a517e71e275..b3e4d4c49752 100644
--- a/science/gnudatalanguage/files/patch-src__gshhs.cpp
+++ b/science/gnudatalanguage/files/patch-src__gshhs.cpp
@@ -1,4 +1,4 @@
---- src/gshhs.cpp.orig	2015-04-22 19:37:22 UTC
+--- src/gshhs.cpp.orig	2016-04-29 17:03:25 UTC
 +++ src/gshhs.cpp
 @@ -175,7 +175,7 @@ private:
          double ss = h.south * GSHHS_SCL;
diff --git a/science/gnudatalanguage/files/patch-src_hdf5__fun.cpp b/science/gnudatalanguage/files/patch-src_hdf5__fun.cpp
new file mode 100644
index 000000000000..20ab2d79f667
--- /dev/null
+++ b/science/gnudatalanguage/files/patch-src_hdf5__fun.cpp
@@ -0,0 +1,20 @@
+--- src/hdf5_fun.cpp.orig	2016-04-29 17:03:25 UTC
++++ src/hdf5_fun.cpp
+@@ -348,7 +348,7 @@ namespace lib {
+     SizeT nParam=e->NParam(1);
+     hsize_t dims_out[MAXRANK];
+ 
+-    hid_t h5a_id;
++    DLong h5a_id;
+     e->AssureLongScalarPar(0, h5a_id);
+     
+     hid_t h5s_id = H5Aget_space(h5a_id);
+@@ -402,7 +402,7 @@ namespace lib {
+     SizeT nParam=e->NParam(1);
+     hsize_t dims_out[MAXRANK];
+ 
+-    hid_t h5d_id;
++    DLong h5d_id;
+     e->AssureLongScalarPar(0, h5d_id);
+     
+     hid_t h5s_id = H5Dget_space(h5d_id);