Source: gmsh
Version: 2.8.4+dfsg-1
Severity: normal
Tags: patch
User: p...@debian.org
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Hi,
Please find attached a patch proposal to fix cmake HDF5 detection when
it isn't installed in the standard path.
This patch fixes a FTBFS against hdf5 1.8.13 currently in experimental.
Thanks in advance,
_g.
- -- System Information:
Debian Release: jessie/sid
APT prefers testing
APT policy: (500, 'testing'), (1, 'experimental')
Architecture: i386 (i686)
Kernel: Linux 3.14-1-486
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQEcBAEBCAAGBQJT2KFQAAoJEO/obGx//s+DLTEIAIZ49CQsgHiraWVN5L/QS88B
T341oZA5BWJlZfRVjpzoCWGfYCJVuHRhY5ZEvwJw5EZlTlTQX+Ul05JuOeLXUbGV
mIA3/2nM1Sy6kF2ncKU7RTMgiTBQ0DN7aQBWTiuUeaqVg3haaBOk6ihmbwxTS913
qI7paWxfHtsHUNkvUlA4yG04XAAkKZNm03Y3fj0jKXjQOynCJ/JQOGyQ2X3HHS1M
ek+LV74XVOwNmHXXqwfOIwGJhyVR7/tF5QswqNPe19l0oy+7UnK9ov4njoqhb4nA
msuCCMzABzpbNLHiBEyvmE3/CSaFwPCOrwW2g4u26+mRrhi8w1ZR2aWSPDc5C1M=
=raHr
-----END PGP SIGNATURE-----
diff -Nru gmsh-2.8.4+dfsg/debian/changelog gmsh-2.8.4+dfsg/debian/changelog
--- gmsh-2.8.4+dfsg/debian/changelog 2014-02-11 07:42:58.000000000 +0100
+++ gmsh-2.8.4+dfsg/debian/changelog 2014-07-25 00:43:50.000000000 +0200
@@ -1,3 +1,11 @@
+gmsh (2.8.4+dfsg-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * New patch fix-cmake-hdf5.patch to support hdf5 1.8.13 new packaging
+ layout.
+
+ -- Gilles Filippini <p...@debian.org> Fri, 25 Jul 2014 00:43:50 +0200
+
gmsh (2.8.4+dfsg-1) unstable; urgency=medium
* [09d4b69] Imported Upstream version 2.8.4+dfsg
diff -Nru gmsh-2.8.4+dfsg/debian/patches/fix-cmake-hdf5.patch gmsh-2.8.4+dfsg/debian/patches/fix-cmake-hdf5.patch
--- gmsh-2.8.4+dfsg/debian/patches/fix-cmake-hdf5.patch 1970-01-01 01:00:00.000000000 +0100
+++ gmsh-2.8.4+dfsg/debian/patches/fix-cmake-hdf5.patch 2014-07-25 12:00:18.000000000 +0200
@@ -0,0 +1,29 @@
+Index: gmsh-2.8.4+dfsg/CMakeLists.txt
+===================================================================
+--- gmsh-2.8.4+dfsg.orig/CMakeLists.txt 2014-07-25 00:43:13.000000000 +0200
++++ gmsh-2.8.4+dfsg/CMakeLists.txt 2014-07-25 12:00:12.512894965 +0200
+@@ -779,8 +779,10 @@
+ endif(ENABLE_FOURIER_MODEL)
+
+ if(ENABLE_MED OR ENABLE_CGNS)
+- find_library(HDF5_LIB hdf5)
+- if(HDF5_LIB)
++ find_package(HDF5)
++ if(HDF5_FOUND)
++ set(HDF5_LIB "${HDF5_C_LIBRARIES}")
++ list(APPEND EXTERNAL_INCLUDES ${HDF5_INCLUDE_DIRS})
+ if(ENABLE_MED)
+ find_library(MED_LIB med)
+ if(MED_LIB)
+@@ -811,9 +813,9 @@
+ endif(ZLIB_FOUND)
+ endif(NOT HAVE_LIBZ)
+ endif(MED_LIB OR CGNS_LIB)
+- else(HDF5_LIB)
++ else(HDF5_FOUND)
+ message(STATUS "HDF5 not found")
+- endif(HDF5_LIB)
++ endif(HDF5_FOUND)
+ endif(ENABLE_MED OR ENABLE_CGNS)
+
+ if(HAVE_SOLVER)
diff -Nru gmsh-2.8.4+dfsg/debian/patches/series gmsh-2.8.4+dfsg/debian/patches/series
--- gmsh-2.8.4+dfsg/debian/patches/series 2014-02-10 21:11:17.000000000 +0100
+++ gmsh-2.8.4+dfsg/debian/patches/series 2014-07-25 00:44:39.000000000 +0200
@@ -9,3 +9,4 @@
fix_script_header.patch
fix_java_wrapper_compilation.patch
enable_tetgen.patch
+fix-cmake-hdf5.patch
