Dear maintainer, I've prepared an NMU for netgen (versioned as 6.2.2006+really6.2.1905+dfsg-5.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer.
Regards.
diff -Nru netgen-6.2.2006+really6.2.1905+dfsg/debian/changelog netgen-6.2.2006+really6.2.1905+dfsg/debian/changelog --- netgen-6.2.2006+really6.2.1905+dfsg/debian/changelog 2022-01-05 06:26:20.000000000 +0100 +++ netgen-6.2.2006+really6.2.1905+dfsg/debian/changelog 2022-08-16 08:15:04.000000000 +0200 @@ -1,3 +1,11 @@ +netgen (6.2.2006+really6.2.1905+dfsg-5.1) unstable; urgency=medium + + * Non-maintainer upload. + * Upload package with patchset for opencascade 7.6.3, thanks to Andreas Hasenack + providing the patch. (Closes: #1014964) + + -- Tobias Frost <t...@debian.org> Tue, 16 Aug 2022 08:15:04 +0200 + netgen (6.2.2006+really6.2.1905+dfsg-5) unstable; urgency=medium * [a301dc9] Add upstream arm pickling fix patch (Closes: #995416) diff -Nru netgen-6.2.2006+really6.2.1905+dfsg/debian/patches/fix-occt-7.6.0-ftbfs-1.patch netgen-6.2.2006+really6.2.1905+dfsg/debian/patches/fix-occt-7.6.0-ftbfs-1.patch --- netgen-6.2.2006+really6.2.1905+dfsg/debian/patches/fix-occt-7.6.0-ftbfs-1.patch 1970-01-01 01:00:00.000000000 +0100 +++ netgen-6.2.2006+really6.2.1905+dfsg/debian/patches/fix-occt-7.6.0-ftbfs-1.patch 2022-08-16 08:03:46.000000000 +0200 @@ -0,0 +1,88 @@ +From 08993ae5e2b687e6c21d045b0a9a3f7e8722f17d Mon Sep 17 00:00:00 2001 +From: Joachim Schoeberl <joachim.schoeb...@tuwien.ac.at> +Date: Tue, 31 Aug 2021 00:37:41 +0200 +Subject: [PATCH] fixes for OCCT 7.6.0-dev + +--- + libsrc/occ/occgenmesh.cpp | 10 +++++++--- + libsrc/occ/python_occ_shapes.cpp | 21 ++++++++++----------- + libsrc/occ/vsocc.cpp | 22 ++++++++++++---------- + 3 files changed, 29 insertions(+), 24 deletions(-) + + Ubuntu backport notes: + - removed diff for python_occ_shapes.cpp which doesn't exist in this version + - updated occgenmesh.cpp diff for this version +Origin: backport, https://github.com/NGSolve/netgen/commit/08993ae5e2b687e6c21d045b0a9a3f7e8722f17d +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1014964 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/netgen/+bug/1983997 +Applied-Upstream: v6.2.2105 +Last-Update: 2022-08-08 + +--- a/libsrc/occ/occgenmesh.cpp ++++ b/libsrc/occ/occgenmesh.cpp +@@ -1154,9 +1154,9 @@ + + for (int k = 1; k <=3; k++) + { +- int n = triangulation->Triangles()(j)(k); +- p[k-1] = triangulation->Nodes()(n).Transformed(loc); +- par[k-1] = triangulation->UVNodes()(n); ++ int n = triangulation->Triangle(j)(k); ++ p[k-1] = triangulation->Node(n).Transformed(loc); ++ par[k-1] = triangulation->UVNode(n); + } + + //double maxside = 0; +--- a/libsrc/occ/vsocc.cpp ++++ b/libsrc/occ/vsocc.cpp +@@ -463,8 +463,9 @@ + glBegin (GL_LINE_STRIP); + for (int j = 1; j <= nbnodes; j++) + { +- gp_Pnt p = (T -> Nodes())(aEdgePoly->Nodes()(j)).Transformed(aEdgeLoc); +- glVertex3f (p.X(), p.Y(), p.Z()); ++ // gp_Pnt p = (T -> Nodes())(aEdgePoly->Nodes()(j)).Transformed(aEdgeLoc); ++ gp_Pnt p = (T -> Node(aEdgePoly->Nodes()(j))).Transformed(aEdgeLoc); ++ glVertex3f (p.X(), p.Y(), p.Z()); + } + glEnd (); + } +@@ -509,10 +510,11 @@ + int nbnodes = aEdgePoly -> NbNodes(); + glBegin (GL_LINE_STRIP); + for (int j = 1; j <= nbnodes; j++) +- { +- gp_Pnt p = (T -> Nodes())(aEdgePoly->Nodes()(j)).Transformed(aEdgeLoc); +- glVertex3f (p.X(), p.Y(), p.Z()); +- } ++ { ++ // gp_Pnt p = (T -> Nodes())(aEdgePoly->Nodes()(j)).Transformed(aEdgeLoc); ++ gp_Pnt p = (T -> Node(aEdgePoly->Node(j))).Transformed(aEdgeLoc); ++ glVertex3f (p.X(), p.Y(), p.Z()); ++ } + glEnd (); + } + +@@ -582,18 +584,18 @@ + gp_Vec n; + + glBegin (GL_TRIANGLES); +- + int ntriangles = triangulation -> NbTriangles(); + for (int j = 1; j <= ntriangles; j++) + { +- Poly_Triangle triangle = (triangulation -> Triangles())(j); ++ Poly_Triangle triangle = (triangulation -> Triangle(j)); + gp_Pnt p[3]; + for (int k = 1; k <= 3; k++) +- p[k-1] = (triangulation -> Nodes())(triangle(k)).Transformed(loc); ++ p[k-1] = (triangulation -> Node(triangle(k))).Transformed(loc); + + for (int k = 1; k <= 3; k++) + { +- uv = (triangulation -> UVNodes())(triangle(k)); ++ // uv = (triangulation -> UVNodes())(triangle(k)); ++ uv = triangulation -> UVNode(triangle(k)); + prop.SetParameters (uv.X(), uv.Y()); + + // surf->D0 (uv.X(), uv.Y(), pnt); diff -Nru netgen-6.2.2006+really6.2.1905+dfsg/debian/patches/fix-occt-7.6.0-ftbfs-2.patch netgen-6.2.2006+really6.2.1905+dfsg/debian/patches/fix-occt-7.6.0-ftbfs-2.patch --- netgen-6.2.2006+really6.2.1905+dfsg/debian/patches/fix-occt-7.6.0-ftbfs-2.patch 1970-01-01 01:00:00.000000000 +0100 +++ netgen-6.2.2006+really6.2.1905+dfsg/debian/patches/fix-occt-7.6.0-ftbfs-2.patch 2022-08-16 08:03:46.000000000 +0200 @@ -0,0 +1,77 @@ +From 56fb4a72fca43c7e19261ab2d5964e1925bafd46 Mon Sep 17 00:00:00 2001 +From: Joachim Schoeberl <joachim.schoeb...@tuwien.ac.at> +Date: Tue, 31 Aug 2021 00:55:59 +0200 +Subject: [PATCH] fix for OCCT 7.4 and older + +--- + libsrc/occ/python_occ_shapes.cpp | 4 ++-- + libsrc/occ/vsocc.cpp | 26 ++++++++++++++++++++------ + 2 files changed, 22 insertions(+), 8 deletions(-) + + Ubuntu backport notes: + - removed diff for python_occ_shapes.cpp which doesn't exist in this version + +Origin: upstream, https://github.com/NGSolve/netgen/commit/56fb4a72fca43c7e19261ab2d5964e1925bafd46 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1014964 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/netgen/+bug/1983997 +Applied-Upstream: v6.2.2105 +Last-Update: 2022-08-08 + +diff --git a/libsrc/occ/vsocc.cpp b/libsrc/occ/vsocc.cpp +index da741dd9..d6c76f7d 100644 +--- a/libsrc/occ/vsocc.cpp ++++ b/libsrc/occ/vsocc.cpp +@@ -463,8 +463,11 @@ namespace netgen + glBegin (GL_LINE_STRIP); + for (int j = 1; j <= nbnodes; j++) + { +- // gp_Pnt p = (T -> Nodes())(aEdgePoly->Nodes()(j)).Transformed(aEdgeLoc); +- gp_Pnt p = (T -> Node(aEdgePoly->Nodes()(j))).Transformed(aEdgeLoc); ++#if OCC_VERSION_MAJOR>=7 && OCC_VERSION_MINOR>=5 ++ gp_Pnt p = T -> Node(aEdgePoly->Node(j)).Transformed(aEdgeLoc); ++#else ++ gp_Pnt p = T -> Nodes())(aEdgePoly->Nodes()(j).Transformed(aEdgeLoc); ++#endif + glVertex3f (p.X(), p.Y(), p.Z()); + } + glEnd (); +@@ -511,8 +514,11 @@ namespace netgen + glBegin (GL_LINE_STRIP); + for (int j = 1; j <= nbnodes; j++) + { +- // gp_Pnt p = (T -> Nodes())(aEdgePoly->Nodes()(j)).Transformed(aEdgeLoc); +- gp_Pnt p = (T -> Node(aEdgePoly->Node(j))).Transformed(aEdgeLoc); ++#if OCC_VERSION_MAJOR>=7 && OCC_VERSION_MINOR>=5 ++ gp_Pnt p = T -> Node(aEdgePoly->Node(j)).Transformed(aEdgeLoc); ++#else ++ gp_Pnt p = (T -> Nodes())(aEdgePoly->Nodes()(j)).Transformed(aEdgeLoc); ++#endif + glVertex3f (p.X(), p.Y(), p.Z()); + } + glEnd (); +@@ -587,15 +593,23 @@ namespace netgen + int ntriangles = triangulation -> NbTriangles(); + for (int j = 1; j <= ntriangles; j++) + { +- Poly_Triangle triangle = (triangulation -> Triangle(j)); ++#if OCC_VERSION_MAJOR>=7 && OCC_VERSION_MINOR>=5 ++ Poly_Triangle triangle = triangulation -> Triangle(j); ++#else ++ Poly_Triangle triangle = triangulation -> Triangles()(j); ++#endif ++ + gp_Pnt p[3]; + for (int k = 1; k <= 3; k++) + p[k-1] = (triangulation -> Node(triangle(k))).Transformed(loc); + + for (int k = 1; k <= 3; k++) + { +- // uv = (triangulation -> UVNodes())(triangle(k)); ++#if OCC_VERSION_MAJOR>=7 && OCC_VERSION_MINOR>=5 + uv = triangulation -> UVNode(triangle(k)); ++#else ++ uv = triangulation -> UVNodes())(triangle(k); ++#endif + prop.SetParameters (uv.X(), uv.Y()); + + // surf->D0 (uv.X(), uv.Y(), pnt); diff -Nru netgen-6.2.2006+really6.2.1905+dfsg/debian/patches/fix-occt-7.6.0-ftbfs-3.patch netgen-6.2.2006+really6.2.1905+dfsg/debian/patches/fix-occt-7.6.0-ftbfs-3.patch --- netgen-6.2.2006+really6.2.1905+dfsg/debian/patches/fix-occt-7.6.0-ftbfs-3.patch 1970-01-01 01:00:00.000000000 +0100 +++ netgen-6.2.2006+really6.2.1905+dfsg/debian/patches/fix-occt-7.6.0-ftbfs-3.patch 2022-08-16 08:03:46.000000000 +0200 @@ -0,0 +1,37 @@ +From f856e90d157d086a1d9ee1983b17e823e2b24e19 Mon Sep 17 00:00:00 2001 +From: Joachim Schoeberl <joachim.schoeb...@tuwien.ac.at> +Date: Tue, 31 Aug 2021 01:00:33 +0200 +Subject: [PATCH] fix for OCCT 7.4 and older + +--- + libsrc/occ/vsocc.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Origin: upstream, https://github.com/NGSolve/netgen/commit/f856e90d157d086a1d9ee1983b17e823e2b24e19 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1014964 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/netgen/+bug/1983997 +Applied-Upstream: v6.2.2105 +Last-Update: 2022-08-08 + +diff --git a/libsrc/occ/vsocc.cpp b/libsrc/occ/vsocc.cpp +index d6c76f7d..1b9c5d55 100644 +--- a/libsrc/occ/vsocc.cpp ++++ b/libsrc/occ/vsocc.cpp +@@ -466,7 +466,7 @@ namespace netgen + #if OCC_VERSION_MAJOR>=7 && OCC_VERSION_MINOR>=5 + gp_Pnt p = T -> Node(aEdgePoly->Node(j)).Transformed(aEdgeLoc); + #else +- gp_Pnt p = T -> Nodes())(aEdgePoly->Nodes()(j).Transformed(aEdgeLoc); ++ gp_Pnt p = T -> Nodes()(aEdgePoly->Nodes()(j)).Transformed(aEdgeLoc); + #endif + glVertex3f (p.X(), p.Y(), p.Z()); + } +@@ -608,7 +608,7 @@ namespace netgen + #if OCC_VERSION_MAJOR>=7 && OCC_VERSION_MINOR>=5 + uv = triangulation -> UVNode(triangle(k)); + #else +- uv = triangulation -> UVNodes())(triangle(k); ++ uv = triangulation -> UVNodes()(triangle(k); + #endif + prop.SetParameters (uv.X(), uv.Y()); + diff -Nru netgen-6.2.2006+really6.2.1905+dfsg/debian/patches/fix-occt-7.6.0-ftbfs-4.patch netgen-6.2.2006+really6.2.1905+dfsg/debian/patches/fix-occt-7.6.0-ftbfs-4.patch --- netgen-6.2.2006+really6.2.1905+dfsg/debian/patches/fix-occt-7.6.0-ftbfs-4.patch 1970-01-01 01:00:00.000000000 +0100 +++ netgen-6.2.2006+really6.2.1905+dfsg/debian/patches/fix-occt-7.6.0-ftbfs-4.patch 2022-08-16 08:03:46.000000000 +0200 @@ -0,0 +1,28 @@ +From 69f6a9cc908dfe5129fa3ef368747ebddc11a955 Mon Sep 17 00:00:00 2001 +From: Joachim Schoeberl <joachim.schoeb...@tuwien.ac.at> +Date: Tue, 31 Aug 2021 01:05:36 +0200 +Subject: [PATCH] fix for OCCT 7.4 and older + +--- + libsrc/occ/vsocc.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Origin: upstream, https://github.com/NGSolve/netgen/commit/69f6a9cc908dfe5129fa3ef368747ebddc11a955 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1014964 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/netgen/+bug/1983997 +Applied-Upstream: v6.2.2105 +Last-Update: 2022-08-08 + +diff --git a/libsrc/occ/vsocc.cpp b/libsrc/occ/vsocc.cpp +index 1b9c5d55..e565648f 100644 +--- a/libsrc/occ/vsocc.cpp ++++ b/libsrc/occ/vsocc.cpp +@@ -608,7 +608,7 @@ namespace netgen + #if OCC_VERSION_MAJOR>=7 && OCC_VERSION_MINOR>=5 + uv = triangulation -> UVNode(triangle(k)); + #else +- uv = triangulation -> UVNodes()(triangle(k); ++ uv = triangulation -> UVNodes()(triangle(k)); + #endif + prop.SetParameters (uv.X(), uv.Y()); + diff -Nru netgen-6.2.2006+really6.2.1905+dfsg/debian/patches/fix-occt-7.6.0-ftbfs-5.patch netgen-6.2.2006+really6.2.1905+dfsg/debian/patches/fix-occt-7.6.0-ftbfs-5.patch --- netgen-6.2.2006+really6.2.1905+dfsg/debian/patches/fix-occt-7.6.0-ftbfs-5.patch 1970-01-01 01:00:00.000000000 +0100 +++ netgen-6.2.2006+really6.2.1905+dfsg/debian/patches/fix-occt-7.6.0-ftbfs-5.patch 2022-08-16 08:03:46.000000000 +0200 @@ -0,0 +1,71 @@ +From 36a7b24315ebfc158e7006e4a2a62679a5f07224 Mon Sep 17 00:00:00 2001 +From: Joachim Schoeberl <joachim.schoeb...@tuwien.ac.at> +Date: Tue, 31 Aug 2021 13:16:30 +0200 +Subject: [PATCH] OCC - version compatibility fixes + +--- + libsrc/occ/python_occ.cpp | 6 +++--- + libsrc/occ/vsocc.cpp | 11 ++++++++++- + 2 files changed, 13 insertions(+), 4 deletions(-) + + Ubuntu backport notes: + - in vsocc.cpp, instead of commenting the OCC_VERSION #if blocks and settling + on the OCC >= 7.5 behavior as default, properly include the + Standard_Version.hxx header file which defines those macros. I left a + comment in + https://github.com/NGSolve/netgen/commit/36a7b24315ebfc158e7006e4a2a62679a5f07224#r80666045 +Origin: backport, https://github.com/NGSolve/netgen/commit/36a7b24315ebfc158e7006e4a2a62679a5f07224 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1014964 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/netgen/+bug/1983997 +Applied-Upstream: v6.2.2105 +Last-Update: 2022-08-08 + +--- a/libsrc/occ/python_occ.cpp ++++ b/libsrc/occ/python_occ.cpp +@@ -71,15 +71,15 @@ + normals.reserve(normals.size() + triangulation->NbTriangles()*3*3); + for (int j = 1; j < triangulation->NbTriangles()+1; j++) + { +- auto triangle = (triangulation->Triangles())(j); ++ auto triangle = triangulation->Triangle(j); + for (int k = 1; k < 4; k++) +- p[k-1] = (triangulation->Nodes())(triangle(k)).Transformed(loc); ++ p[k-1] = triangulation->Node(triangle(k)).Transformed(loc); + for (int k = 1; k < 4; k++) + { + vertices.insert(vertices.end(),{float(p[k-1].X()), float(p[k-1].Y()), float(p[k-1].Z())}); + trigs.insert(trigs.end(),{count, count+1, count+2,i}); + count += 3; +- uv = (triangulation->UVNodes())(triangle(k)); ++ uv = triangulation->UVNode(triangle(k)); + prop.SetParameters(uv.X(), uv.Y()); + if (prop.IsNormalDefined()) + n = prop.Normal(); +--- a/libsrc/occ/vsocc.cpp ++++ b/libsrc/occ/vsocc.cpp +@@ -17,6 +17,7 @@ + #include "Geom_Curve.hxx" + #include "Poly_Triangulation.hxx" + #include "Poly_Array1OfTriangle.hxx" ++#include "Standard_Version.hxx" + #include "TColgp_Array1OfPnt2d.hxx" + #include "Poly_Triangle.hxx" + #include "Poly_Polygon3D.hxx" +@@ -464,7 +465,7 @@ + for (int j = 1; j <= nbnodes; j++) + { + #if OCC_VERSION_MAJOR>=7 && OCC_VERSION_MINOR>=5 +- gp_Pnt p = T -> Node(aEdgePoly->Node(j)).Transformed(aEdgeLoc); ++ gp_Pnt p = T -> Node(aEdgePoly->Nodes()(j)).Transformed(aEdgeLoc); + #else + gp_Pnt p = T -> Nodes()(aEdgePoly->Nodes()(j)).Transformed(aEdgeLoc); + #endif +@@ -515,7 +516,7 @@ + for (int j = 1; j <= nbnodes; j++) + { + #if OCC_VERSION_MAJOR>=7 && OCC_VERSION_MINOR>=5 +- gp_Pnt p = T -> Node(aEdgePoly->Node(j)).Transformed(aEdgeLoc); ++ gp_Pnt p = T -> Node(aEdgePoly->Nodes()(j)).Transformed(aEdgeLoc); + #else + gp_Pnt p = (T -> Nodes())(aEdgePoly->Nodes()(j)).Transformed(aEdgeLoc); + #endif diff -Nru netgen-6.2.2006+really6.2.1905+dfsg/debian/patches/series netgen-6.2.2006+really6.2.1905+dfsg/debian/patches/series --- netgen-6.2.2006+really6.2.1905+dfsg/debian/patches/series 2022-01-05 06:26:00.000000000 +0100 +++ netgen-6.2.2006+really6.2.1905+dfsg/debian/patches/series 2022-08-16 08:03:46.000000000 +0200 @@ -8,3 +8,8 @@ remove-togl.patch fix-version.patch fix-arm-pickling.patch +fix-occt-7.6.0-ftbfs-1.patch +fix-occt-7.6.0-ftbfs-2.patch +fix-occt-7.6.0-ftbfs-3.patch +fix-occt-7.6.0-ftbfs-4.patch +fix-occt-7.6.0-ftbfs-5.patch
signature.asc
Description: PGP signature
