Bug#916971: gmsh: diff for NMU version 3.0.6+dfsg1-4.1
Hello Gilles,
thanks for the NMU! Feel free to put it into the DELAYED/0.
Regards
Anton
Am So., 30. Dez. 2018 um 12:24 Uhr schrieb Gilles Filippini :
>
> Control: tags 916971 + pending
>
> Dear maintainer,
>
> I've prepared an NMU for gmsh (versioned as 3.0.6+dfsg1-4.1) and
> uploaded it to DELAYED/7. Please feel free to tell me if I
> should delay it longer.
>
> Regards,
>
> _g.
>
>
> diff -Nru gmsh-3.0.6+dfsg1/debian/changelog gmsh-3.0.6+dfsg1/debian/changelog
> --- gmsh-3.0.6+dfsg1/debian/changelog 2018-12-03 01:47:52.0 +0100
> +++ gmsh-3.0.6+dfsg1/debian/changelog 2018-12-30 10:09:26.0 +0100
> @@ -1,3 +1,11 @@
> +gmsh (3.0.6+dfsg1-4.1) unstable; urgency=medium
> +
> + * Non-maintainer upload.
> + * New patch support-med-4.patch to fix FTBFS against med-fichier 4.0.0
> +(Closes: #916971)
> +
> + -- Gilles Filippini Sun, 30 Dec 2018 10:09:26 +0100
> +
> gmsh (3.0.6+dfsg1-4) unstable; urgency=medium
> [ Joost van Zwieten ]
> diff -Nru gmsh-3.0.6+dfsg1/debian/patches/series
> gmsh-3.0.6+dfsg1/debian/patches/series
> --- gmsh-3.0.6+dfsg1/debian/patches/series 2018-12-03 01:47:52.0
> +0100
> +++ gmsh-3.0.6+dfsg1/debian/patches/series 2018-12-24 09:28:43.0
> +0100
> @@ -3,3 +3,4 @@
> 30_delete_gl2ps_from_source.patch
> 40_gnuinstalldirs.patch
> 140_drop_css.patch
> +support-med-4.patch
> diff -Nru gmsh-3.0.6+dfsg1/debian/patches/support-med-4.patch
> gmsh-3.0.6+dfsg1/debian/patches/support-med-4.patch
> --- gmsh-3.0.6+dfsg1/debian/patches/support-med-4.patch 1970-01-01
> 01:00:00.0 +0100
> +++ gmsh-3.0.6+dfsg1/debian/patches/support-med-4.patch 2018-12-24
> 09:28:43.0 +0100
> @@ -0,0 +1,386 @@
> +Index: gmsh-3.0.6+dfsg1/Geo/GModelIO_MED.cpp
> +===
> +--- gmsh-3.0.6+dfsg1.orig/Geo/GModelIO_MED.cpp
> gmsh-3.0.6+dfsg1/Geo/GModelIO_MED.cpp
> +@@ -29,7 +29,7 @@ extern "C" {
> + #include
> + }
> + +-#if (MED_MAJOR_NUM == 3)
> ++#if (MED_MAJOR_NUM >= 3)
> + // To avoid too many ifdefs below we use defines for the bits of the
> + // API that did not change too much between MED2 and MED3. If we remove
> + // MED2 support at some point, please remove these defines and replace
> +@@ -69,7 +69,7 @@ med_geometrie_element msh2medElementType
> + case MSH_HEX_20: return MED_HEXA20;
> + case MSH_PRI_15: return MED_PENTA15;
> + case MSH_PYR_13: return MED_PYRA13;
> +-#if (MED_MAJOR_NUM == 3)
> ++#if (MED_MAJOR_NUM >= 3)
> + case MSH_QUA_9: return MED_QUAD9;
> + case MSH_HEX_27: return MED_HEXA27;
> + #endif
> +@@ -95,7 +95,7 @@ int med2mshElementType(med_geometrie_ele
> + case MED_HEXA20: return MSH_HEX_20;
> + case MED_PENTA15: return MSH_PRI_15;
> + case MED_PYRA13: return MSH_PYR_13;
> +-#if (MED_MAJOR_NUM == 3)
> ++#if (MED_MAJOR_NUM >= 3)
> + case MED_QUAD9: return MSH_QUA_9;
> + case MED_HEXA27: return MSH_HEX_27;
> + #endif
> +@@ -113,7 +113,7 @@ int med2mshNodeIndex(med_geometrie_eleme
> + case MED_TRIA6:
> + case MED_QUAD4:
> + case MED_QUAD8:
> +-#if (MED_MAJOR_NUM == 3)
> ++#if (MED_MAJOR_NUM >= 3)
> + case MED_QUAD9:
> + #endif
> + return k; // same node numbering as in Gmsh
> +@@ -133,7 +133,7 @@ int med2mshNodeIndex(med_geometrie_eleme
> + static const int map[20] =
> {0,1,3,2,4,5,6,7,8,9,10,11,16,17,18,19,12,13,14,15};
> + return map[k];
> + }
> +-#if (MED_MAJOR_NUM == 3)
> ++#if (MED_MAJOR_NUM >= 3)
> + case MED_HEXA27: {
> + static const int map[27] =
> {0,1,3,2,4,5,6,7,8,9,10,11,16,17,18,19,12,13,14,15,
> + 20, 22, 21, 23, 24, 25, 26};
> +@@ -185,7 +185,7 @@ int GModel::readMED(const std::string
> + char meshName[MED_TAILLE_NOM + 1], meshDesc[MED_TAILLE_DESC + 1];
> + med_int spaceDim;
> + med_maillage meshType;
> +-#if (MED_MAJOR_NUM == 3)
> ++#if (MED_MAJOR_NUM >= 3)
> + med_int meshDim, nStep;
> + char dtUnit[MED_SNAME_SIZE + 1];
> + char axisName[3 * MED_SNAME_SIZE + 1], axisUnit[3 * MED_SNAME_SIZE + 1];
> +@@ -241,7 +241,7 @@ int GModel::readMED(const std::string
> + char meshName[MED_TAILLE_NOM + 1], meshDesc[MED_TAILLE_DESC + 1];
> + med_int spaceDim, nStep = 1;
> + med_maillage meshType;
> +-#if (MED_MAJOR_NUM == 3)
> ++#if (MED_MAJOR_NUM >= 3)
> + med_int meshDim;
> + char dtUnit[MED_SNAME_SIZE + 1];
> + char axisName[3 * MED_SNAME_SIZE + 1], axisUnit[3 * MED_SNAME_SIZE + 1];
> +@@ -276,7 +276,7 @@ int GModel::readMED(const std::string
> + MEDversionLire(fid, [0], [1], [2]);
> + + // read nodes
> +-#if (MED_MAJOR_NUM == 3)
> ++#if (MED_MAJOR_NUM >= 3)
> + med_bool changeOfCoord, geoTransform;
> + med_int numNodes = MEDmeshnEntity(fid, meshName, MED_NO_DT, MED_NO_IT,
> MED_NODE,
> + MED_NO_GEOTYPE, MED_COORDINATE,
> MED_NO_CMODE,
> +@@ -295,7 +295,7 @@ int GModel::readMED(const std::string
> + }
> + std::vector verts(numNodes);
> + std::vector coord(spaceDim * numNodes);
>
Bug#916971: gmsh: diff for NMU version 3.0.6+dfsg1-4.1
Control: tags 916971 + pending
Dear maintainer,
I've prepared an NMU for gmsh (versioned as 3.0.6+dfsg1-4.1) and
uploaded it to DELAYED/7. Please feel free to tell me if I
should delay it longer.
Regards,
_g.
diff -Nru gmsh-3.0.6+dfsg1/debian/changelog gmsh-3.0.6+dfsg1/debian/changelog
--- gmsh-3.0.6+dfsg1/debian/changelog 2018-12-03 01:47:52.0 +0100
+++ gmsh-3.0.6+dfsg1/debian/changelog 2018-12-30 10:09:26.0 +0100
@@ -1,3 +1,11 @@
+gmsh (3.0.6+dfsg1-4.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * New patch support-med-4.patch to fix FTBFS against med-fichier 4.0.0
+(Closes: #916971)
+
+ -- Gilles Filippini Sun, 30 Dec 2018 10:09:26 +0100
+
gmsh (3.0.6+dfsg1-4) unstable; urgency=medium
[ Joost van Zwieten ]
diff -Nru gmsh-3.0.6+dfsg1/debian/patches/series
gmsh-3.0.6+dfsg1/debian/patches/series
--- gmsh-3.0.6+dfsg1/debian/patches/series 2018-12-03 01:47:52.0
+0100
+++ gmsh-3.0.6+dfsg1/debian/patches/series 2018-12-24 09:28:43.0
+0100
@@ -3,3 +3,4 @@
30_delete_gl2ps_from_source.patch
40_gnuinstalldirs.patch
140_drop_css.patch
+support-med-4.patch
diff -Nru gmsh-3.0.6+dfsg1/debian/patches/support-med-4.patch
gmsh-3.0.6+dfsg1/debian/patches/support-med-4.patch
--- gmsh-3.0.6+dfsg1/debian/patches/support-med-4.patch 1970-01-01
01:00:00.0 +0100
+++ gmsh-3.0.6+dfsg1/debian/patches/support-med-4.patch 2018-12-24
09:28:43.0 +0100
@@ -0,0 +1,386 @@
+Index: gmsh-3.0.6+dfsg1/Geo/GModelIO_MED.cpp
+===
+--- gmsh-3.0.6+dfsg1.orig/Geo/GModelIO_MED.cpp
gmsh-3.0.6+dfsg1/Geo/GModelIO_MED.cpp
+@@ -29,7 +29,7 @@ extern "C" {
+ #include
+ }
+ +-#if (MED_MAJOR_NUM == 3)
++#if (MED_MAJOR_NUM >= 3)
+ // To avoid too many ifdefs below we use defines for the bits of the
+ // API that did not change too much between MED2 and MED3. If we remove
+ // MED2 support at some point, please remove these defines and replace
+@@ -69,7 +69,7 @@ med_geometrie_element msh2medElementType
+ case MSH_HEX_20: return MED_HEXA20;
+ case MSH_PRI_15: return MED_PENTA15;
+ case MSH_PYR_13: return MED_PYRA13;
+-#if (MED_MAJOR_NUM == 3)
++#if (MED_MAJOR_NUM >= 3)
+ case MSH_QUA_9: return MED_QUAD9;
+ case MSH_HEX_27: return MED_HEXA27;
+ #endif
+@@ -95,7 +95,7 @@ int med2mshElementType(med_geometrie_ele
+ case MED_HEXA20: return MSH_HEX_20;
+ case MED_PENTA15: return MSH_PRI_15;
+ case MED_PYRA13: return MSH_PYR_13;
+-#if (MED_MAJOR_NUM == 3)
++#if (MED_MAJOR_NUM >= 3)
+ case MED_QUAD9: return MSH_QUA_9;
+ case MED_HEXA27: return MSH_HEX_27;
+ #endif
+@@ -113,7 +113,7 @@ int med2mshNodeIndex(med_geometrie_eleme
+ case MED_TRIA6:
+ case MED_QUAD4:
+ case MED_QUAD8:
+-#if (MED_MAJOR_NUM == 3)
++#if (MED_MAJOR_NUM >= 3)
+ case MED_QUAD9:
+ #endif
+ return k; // same node numbering as in Gmsh
+@@ -133,7 +133,7 @@ int med2mshNodeIndex(med_geometrie_eleme
+ static const int map[20] =
{0,1,3,2,4,5,6,7,8,9,10,11,16,17,18,19,12,13,14,15};
+ return map[k];
+ }
+-#if (MED_MAJOR_NUM == 3)
++#if (MED_MAJOR_NUM >= 3)
+ case MED_HEXA27: {
+ static const int map[27] =
{0,1,3,2,4,5,6,7,8,9,10,11,16,17,18,19,12,13,14,15,
+ 20, 22, 21, 23, 24, 25, 26};
+@@ -185,7 +185,7 @@ int GModel::readMED(const std::string
+ char meshName[MED_TAILLE_NOM + 1], meshDesc[MED_TAILLE_DESC + 1];
+ med_int spaceDim;
+ med_maillage meshType;
+-#if (MED_MAJOR_NUM == 3)
++#if (MED_MAJOR_NUM >= 3)
+ med_int meshDim, nStep;
+ char dtUnit[MED_SNAME_SIZE + 1];
+ char axisName[3 * MED_SNAME_SIZE + 1], axisUnit[3 * MED_SNAME_SIZE + 1];
+@@ -241,7 +241,7 @@ int GModel::readMED(const std::string
+ char meshName[MED_TAILLE_NOM + 1], meshDesc[MED_TAILLE_DESC + 1];
+ med_int spaceDim, nStep = 1;
+ med_maillage meshType;
+-#if (MED_MAJOR_NUM == 3)
++#if (MED_MAJOR_NUM >= 3)
+ med_int meshDim;
+ char dtUnit[MED_SNAME_SIZE + 1];
+ char axisName[3 * MED_SNAME_SIZE + 1], axisUnit[3 * MED_SNAME_SIZE + 1];
+@@ -276,7 +276,7 @@ int GModel::readMED(const std::string
+ MEDversionLire(fid, [0], [1], [2]);
+ + // read nodes
+-#if (MED_MAJOR_NUM == 3)
++#if (MED_MAJOR_NUM >= 3)
+ med_bool changeOfCoord, geoTransform;
+ med_int numNodes = MEDmeshnEntity(fid, meshName, MED_NO_DT, MED_NO_IT,
MED_NODE,
+ MED_NO_GEOTYPE, MED_COORDINATE,
MED_NO_CMODE,
+@@ -295,7 +295,7 @@ int GModel::readMED(const std::string
+ }
+ std::vector verts(numNodes);
+ std::vector coord(spaceDim * numNodes);
+-#if (MED_MAJOR_NUM == 3)
++#if (MED_MAJOR_NUM >= 3)
+ if(MEDmeshNodeCoordinateRd(fid, meshName, MED_NO_DT, MED_NO_IT,
MED_FULL_INTERLACE,
+ [0]) < 0){
+ #else
+@@ -310,7 +310,7 @@ int GModel::readMED(const std::string
+ }
+ + std::vector nodeTags(numNodes);
+-#if (MED_MAJOR_NUM == 3)
++#if (MED_MAJOR_NUM >= 3)
+ if(MEDmeshEntityNumberRd(fid, meshName, MED_NO_DT,
