Remove the GEOM patch related to opencv on CO6 - finally fixed in its sources

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index 066063cd5f906351cce1125af097c0143f783ab9..b2bb7ff435411da21bd14f5769133f8fbda5132e 100644 (file)
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -179,8 +179,6 @@ __overwrite__ :
    # GTK  compilation issue
     __condition__ : "VARS.dist in ['CO6']"
     'APPLICATION.products.opencv' : '2.4.13.5'
-    # Since OpenCV 4.X support, we need additional includes for old 2.X versions
-    'PRODUCTS.GEOM.default.patches' : ['opencv_backward_compatibility.patch']
     'APPLICATION.products.tbb' : '4.4'
     'APPLICATION.products.llvm' : '3.9.1-clang'
     'APPLICATION.products.mesa' : '13.0.6'

diff --git a/products/patches/opencv_backward_compatibility.patch b/products/patches/opencv_backward_compatibility.patch
deleted file mode 100644 (file)
index 870cf04..0000000
--- a/products/patches/opencv_backward_compatibility.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/ShapeRecognition/ShapeRec_FeatureDetector.hxx b/src/ShapeRecognition/ShapeRec_FeatureDetector.hxx
-index f068387..8c45dac 100644
---- a/src/ShapeRecognition/ShapeRec_FeatureDetector.hxx
-+++ b/src/ShapeRecognition/ShapeRec_FeatureDetector.hxx
-@@ -35,6 +35,8 @@
- #else
-  #include <opencv2/imgproc/imgproc.hpp>
-  #include <opencv2/highgui/highgui.hpp>
-+ #include <opencv2/opencv.hpp>
-+ #include <opencv2/legacy/compat.hpp>
- #endif
- 
- // Qt