tags 659132 patch
thanks
Hello Adam,
Here is a patch. It looks like netgen is the last package depending
on opencascade, maybe we can get rid of it soon ;)
I am pretty sure that netgen needs only -foundation and -modeling, but
I did not investigate this issue in order to provide a minimal patch.
I had to patch debian/patches/occ-6.5.0.patch because a method has
been renamed between OCCT 6.3.0 and 6.5.0. I added an alias in OCC
Debian packages in order to help upgrades (this is why you did not
notice this breakage), but I do not want to maintain it forever and
dropped it in OCE.
Denis
diff --git a/debian/control b/debian/control
index 2e909b9..59643c7 100644
--- a/debian/control
+++ b/debian/control
@@ -7,9 +7,9 @@ DM-Upload-Allowed: yes
Build-Depends: quilt, cdbs, debhelper (>= 7), autotools-dev, automake, libtool,
g++ (>= 4.0), tcl8.5-dev, tk8.5-dev, tix-dev (>= 8.4.3-2),
docbook-to-man, libxmu-dev, libglu1-mesa-dev,
- libgl1-mesa-dev|nvidia-glx-dev, libopencascade-foundation-dev,
- libopencascade-modeling-dev (>= 6.5.0.dfsg-1), libopencascade-visualization-dev,
- libopencascade-ocaf-dev, libopencascade-ocaf-lite-dev, libtogl-dev (>= 1.7),
+ libgl1-mesa-dev|nvidia-glx-dev, liboce-foundation-dev,
+ liboce-modeling-dev, liboce-visualization-dev,
+ liboce-ocaf-dev, liboce-ocaf-lite-dev, libtogl-dev (>= 1.7),
libswscale-dev, libavformat-dev, libavcodec-dev, libjpeg62-dev, libbz2-dev
Standards-Version: 3.9.1
Vcs-Git: git://git.debian.org/git/debian-science/packages/netgen.git
diff --git a/debian/patches/configure-occ.patch b/debian/patches/configure-occ.patch
index 6313a7a..12df9ad 100644
--- a/debian/patches/configure-occ.patch
+++ b/debian/patches/configure-occ.patch
@@ -9,7 +9,7 @@ Index: netgen/configure.ac
if test a$occon = atrue ; then
- AC_SUBST([OCCFLAGS], ["-DOCCGEOMETRY -I$occdir/inc"])
-+ AC_SUBST([OCCFLAGS], ["-DOCCGEOMETRY -I$occdir/include/opencascade"])
++ AC_SUBST([OCCFLAGS], ["-DOCCGEOMETRY -I$occdir/include/oce"])
AC_SUBST([OCCLIBS], ["-L$occdir/lib -lTKernel -lTKGeomBase -lTKMath -lTKG2d -lTKG3d -lTKXSBase -lTKOffset -lTKFillet -lTKShHealing -lTKMesh -lTKMeshVS -lTKTopAlgo -lTKGeomAlgo -lTKBool -lTKPrim -lTKBO -lTKIGES -lTKBRep -lTKSTEPBase -lTKSTEP -lTKSTL -lTKSTEPAttr -lTKSTEP209 -lTKXDESTEP -lTKXDEIGES -lTKXCAF -lTKLCAF -lFWOSPlugin"])
# -lTKDCAF
diff --git a/debian/patches/occ-6.5.0.patch b/debian/patches/occ-6.5.0.patch
index 3ac30ef..7b23c39 100644
--- a/debian/patches/occ-6.5.0.patch
+++ b/debian/patches/occ-6.5.0.patch
@@ -1,3 +1,16 @@
+Index: netgen/libsrc/occ/Partition_Inter3d.cxx
+===================================================================
+--- netgen.orig/libsrc/occ/Partition_Inter3d.cxx 2012-03-03 20:29:19.823206572 +0100
++++ netgen/libsrc/occ/Partition_Inter3d.cxx 2012-03-03 20:29:35.227282960 +0100
+@@ -243,7 +243,7 @@
+ Standard_Integer i, nbExt = anExtPS.NbExt();
+ Extrema_POnSurf aPOnSurf;
+ for (i = 1; i <= nbExt; ++i )
+- if (anExtPS.Value( i ) <= TolE) {
++ if (anExtPS.SquareDistance( i ) <= TolE) {
+ aPOnSurf = anExtPS.Point( i );
+ break;
+ }
Index: netgen/libsrc/occ/Partition_Loop2d.cxx
===================================================================
--- netgen.orig/libsrc/occ/Partition_Loop2d.cxx
@@ -27,3 +40,16 @@ Index: netgen/libsrc/occ/Partition_Loop2d.cxx
Standard_Real U, f, l;
BRep_Tool::Range (DegEdge, f, l);
+Index: netgen/libsrc/occ/Partition_Spliter.cxx
+===================================================================
+--- netgen.orig/libsrc/occ/Partition_Spliter.cxx 2012-03-03 20:29:19.827206593 +0100
++++ netgen/libsrc/occ/Partition_Spliter.cxx 2012-03-03 20:29:35.231282976 +0100
+@@ -1169,7 +1169,7 @@
+ for (; j<=nbj && ok; ++j) {
+ if (Extrema.IsMin(j)) {
+ hasMin = Standard_True;
+- ok = Extrema.Value(j) <= tol;
++ ok = Extrema.SquareDistance(j) <= tol;
+ }
+ }
+ }
