projects/aports·blob master · refs

119 lines · 5.7 KiB

1Patch-Source: https://src.fedoraproject.org/rpms/med/raw/rawhide/f/hdf5-1.14.patch
2
3diff -rupN --no-dereference med-5.0.0/config/cmake_files/medMacros.cmake med-5.0.0-new/config/cmake_files/medMacros.cmake
4--- med-5.0.0/config/cmake_files/medMacros.cmake 2025-01-24 00:28:04.460898497 +0100
5+++ med-5.0.0-new/config/cmake_files/medMacros.cmake 2025-01-24 00:28:04.857640862 +0100
6@@ -447,7 +447,7 @@ MACRO(MED_FIND_HDF5)
7 ##
8 ## Requires 1.12.x version
9 ##
10- IF (NOT HDF_VERSION_MAJOR_REF EQUAL 1 OR NOT HDF_VERSION_MINOR_REF EQUAL 12 OR NOT HDF_VERSION_RELEASE_REF GREATER 0)
11+ IF (HDF5_VERSION VERSION_LESS 1.12.1)
12 MESSAGE(FATAL_ERROR "HDF5 version is ${HDF_VERSION_REF}. Only versions >= 1.12.1 are supported.")
13 ENDIF()
14 ##
15diff -rupN --no-dereference med-5.0.0/src/ci/MEDfileCompatibility.c med-5.0.0-new/src/ci/MEDfileCompatibility.c
16--- med-5.0.0/src/ci/MEDfileCompatibility.c 2023-06-05 14:14:44.000000000 +0200
17+++ med-5.0.0-new/src/ci/MEDfileCompatibility.c 2025-01-24 00:28:04.858068408 +0100
18@@ -116,7 +116,7 @@ MEDfileCompatibility(const char* const f
19 #if MED_NUM_MAJEUR != 5
20 #error "Don't forget to update the test version here when you change the major version of the library !"
21 #endif
22-#if H5_VERS_MINOR > 12
23+#if H5_VERS_MINOR > 14
24 #error "Don't forget to check the compatibility version of the library, depending on the internal hdf model choice !"
25 #error "Cf. _MEDfileCreate ..."
26 #endif
27diff -rupN --no-dereference med-5.0.0/src/hdfi/_MEDfileCreate.c med-5.0.0-new/src/hdfi/_MEDfileCreate.c
28--- med-5.0.0/src/hdfi/_MEDfileCreate.c 2023-06-05 14:14:45.000000000 +0200
29+++ med-5.0.0-new/src/hdfi/_MEDfileCreate.c 2025-01-24 00:28:04.858334666 +0100
30@@ -189,7 +189,7 @@ med_idt _MEDfileCreate(const char * cons
31 * Cette ligne est censée obliger HDF à ne pas utiliser un modèle interne différent de 1.10.z
32 * Un test autoconf permet de fixer un intervalle de version HDF à MED.
33 */
34-#if H5_VERS_MINOR > 12
35+#if H5_VERS_MINOR > 14
36 #error "Don't forget to change the compatibility version of the library !"
37 #endif
38
39diff -rupN --no-dereference med-5.0.0/src/hdfi/_MEDfileOpen.c med-5.0.0-new/src/hdfi/_MEDfileOpen.c
40--- med-5.0.0/src/hdfi/_MEDfileOpen.c 2023-06-05 14:14:45.000000000 +0200
41+++ med-5.0.0-new/src/hdfi/_MEDfileOpen.c 2025-01-24 00:28:04.858574380 +0100
42@@ -113,7 +113,7 @@ med_idt _MEDfileOpen(const char * const
43 has been set in the group creation property list (see H5Pset_link_creation_order).
44 */
45
46-#if H5_VERS_MINOR > 12
47+#if H5_VERS_MINOR > 14
48 #error "Don't forget to change the compatibility version of the library !"
49 #endif
50 /* L'avantage de bloquer le modèle interne HDF5
51diff -rupN --no-dereference med-5.0.0/src/hdfi/_MEDfileOpenForImport.c med-5.0.0-new/src/hdfi/_MEDfileOpenForImport.c
52--- med-5.0.0/src/hdfi/_MEDfileOpenForImport.c 2023-06-05 14:14:45.000000000 +0200
53+++ med-5.0.0-new/src/hdfi/_MEDfileOpenForImport.c 2025-01-24 00:28:04.858834390 +0100
54@@ -53,7 +53,7 @@ med_idt _MEDfileOpenForImport(const cha
55 }
56
57
58-#if H5_VERS_MINOR > 12
59+#if H5_VERS_MINOR > 14
60 #error "Don't forget to change the compatibility version of the library !"
61 #endif
62 /* L'avantage de bloquer le modèle interne HDF5
63diff -rupN --no-dereference med-5.0.0/src/hdfi/_MEDmemFileOpen.c med-5.0.0-new/src/hdfi/_MEDmemFileOpen.c
64--- med-5.0.0/src/hdfi/_MEDmemFileOpen.c 2023-06-05 14:14:45.000000000 +0200
65+++ med-5.0.0-new/src/hdfi/_MEDmemFileOpen.c 2025-01-24 00:28:04.859128966 +0100
66@@ -439,7 +439,7 @@ med_idt _MEDmemFileOpen(const char * con
67 goto ERROR;
68 }
69
70-#if H5_VERS_MINOR > 12
71+#if H5_VERS_MINOR > 14
72 #error "Don't forget to change the compatibility version of the library !"
73 #endif
74 if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_V112, H5F_LIBVER_V112 ) ) {
75@@ -506,7 +506,7 @@ med_idt _MEDmemFileOpen(const char * con
76 goto ERROR;
77 }
78 _fversionMM = 100*_fmajor+10*_fminor;
79-#if H5_VERS_MINOR > 12
80+#if H5_VERS_MINOR > 14
81 #error "Don't forget to change the compatibility version of the library !"
82 #endif
83 if ( _fversionMM < 500 ) { /*100*MED_NUM_MAJEUR+10*MED_NUM_MINEUR*/
84diff -rupN --no-dereference med-5.0.0/src/hdfi/_MEDparFileCreate.c med-5.0.0-new/src/hdfi/_MEDparFileCreate.c
85--- med-5.0.0/src/hdfi/_MEDparFileCreate.c 2023-06-05 14:14:45.000000000 +0200
86+++ med-5.0.0-new/src/hdfi/_MEDparFileCreate.c 2025-01-24 00:28:04.859422685 +0100
87@@ -64,7 +64,7 @@ med_idt _MEDparFileCreate(const char * c
88 * En HDF5-1.10.0p1 cela n'a aucun effet !
89 * Un test autoconf permet de fixer un intervalle de version HDF à MED.
90 */
91-#if H5_VERS_MINOR > 12
92+#if H5_VERS_MINOR > 14
93 #error "Don't forget to change the compatibility version of the library !"
94 #endif
95
96diff -rupN --no-dereference med-5.0.0/src/hdfi/_MEDparFileOpen.c med-5.0.0-new/src/hdfi/_MEDparFileOpen.c
97--- med-5.0.0/src/hdfi/_MEDparFileOpen.c 2023-06-05 14:14:45.000000000 +0200
98+++ med-5.0.0-new/src/hdfi/_MEDparFileOpen.c 2025-01-24 00:28:04.859632596 +0100
99@@ -86,7 +86,7 @@ med_idt _MEDparFileOpen(const char * con
100 }
101 _fversionMM = 100*_fmajor+10*_fminor;
102
103-#if H5_VERS_MINOR > 12
104+#if H5_VERS_MINOR > 14
105 #error "Don't forget to change the compatibility version of the library !"
106 #endif
107 if ( _fversionMM < 500 ) { /*100*MED_NUM_MAJEUR+10*MED_NUM_MINEUR*/
108diff -rupN --no-dereference med-5.0.0/src/misc/MEDversionedApi3C.c med-5.0.0-new/src/misc/MEDversionedApi3C.c
109--- med-5.0.0/src/misc/MEDversionedApi3C.c 2023-06-05 14:14:45.000000000 +0200
110+++ med-5.0.0-new/src/misc/MEDversionedApi3C.c 2025-01-24 00:28:04.859890990 +0100
111@@ -114,7 +114,7 @@ MedFuncType _MEDversionedApi3( const cha
112 /* (_fversionMM <= (100*MED_NUM_MAJEUR+10*MED_NUM_MINEUR) ) */
113 /* ) { */
114
115-#if H5_VERS_MINOR > 12
116+#if H5_VERS_MINOR > 14
117 #error "Don't forget to change the compatibility version of the library !"
118 #endif
119