Source: xdmf Version: 2.1.dfsg.1-15 Severity: important Tags: patch -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256
Hi, Please find attached a patch to support building against HDF5-1.10 currently in experimental. I intend to request a transition slot this week, and will NMU if need be. Thanks, _g. - -- System Information: Debian Release: stretch/sid APT prefers testing APT policy: (500, 'testing') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.6.0-1-amd64 (SMP w/2 CPU cores) Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) -----BEGIN PGP SIGNATURE----- iQEcBAEBCAAGBQJYDnD+AAoJEO/obGx//s+DXGAIAIrlN3xd/dPi+cYEy7+gm1UY Pn/fJkHNvl8EEXntIYLkyF8SLHiWCzo2FmxtnnMShfBTu89u1z0QRG6QgpSzXFCT RkUNE9R8YyZA1nkjngmQXgoloyDvE+UjyhLQ4ixVrBh3MkImG9DCbMjtcLbjvQrK phcfHi3lIjFMygO547JdlPDqGVzl1S6lkhIUvH1uCi/WInqEVsourohKE3g7WB73 uI2JI9slksTJjFC37Pa70VZkJHX1vpwO47PpmD5+zgkVsFc15FWgA6iy0O1Mtpyr koeMHc80J+29ELz6gVmqB/7JHiVKMwTIvvPhIx3of9X2VgymB/KMjCgq8Euw8Wk= =TdSX -----END PGP SIGNATURE-----
diff -Nru xdmf-2.1.dfsg.1/debian/changelog xdmf-2.1.dfsg.1/debian/changelog --- xdmf-2.1.dfsg.1/debian/changelog 2016-04-03 15:25:50.000000000 +0200 +++ xdmf-2.1.dfsg.1/debian/changelog 2016-10-21 19:55:29.000000000 +0200 @@ -1,3 +1,10 @@ +xdmf (2.1.dfsg.1-15.1) unstable; urgency=medium + + * Non-maintainer upload. + * New patch hdf5-1.10.patch to fix FTBFS against HDF5 1.10 + + -- Gilles Filippini <p...@debian.org> Sat, 23 Jul 2016 15:06:23 +0200 + xdmf (2.1.dfsg.1-15) unstable; urgency=medium * Fix Typo in depends lib*gz*stream-dev. Closes: 819872 diff -Nru xdmf-2.1.dfsg.1/debian/patches/hdf5-1.10.patch xdmf-2.1.dfsg.1/debian/patches/hdf5-1.10.patch --- xdmf-2.1.dfsg.1/debian/patches/hdf5-1.10.patch 1970-01-01 01:00:00.000000000 +0100 +++ xdmf-2.1.dfsg.1/debian/patches/hdf5-1.10.patch 2016-10-21 19:55:29.000000000 +0200 @@ -0,0 +1,47 @@ +Index: xdmf-2.1.dfsg.1/libsrc/XdmfH5Driver.cxx +=================================================================== +--- xdmf-2.1.dfsg.1.orig/libsrc/XdmfH5Driver.cxx ++++ xdmf-2.1.dfsg.1/libsrc/XdmfH5Driver.cxx +@@ -133,14 +133,19 @@ static herr_t H5FD_dsm_close(H5FD_t *_fi + static herr_t H5FD_dsm_flush(H5FD_t *_file); + #endif + static int H5FD_dsm_cmp(const H5FD_t *_f1, const H5FD_t *_f2); ++#if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=10)) ++static haddr_t H5FD_dsm_get_eof(const H5FD_t *_file, H5FD_mem_t type); ++#elif ((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=8)) ++static haddr_t H5FD_dsm_get_eof(const H5FD_t *_file); ++#else ++static haddr_t H5FD_dsm_get_eof(H5FD_t *_file); ++#endif + #if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=8)) + static haddr_t H5FD_dsm_get_eoa(const H5FD_t *_file, H5FD_mem_t type); + static herr_t H5FD_dsm_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr); +-static haddr_t H5FD_dsm_get_eof(const H5FD_t *_file); + #else + static haddr_t H5FD_dsm_get_eoa(H5FD_t *_file); + static herr_t H5FD_dsm_set_eoa(H5FD_t *_file, haddr_t addr); +-static haddr_t H5FD_dsm_get_eof(H5FD_t *_file); + #endif + static herr_t H5FD_dsm_read(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr, + DSM_HSIZE_T size, void *buf); +@@ -152,6 +157,9 @@ static const H5FD_class_t H5FD_dsm_g = { + "dsm", /*name */ + MAXADDR, /*maxaddr */ + H5F_CLOSE_WEAK, /*fc_degree */ ++#if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=10)) ++ NULL, /* terminate */ ++#endif + NULL, /*sb_size */ + NULL, /*sb_encode */ + NULL, /*sb_decode */ +@@ -684,7 +692,9 @@ H5FD_dsm_set_eoa(H5FD_t *_file, haddr_t + *------------------------------------------------------------------------- + */ + static haddr_t +-#if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=8)) ++#if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=10)) ++H5FD_dsm_get_eof(const H5FD_t *_file, H5FD_mem_t type) ++#elif ((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=8)) + H5FD_dsm_get_eof(const H5FD_t *_file) + #else + H5FD_dsm_get_eof(H5FD_t *_file) diff -Nru xdmf-2.1.dfsg.1/debian/patches/series xdmf-2.1.dfsg.1/debian/patches/series --- xdmf-2.1.dfsg.1/debian/patches/series 2016-04-03 15:25:50.000000000 +0200 +++ xdmf-2.1.dfsg.1/debian/patches/series 2016-10-21 19:55:29.000000000 +0200 @@ -5,3 +5,4 @@ c++11.patch gzstream.patch python-install-dir.patch +hdf5-1.10.patch