From 5fb67fe490febf5cc695992574feb309e7bcee4b Mon Sep 17 00:00:00 2001
From: Quentin Cozette <quentin.cozette@cea.fr>
Date: Mon, 15 Mar 2021 19:03:10 +0100
Subject: [PATCH] Temporarily patch GEOM on CO6 to compliant with old OpenCV
 2.X version

---
 applications/SALOME-master.pyconf                   |  2 ++
 .../patches/opencv_backward_compatibility.patch     | 13 +++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 products/patches/opencv_backward_compatibility.patch

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index b2bb7ff..066063c 100644
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -179,6 +179,8 @@ __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
new file mode 100644
index 0000000..870cf04
--- /dev/null
+++ b/products/patches/opencv_backward_compatibility.patch
@@ -0,0 +1,13 @@
+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
-- 
2.39.2