[SCM] FreeCAD packaging branch, master, updated. debian/0.12.5284-dfsg-4-4-g299b832

[Anton Gladky]

The following commit has been merged in the master branch:
commit d749637e00222e1e23949f6979830837ef071d64
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Sun Mar 18 06:30:53 2012 +0100

    Fix FTBFS during compiling against oce-0.9.1. Thanks to Denis Barbier. (Closes: #664207)

diff --git a/debian/patches/fix_FTBFS_with_oce-0.9.1.patch b/debian/patches/fix_FTBFS_with_oce-0.9.1.patch
new file mode 100644
index 0000000..7b0ce5c
--- /dev/null
+++ b/debian/patches/fix_FTBFS_with_oce-0.9.1.patch
@@ -0,0 +1,91 @@
+Description: fix FTBFS during compiling against oce-0.9.1
+Author: Denis Barbier <bouzim at gmail.com>
+Reviewed-by: Anton Gladky <gladky.anton at gmail.com>
+Origin: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=664207#10
+Bug-Debian: http://bugs.debian.org/664207
+Last-Update: 2012-03-17
+
+--- freecad-0.12.5284-dfsg.orig/src/Mod/Part/App/TopoShape.cpp
++++ freecad-0.12.5284-dfsg/src/Mod/Part/App/TopoShape.cpp
+@@ -1335,7 +1335,7 @@ TopoDS_Shape TopoShape::makeTube(double
+     double u1,u2,v1,v2;
+     surf->Bounds(u1,u2,v1,v2);
+ 
+-    BRepBuilderAPI_MakeFace mkBuilder(surf, umin, umax, v1, v2);
++    BRepBuilderAPI_MakeFace mkBuilder(surf, umin, umax, v1, v2, Precision::Confusion());
+     return mkBuilder.Face();
+ }
+ 
+@@ -1388,7 +1388,7 @@ TopoDS_Shape TopoShape::makeTube() const
+ 
+         Standard_Real u1,u2,v1,v2;
+         mySurface->Bounds(u1,u2,v1,v2);
+-        BRepBuilderAPI_MakeFace mkBuilder(mySurface, u1, u2, v1, v2);
++        BRepBuilderAPI_MakeFace mkBuilder(mySurface, u1, u2, v1, v2, Precision::Confusion());
+         return mkBuilder.Shape();
+     }
+ 
+@@ -1440,7 +1440,7 @@ TopoDS_Shape TopoShape::makeSweep(const
+     mkSweep.Perform(tol, Standard_False, GeomAbs_C1, BSplCLib::MaxDegree(), 1000);
+ 
+     const Handle_Geom_Surface& surf = mkSweep.Surface();
+-    BRepBuilderAPI_MakeFace mkBuilder(surf, umin, umax, vmin, vmax);
++    BRepBuilderAPI_MakeFace mkBuilder(surf, umin, umax, vmin, vmax, Precision::Confusion());
+     return mkBuilder.Face();
+ }
+ 
+--- freecad-0.12.5284-dfsg.orig/src/Mod/Part/App/PrimitiveFeature.cpp
++++ freecad-0.12.5284-dfsg/src/Mod/Part/App/PrimitiveFeature.cpp
+@@ -191,7 +191,7 @@ App::DocumentObjectExecReturn *Plane::ex
+     gp_Pnt pnt(0.0,0.0,0.0);
+     gp_Dir dir(0.0,0.0,1.0);
+     Handle_Geom_Plane aPlane = new Geom_Plane(pnt, dir);
+-    BRepBuilderAPI_MakeFace mkFace(aPlane, 0.0, L, 0.0, W);
++    BRepBuilderAPI_MakeFace mkFace(aPlane, 0.0, L, 0.0, W, Precision::Confusion());
+ 
+     const char *error=0;
+     switch (mkFace.Error())
+--- freecad-0.12.5284-dfsg.orig/src/Mod/Part/App/AppPartPy.cpp
++++ freecad-0.12.5284-dfsg/src/Mod/Part/App/AppPartPy.cpp
+@@ -492,7 +492,7 @@ static PyObject * makePlane(PyObject *se
+             d.SetCoord(vec.x, vec.y, vec.z);
+         }
+         Handle_Geom_Plane aPlane = new Geom_Plane(p, d);
+-        BRepBuilderAPI_MakeFace Face(aPlane, 0.0, length, 0.0, width);
++        BRepBuilderAPI_MakeFace Face(aPlane, 0.0, length, 0.0, width, Precision::Confusion());
+         return new TopoShapeFacePy(new TopoShape((Face.Face()))); 
+     }
+     catch (Standard_DomainError) {
+--- freecad-0.12.5284-dfsg.orig/src/Mod/Part/App/TopoShapeFacePyImp.cpp
++++ freecad-0.12.5284-dfsg/src/Mod/Part/App/TopoShapeFacePyImp.cpp
+@@ -135,7 +135,7 @@ int TopoShapeFacePy::PyInit(PyObject* ar
+                 return -1;
+             }
+ 
+-            BRepBuilderAPI_MakeFace mkFace(S);
++            BRepBuilderAPI_MakeFace mkFace(S, Precision::Confusion());
+             if (bound) {
+                 Py::List list(bound);
+                 for (Py::List::iterator it = list.begin(); it != list.end(); ++it) {
+--- freecad-0.12.5284-dfsg.orig/src/Mod/Part/App/GeometrySurfacePyImp.cpp
++++ freecad-0.12.5284-dfsg/src/Mod/Part/App/GeometrySurfacePyImp.cpp
+@@ -79,7 +79,7 @@ PyObject* GeometrySurfacePy::toShape(PyO
+             s->Bounds(u1,u2,v1,v2);
+             if (!PyArg_ParseTuple(args, "|dddd", &u1,&u2,&v1,&v2))
+                 return 0;
+-            BRepBuilderAPI_MakeFace mkBuilder(s, u1, u2, v1, v2);
++            BRepBuilderAPI_MakeFace mkBuilder(s, u1, u2, v1, v2, Precision::Confusion());
+             TopoDS_Shape sh = mkBuilder.Shape();
+             return new TopoShapeFacePy(new TopoShape(sh));
+         }
+--- freecad-0.12.5284-dfsg.orig/src/Mod/Part/App/Geometry.cpp
++++ freecad-0.12.5284-dfsg/src/Mod/Part/App/Geometry.cpp
+@@ -1252,7 +1252,7 @@ TopoDS_Shape GeomSurface::toShape() cons
+     Handle_Geom_Surface s = Handle_Geom_Surface::DownCast(handle());
+     Standard_Real u1,u2,v1,v2;
+     s->Bounds(u1,u2,v1,v2);
+-    BRepBuilderAPI_MakeFace mkBuilder(s, u1, u2, v1, v2);
++    BRepBuilderAPI_MakeFace mkBuilder(s, u1, u2, v1, v2, Precision::Confusion());
+     return mkBuilder.Shape();
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index d1c892d..440a258 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 disable_memory_check.patch
 fix_armel_FTBFS.patch
 fix_FTBFS_on_precise.patch
+fix_FTBFS_with_oce-0.9.1.patch

-- 
FreeCAD packaging