Fix naming conflict between X11 headers and VTK 9.2.2+

Currently, the GLX headers include the X11 headers which use a
preprocessor define to make Status an int. However, VTK has a class
called Status, and this define replaces this class name with int which
results in compilation errors. This patch undefs Status and Success,
which are both defined in the X11 headers if they exist so that there
are no conflicts within the VTK headers for newer versions.

src/Draft/Draft_Modification_1.cxx

@@ -16,7 +16,6 @@
 
 #include <Adaptor3d_CurveOnSurface.hxx>
 #include <Adaptor3d_CurveOnSurface.hxx>
-#include <Adaptor3d_TopolTool.hxx>
 #include <GeomAdaptor_SurfaceOfLinearExtrusion.hxx>
 #include <Approx_CurveOnSurface.hxx>
 #include <BRep_Builder.hxx>
@@ -899,29 +898,8 @@ void Draft_Modification::Perform ()
             // 1 - If ProjLib should make an Approx, it is stupid to approximate the 
             //     entire intersection curve.
             // 2 - Additionally, if YaRev, there is a risk to not be SameRange.
-            Handle(GeomAdaptor_Surface) HS[2] = {new GeomAdaptor_Surface(S1), new GeomAdaptor_Surface(S2)};
+            i2s.Perform(S1,S2,Precision::Confusion(),
-            for (Standard_Integer i = 0; i < 2; ++i) 
+              Standard_True,Standard_False,Standard_False);
-            {
-              Handle(Geom_Surface) S = (i == 0 ? S1 : S2);
-              if (S->DynamicType() == STANDARD_TYPE(Geom_ConicalSurface))
-              {
-                Standard_Real aVs, aVe;
-                Adaptor3d_TopolTool::GetConeApexParam(Handle(Geom_ConicalSurface)::DownCast(S)->Cone(), aVs, aVe);
-                if (aVe < 0.)
-                {
-                  aVs = aVe;
-                  aVe = Precision::Infinite();
-                }
-                else
-                {
-                  aVs = -Precision::Infinite();
-                  aVe = aVe;
-                }
-                HS[i]->Load(S, 0., 2 * M_PI, aVs, aVe, 0., 0.);
-              }
-            }
-            i2s.Perform(HS[0], HS[1], Precision::Confusion(),
-              Standard_True, Standard_False, Standard_False);
 
             if (!i2s.IsDone() || i2s.NbLines() <= 0) {
               errStat = Draft_EdgeRecomputation;
@@ -1130,9 +1108,8 @@ void Draft_Modification::Perform ()
                 for (i = 1; i <= Candidates.Length(); i++)
                 {
                   Handle( Geom_Curve ) aCurve = Candidates(i);
-                  GeomAPI_ProjectPointOnCurve Projector(pfv, aCurve );
+                  gp_Pnt Pnt = aCurve->Value( aCurve->FirstParameter() );
-                  gp_Pnt aPnt = Projector.NbPoints() ? Projector.NearestPoint() : aCurve->Value(aCurve->FirstParameter());
+                  const Standard_Real Dist = Pnt.Distance( pfv );
-                  const Standard_Real Dist = aPnt.Distance( pfv );
                   if (Dist - DistMin < -Precision::Confusion())
                   {
                     DistMin = Dist;

src/IVtkDraw/IVtkDraw_Interactor.cxx

@@ -27,6 +27,16 @@
 #undef AllValues
 #endif
 
+// Prevent naming collisions between X11
+// and VTK versions 9.2.0 and above.
+// X11 is included through glx
+#ifdef Status
+#undef Status
+#endif
+#ifdef Success
+#undef Success
+#endif
+
 #include <vtkXRenderWindowInteractor.h>
 #include <vtkXOpenGLRenderWindow.h>
 #endif

tests/bugs/modalg_8/bug32857

@@ -1,72 +0,0 @@
-puts "================"
-puts "0032857: Problem when finding the intersection between a new face made after a draft and the inner face of body"
-puts "================"
-puts ""
-# Script reproducing the problematic draft case in FreeCAD issue #2497
-#Category: Modeling
-#Title: OCCT Tutorial pocketed ring
-
-pload MODELING VISUALIZATION
-
-# Set basic dimensions. Problems appear when inner_rad < pocket_center.
-dset height 10
-dset inner_rad 39
-dset outer_rad 50
-dset pocket_center 40
-dset pocket_rad 20
-dset pocket_depth 5
-
-# Construct base profile (the "my_ring")
-puts "Constructing my_ring..."
-
-circle c_inner 0 0 0 0 0 1 inner_rad
-circle c_outer 0 0 0 0 0 1 outer_rad
-mkedge e_inner c_inner
-mkedge e_outer c_outer
-wire w_inner e_inner
-wire w_outer e_outer
-
-plane p0
-mkface my_ring_inner_base p0 w_inner
-mkface my_ring_outer_base p0 w_outer
-
-prism my_ring_inner my_ring_inner_base 0 0 height
-prism my_ring_outer my_ring_outer_base 0 0 height
-
-bcut my_ring my_ring_outer my_ring_inner
-
-# Make the pocket
-puts "Constructing pocket..."
-
-circle pocket_base pocket_center 0 0 0 0 1 pocket_rad
-mkedge pocket_base pocket_base
-wire pocket_base pocket_base
-
-mkface pocket_base p0 pocket_base
-
-prism my_pocket pocket_base 0 0 pocket_depth
-
-# Make the cut
-puts "Making the cut"
-
-bcut slotted_ring my_ring my_pocket
-
-explode slotted_ring F
-
-# Make the draft
-puts "Drafting the face"
-
-# Found face by trial and error: slotted_ring_3
-# Perform the draft
-depouille slotted_ring_with_draft slotted_ring 0 0 -1 slotted_ring_3 44 0 1 0 0 0 1
-
-#checking result
-checkshape slotted_ring_with_draft
-checknbshapes slotted_ring_with_draft -shape 48 -vertex 12 -edge 18 -face 7 -wire 8
-checkprops slotted_ring_with_draft -s 11466.5 -v 28662.9
-
-puts "Showing result..."
-
-# Display result
-checkview -display slotted_ring_with_draft -2d -path ${imagedir}/${test_image}.png
-