From e404a55abb11c14a1e805aa1def8e8aa335f78a5 Mon Sep 17 00:00:00 2001
From: esy <emmanuel.streby@opencascade.com>
Date: Fri, 19 Oct 2018 16:40:05 +0200
Subject: [PATCH] patches edf for V92

---
 config/EDF_patches/SALOME_8_5_0/README.txt    |  12 --
 config/EDF_patches/SALOME_8_5_0/RPy.patch     |  11 --
 .../SALOME_8_5_0/eigen-eigen-3.2.7.patch      |  37 -----
 .../SALOME_8_5_0/patchHDF5Build.py            |  17 --
 config/EDF_patches/SALOME_8_5_0/pil.patch     |  25 ---
 .../EDF_patches/SALOME_8_5_0/rpy_tools.patch  |  11 --
 config/EDF_patches/SALOME_8_5_0/setup.patch   |  24 ---
 .../edf/options_compilation_config_XML.txt    |  88 +++++++++++
 .../edf/options_compilation_salome_master.txt | 148 ++++++++++++++++++
 config/patches/edf/FreeImage3170_Make.patch   |  61 ++++++++
 .../edf}/OCCT-7.2.0.patch                     |   0
 ...-463c0633-vtkXOpenGLRenderWindow.cxx.patch |   0
 config/patches/edf/README.txt                 |  12 ++
 .../edf}/cgal_cmake352.patch                  |   0
 .../SALOME_8_5_0 => patches/edf}/gl2ps.patch  |   0
 .../edf/omniORBpy-4.2.1-2-python3.patch       |  74 +++++++++
 config/patches/edf/otwrapy_0.7_py3.patch      |  12 ++
 .../edf}/patch_pv_b5c4c893_py_catalyst.patch  |   0
 config/patches/edf/pillow-py3.patch           |  12 ++
 .../edf}/scotch604_Make.inc.patch             |   0
 .../edf}/sphinx_w_intl_napoleon.patch         |   0
 21 files changed, 407 insertions(+), 137 deletions(-)
 delete mode 100644 config/EDF_patches/SALOME_8_5_0/README.txt
 delete mode 100644 config/EDF_patches/SALOME_8_5_0/RPy.patch
 delete mode 100644 config/EDF_patches/SALOME_8_5_0/eigen-eigen-3.2.7.patch
 delete mode 100644 config/EDF_patches/SALOME_8_5_0/patchHDF5Build.py
 delete mode 100644 config/EDF_patches/SALOME_8_5_0/pil.patch
 delete mode 100644 config/EDF_patches/SALOME_8_5_0/rpy_tools.patch
 delete mode 100644 config/EDF_patches/SALOME_8_5_0/setup.patch
 create mode 100644 config/build_options/edf/options_compilation_config_XML.txt
 create mode 100644 config/build_options/edf/options_compilation_salome_master.txt
 create mode 100644 config/patches/edf/FreeImage3170_Make.patch
 rename config/{EDF_patches/SALOME_8_5_0 => patches/edf}/OCCT-7.2.0.patch (100%)
 rename config/{EDF_patches/SALOME_8_5_0 => patches/edf}/ParaView-5.4.0-463c0633-vtkXOpenGLRenderWindow.cxx.patch (100%)
 create mode 100644 config/patches/edf/README.txt
 rename config/{EDF_patches/SALOME_8_5_0 => patches/edf}/cgal_cmake352.patch (100%)
 rename config/{EDF_patches/SALOME_8_5_0 => patches/edf}/gl2ps.patch (100%)
 create mode 100644 config/patches/edf/omniORBpy-4.2.1-2-python3.patch
 create mode 100644 config/patches/edf/otwrapy_0.7_py3.patch
 rename config/{EDF_patches/SALOME_8_5_0 => patches/edf}/patch_pv_b5c4c893_py_catalyst.patch (100%)
 create mode 100644 config/patches/edf/pillow-py3.patch
 rename config/{EDF_patches/SALOME_8_5_0 => patches/edf}/scotch604_Make.inc.patch (100%)
 rename config/{EDF_patches/SALOME_8_5_0 => patches/edf}/sphinx_w_intl_napoleon.patch (100%)

diff --git a/config/EDF_patches/SALOME_8_5_0/README.txt b/config/EDF_patches/SALOME_8_5_0/README.txt
deleted file mode 100644
index 279a1fe..0000000
--- a/config/EDF_patches/SALOME_8_5_0/README.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-n this directory you can find all the patch used for V8_5_0 building :
-
-CGAL		4.0			: cgal_cmake352.patch
-EIGEN		3.2.7			: eigen-eigen-3.2.7.patch
-GL2PS		1.4.0-20170729		: gl2ps.patch
-HDF5		1.8.14			: patchHDF5Build.py
-OCC		7.2.0p3			: OCCT-7.2.0.patch
-PARAVIEW	git_tag/v5.4.1p2	: ParaView-5.4.0-463c0633-vtkXOpenGLRenderWindow.cxx.patch, patch_pv_b5c4c893_py_catalyst.patch
-PIL		1.1.7			: pil.patch
-RPY		1.0.3			: setup.patch, rpy_tools.patch, RPy.patch
-SCOTCH		6.0.4			: scotch604_Make.inc.patch
-SPHINX		1.2.3			: sphinx_w_intl_napoleon.patch
diff --git a/config/EDF_patches/SALOME_8_5_0/RPy.patch b/config/EDF_patches/SALOME_8_5_0/RPy.patch
deleted file mode 100644
index 784af8f..0000000
--- a/config/EDF_patches/SALOME_8_5_0/RPy.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/RPy.h	2016-09-27 14:41:20.485222614 +0200
-+++ b/src/RPy.h	2016-09-27 14:41:29.177144534 +0200
-@@ -74,7 +74,7 @@
- #  endif
- #endif  /* _WIN32 */
- 
--#include <Rdevices.h> /* must follow Graphics.h */
-+//#include <Rdevices.h> /* must follow Graphics.h */
- 
- 
- /* Missing definitions from Rinterface.h or RStartup.h */
diff --git a/config/EDF_patches/SALOME_8_5_0/eigen-eigen-3.2.7.patch b/config/EDF_patches/SALOME_8_5_0/eigen-eigen-3.2.7.patch
deleted file mode 100644
index 77d31cf..0000000
--- a/config/EDF_patches/SALOME_8_5_0/eigen-eigen-3.2.7.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-commit 43401eee36e1af2ca170b2824e76875f2ac56964
-Author: spo <sergey.pokhodenko@opencascade.com>
-Date:   Tue Dec 22 12:46:02 2015 +0300
-
-    Replace nullptr with 0
-
-diff --git a/Eigen/src/Core/DenseStorage.h b/Eigen/src/Core/DenseStorage.h
-index 568493c..c30c084 100755
---- a/Eigen/src/Core/DenseStorage.h
-+++ b/Eigen/src/Core/DenseStorage.h
-@@ -278,7 +278,7 @@ template<typename T, int _Options> class DenseStorage<T, Dynamic, Dynamic, Dynam
-       , m_rows(std::move(other.m_rows))
-       , m_cols(std::move(other.m_cols))
-     {
--      other.m_data = nullptr;
-+      other.m_data = 0;
-     }
-     DenseStorage& operator=(DenseStorage&& other)
-     {
-@@ -336,7 +336,7 @@ template<typename T, int _Rows, int _Options> class DenseStorage<T, Dynamic, _Ro
-       : m_data(std::move(other.m_data))
-       , m_cols(std::move(other.m_cols))
-     {
--      other.m_data = nullptr;
-+      other.m_data = 0;
-     }
-     DenseStorage& operator=(DenseStorage&& other)
-     {
-@@ -390,7 +390,7 @@ template<typename T, int _Cols, int _Options> class DenseStorage<T, Dynamic, Dyn
-       : m_data(std::move(other.m_data))
-       , m_rows(std::move(other.m_rows))
-     {
--      other.m_data = nullptr;
-+      other.m_data = 0;
-     }
-     DenseStorage& operator=(DenseStorage&& other)
-     {
diff --git a/config/EDF_patches/SALOME_8_5_0/patchHDF5Build.py b/config/EDF_patches/SALOME_8_5_0/patchHDF5Build.py
deleted file mode 100644
index af886ca..0000000
--- a/config/EDF_patches/SALOME_8_5_0/patchHDF5Build.py
+++ /dev/null
@@ -1,17 +0,0 @@
-import os
-
-li=[]
-for root,dirs,fis in os.walk(os.getcwd()):
-  if "link.txt" in fis:
-    li.append(os.path.join(root,"link.txt"))
-
-for f in li:
-  fid=file(f)
-  lines=fid.readlines()
-  for ii,st in enumerate(lines):
-    st=st.replace("-Wl,--export-dynamic;","-Wl,--export-dynamic")
-    st=st.replace("--enable-new-dtags;","--enable-new-dtags")
-    lines[ii]=st
-    pass
-  fid=file(f,"w") ; fid.writelines(lines)
-
diff --git a/config/EDF_patches/SALOME_8_5_0/pil.patch b/config/EDF_patches/SALOME_8_5_0/pil.patch
deleted file mode 100644
index 59f4de5..0000000
--- a/config/EDF_patches/SALOME_8_5_0/pil.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/setup.py	2009-11-15 17:06:10.000000000 +0100
-+++ b/setup.py	2012-09-19 13:39:39.417889941 +0200
-@@ -34,8 +34,13 @@
- # TIFF_ROOT = libinclude("/opt/tiff")
- 
- TCL_ROOT = None
-+TCL_ROOT = libinclude(os.getenv("TCLDIR"))
-+TK_ROOT = libinclude(os.getenv("TKDIR"))
- JPEG_ROOT = None
- ZLIB_ROOT = None
-+JPEG_ROOT = ("/usr/lib/x86_64-linux-gnu","/usr/include/x86_64-linux-gnu")
-+ZLIB_ROOT = ("/usr/lib/x86_64-linux-gnu","/usr/include/x86_64-linux-gnu")
- TIFF_ROOT = None
- FREETYPE_ROOT = None
-+FREETYPE_ROOT = libinclude(os.getenv("FREETYPEDIR"))
- LCMS_ROOT = None
-@@ -189,7 +193,7 @@
-         #
-         # add configured kits
- 
--        for root in (TCL_ROOT, JPEG_ROOT, TCL_ROOT, TIFF_ROOT, ZLIB_ROOT,
-+        for root in (TCL_ROOT, JPEG_ROOT, TK_ROOT, TIFF_ROOT, ZLIB_ROOT,
-                      FREETYPE_ROOT, LCMS_ROOT):
-             if isinstance(root, type(())):
-                 lib_root, include_root = root
diff --git a/config/EDF_patches/SALOME_8_5_0/rpy_tools.patch b/config/EDF_patches/SALOME_8_5_0/rpy_tools.patch
deleted file mode 100644
index d4524d5..0000000
--- a/config/EDF_patches/SALOME_8_5_0/rpy_tools.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/rpy_tools.py	2016-09-27 14:40:12.501833432 +0200
-+++ b/rpy_tools.py	2016-09-27 14:40:51.289484908 +0200
-@@ -98,7 +98,7 @@
-       raise RuntimeError("Couldn't execute the R interpreter" +
-                          " `%s'.\n" % rexec )
-     # edd 05 Apr 2006  version = re.search("R +([0-9]\.[0-9]\.[0-9])", output)
--    version = re.search(" +([0-9]\.[0-9]\.[0-9])", output)
-+    version = re.search(" (\d+?\.\d+?\.\d+?) ", output)
-     if not version:
-       raise RuntimeError("Couldn't obtain version number from output\n"
-                                "of `R --version'.\n")
diff --git a/config/EDF_patches/SALOME_8_5_0/setup.patch b/config/EDF_patches/SALOME_8_5_0/setup.patch
deleted file mode 100644
index 072db38..0000000
--- a/config/EDF_patches/SALOME_8_5_0/setup.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/setup.py	2016-09-29 14:48:18.045084416 +0200
-+++ b/setup.py	2016-09-29 14:49:30.645413214 +0200
-@@ -113,7 +113,8 @@
- 
-     r_libs = [ # Different verisons of R put .so/.dll in different places
-               os.path.join(RHOME, 'bin'),  # R 2.0.0+
--              os.path.join(RHOME, 'lib'),  # Pre 2.0.0
-+              os.path.join(RHOME, 'lib64', 'R', 'lib'),  # Pre 2.0.0
-+              os.path.join(RHOME, 'lib', 'R', 'lib'),  # Pre 2.0.0
-              ]
- 
-     print "RHOME=",RHOME
-@@ -158,8 +159,9 @@
-         extra_compile_args=["-shared"]
-         source_files = source_files + ["src/setenv.c"]
-     else: # unix-like systems, this is known to work for Linux and Solaris
--        include_dirs = [ os.path.join(RHOME.strip(), 'include'), 
--                         'src', '/usr/share/R/include' ]
-+        include_dirs = [ os.path.join(RHOME.strip(), 'lib64' ,'R' ,'include'), 
-+                         os.path.join(RHOME.strip(), 'lib' ,'R' ,'include'), 
-+                         'src' ]
-         libraries=['R','Rlapack']
-         library_dirs = r_libs
-         runtime_libs = r_libs
diff --git a/config/build_options/edf/options_compilation_config_XML.txt b/config/build_options/edf/options_compilation_config_XML.txt
new file mode 100644
index 0000000..3660a76
--- /dev/null
+++ b/config/build_options/edf/options_compilation_config_XML.txt
@@ -0,0 +1,88 @@
+OPENTURNS_master/.yamm/configuration.xml:2:  <option name="CMAKE_BUILD_TYPE" value="Release"/>
+HELLO1_master/.yamm/configuration.xml:2:  <option name="CMAKE_BUILD_TYPE" value="Release"/>
+DOCUMENTATION_master/.yamm/configuration.xml:2:  <option name="CMAKE_BUILD_TYPE" value="Release"/>
+SMESH_master/.yamm/configuration.xml:2:  <option name="SALOME_SMESH_USE_CGNS" value="ON"/>
+SMESH_master/.yamm/configuration.xml:3:  <option name="CGNS_ROOT_DIR" value="${CGNSLIB_INSTALL_DIR}"/>
+SMESH_master/.yamm/configuration.xml:4:  <option name="CMAKE_MODULE_PATH" value="&quot;${CONFIGURATION_CMAKE_DIR}&quot;"/>
+SMESH_master/.yamm/configuration.xml:5:  <option name="MEDFILE_ROOT_DIR" value="$MEDFICHIER_INSTALL_DIR"/>
+SMESH_master/.yamm/configuration.xml:6:  <option name="PADDERHOME:STRING" value="${PADDERHOME}"/>
+SMESH_master/.yamm/configuration.xml:7:  <option name="QWT_ROOT_DIR" value="$QWT_INSTALL_DIR"/>
+SMESH_master/.yamm/configuration.xml:8:  <option name="SWIG_EXECUTABLE:PATH" value="$"/>
+SMESH_master/.yamm/configuration.xml:9:  <option name="SALOME_SMESH_USE_TBB" value="ON"/>
+SMESH_master/.yamm/configuration.xml:10:  <option name="CMAKE_BUILD_TYPE" value="Release"/>
+YACS_master/.yamm/configuration.xml:2:  <option name="SALOME_BUILD_GUI" value="ON"/>
+YACS_master/.yamm/configuration.xml:3:  <option name="CMAKE_BUILD_TYPE" value="Release"/>
+HYBRIDPLUGIN_master/.yamm/configuration.xml:2:  <option name="CMAKE_BUILD_TYPE" value="Release"/>
+EFICAS_master/.yamm/configuration.xml:2:  <option name="CMAKE_BUILD_TYPE" value="Release"/>
+HEXOTICPLUGIN_master/.yamm/configuration.xml:2:  <option name="CMAKE_BUILD_TYPE" value="Release"/>
+HEXABLOCKPLUGIN_master/.yamm/configuration.xml:2:  <option name="CMAKE_BUILD_TYPE" value="Release"/>
+ATOMSOLV_master/.yamm/configuration.xml:2:  <option name="CMAKE_INCLUDE_DIRECTORIES_BEFORE" value="ON"/>
+ATOMSOLV_master/.yamm/configuration.xml:3:  <option name="SWIG_EXECUTABLE:PATH" value="$"/>
+ATOMSOLV_master/.yamm/configuration.xml:4:  <option name="SWIG_DIR:PATH" value="$"/>
+ATOMSOLV_master/.yamm/configuration.xml:5:  <option name="CMAKE_BUILD_TYPE" value="Release"/>
+GUI_master/.yamm/configuration.xml:2:  <option name="CMAKE_MODULE_PATH" value="&quot;${CONFIGURATION_CMAKE_DIR}&quot;"/>
+GUI_master/.yamm/configuration.xml:3:  <option name="CAS_ROOT_DIR" value="$OCC_INSTALL_DIR"/>
+GUI_master/.yamm/configuration.xml:4:  <option name="PARAVIEW_VERSION" value="${PVVERSION}"/>
+GUI_master/.yamm/configuration.xml:5:  <option name="PYQT5_ROOT_DIR" value="$PYQT_INSTALL_DIR"/>
+GUI_master/.yamm/configuration.xml:6:  <option name="SALOME_BUILD_WITH_QT5" value="ON"/>
+GUI_master/.yamm/configuration.xml:7:  <option name="QT5_ROOT_DIR" value="$QT_INSTALL_DIR"/>
+GUI_master/.yamm/configuration.xml:8:  <option name="QWT_LIBRARY" value="$QWT_INSTALL_DIR/lib/libqwt"/>
+GUI_master/.yamm/configuration.xml:9:  <option name="CMAKE_INCLUDE_DIRECTORIES_BEFORE" value="ON"/>
+GUI_master/.yamm/configuration.xml:10:  <option name="SWIG_EXECUTABLE:PATH" value="$"/>
+GUI_master/.yamm/configuration.xml:11:  <option name="CMAKE_BUILD_TYPE" value="Release"/>
+PYHELLO1_master/.yamm/configuration.xml:2:  <option name="CMAKE_BUILD_TYPE" value="Release"/>
+HEXABLOCK_master/.yamm/configuration.xml:2:  <option name="CMAKE_BUILD_TYPE" value="Release"/>
+MED_master/.yamm/configuration.xml:2:  <option name="MEDCOUPLING_ROOT_DIR" value="${MEDCOUPLING_INSTALL_DIR}"/>
+MED_master/.yamm/configuration.xml:3:  <option name="MEDFILE_ROOT_DIR" value="${MEDFICHIER_INSTALL_DIR}"/>
+MED_master/.yamm/configuration.xml:4:  <option name="CMAKE_BUILD_TYPE" value="Release"/>
+HOMARD_master/.yamm/configuration.xml:2:  <option name="CMAKE_BUILD_TYPE" value="Release"/>
+NON_REGRESSION_TESTS_occ_python3_porting/.yamm/configuration.xml:2:  <option name="WITH_GUI_TESTS:BOOL" value="ON"/>
+NON_REGRESSION_TESTS_occ_python3_porting/.yamm/configuration.xml:3:  <option name="WITH_MEDCOUPLING_TESTS:BOOL" value="ON"/>
+NON_REGRESSION_TESTS_occ_python3_porting/.yamm/configuration.xml:4:  <option name="WITH_PARAVIS_TESTS:BOOL" value="ON"/>
+NON_REGRESSION_TESTS_occ_python3_porting/.yamm/configuration.xml:5:  <option name="WITH_CAOMAILLAGE_TESTS:BOOL" value="ON"/>
+NON_REGRESSION_TESTS_occ_python3_porting/.yamm/configuration.xml:6:  <option name="WITH_USECASES_TESTS:BOOL" value="ON"/>
+NON_REGRESSION_TESTS_occ_python3_porting/.yamm/configuration.xml:7:  <option name="WITH_LARGECASES_TESTS:BOOL" value="ON"/>
+NON_REGRESSION_TESTS_occ_python3_porting/.yamm/configuration.xml:8:  <option name="WITH_ARCHITECTURE_TESTS:BOOL" value="ON"/>
+NON_REGRESSION_TESTS_occ_python3_porting/.yamm/configuration.xml:9:  <option name="CMAKE_BUILD_TYPE" value="Release"/>
+FIELDS_master/.yamm/configuration.xml:2:  <option name="MEDCOUPLING_ROOT_DIR" value="${MEDCOUPLING_INSTALL_DIR}"/>
+FIELDS_master/.yamm/configuration.xml:3:  <option name="FIELDSFILE_ROOT_DIR" value="${MEDFICHIER_INSTALL_DIR}"/>
+FIELDS_master/.yamm/configuration.xml:4:  <option name="CMAKE_BUILD_TYPE" value="Release"/>
+ATOMGEN_master/.yamm/configuration.xml:2:  <option name="CMAKE_INCLUDE_DIRECTORIES_BEFORE" value="ON"/>
+ATOMGEN_master/.yamm/configuration.xml:3:  <option name="SWIG_EXECUTABLE:PATH" value="$"/>
+ATOMGEN_master/.yamm/configuration.xml:4:  <option name="SWIG_DIR:PATH" value="$"/>
+ATOMGEN_master/.yamm/configuration.xml:5:  <option name="CMAKE_BUILD_TYPE" value="Release"/>
+PARAVIS_master/.yamm/configuration.xml:2:  <option name="VTK_DIR" value="${PARAVIEW_INSTALL_DIR}/lib/cmake/paraview"/>
+PARAVIS_master/.yamm/configuration.xml:3:  <option name="PYTHON_EXECUTABLE" value="$"/>
+PARAVIS_master/.yamm/configuration.xml:4:  <option name="PYTHON_ROOT_DIR" value="${PYTHONHOME}"/>
+PARAVIS_master/.yamm/configuration.xml:5:  <option name="SALOME_PARAVIS_MINIMAL_CORBA" value="ON"/>
+PARAVIS_master/.yamm/configuration.xml:6:  <option name="CMAKE_BUILD_TYPE" value="Release"/>
+GMSHPLUGIN_master/.yamm/configuration.xml:2:  <option name="CMAKE_BUILD_TYPE" value="Release"/>
+NETGENPLUGIN_master/.yamm/configuration.xml:2:  <option name="CMAKE_BUILD_TYPE" value="Release"/>
+CALCULATOR_master/.yamm/configuration.xml:2:  <option name="CMAKE_BUILD_TYPE" value="Release"/>
+JOBMANAGER_master/.yamm/configuration.xml:2:  <option name="CMAKE_BUILD_TYPE" value="Release"/>
+KERNEL_master/.yamm/configuration.xml:2:  <option name="CMAKE_MODULE_PATH" value="${CONFIGURATION_CMAKE_DIR}"/>
+KERNEL_master/.yamm/configuration.xml:3:  <option name="SALOME_BUILD_TESTS" value="ON"/>
+KERNEL_master/.yamm/configuration.xml:4:  <option name="SALOME_USE_LIBBATCH" value="ON"/>
+KERNEL_master/.yamm/configuration.xml:5:  <option name="SWIG_EXECUTABLE:PATH" value="$"/>
+KERNEL_master/.yamm/configuration.xml:6:  <option name="CMAKE_BUILD_TYPE" value="Release"/>
+GHS3DPLUGIN_master/.yamm/configuration.xml:2:  <option name="MESHGEMS_ROOT_DIR" value="&quot;${MESHGEMS_ROOT_DIR}&quot;"/>
+GHS3DPLUGIN_master/.yamm/configuration.xml:3:  <option name="CMAKE_BUILD_TYPE" value="Release"/>
+LIGHT_master/.yamm/configuration.xml:2:  <option name="CMAKE_BUILD_TYPE" value="Release"/>
+BLSURFPLUGIN_master/.yamm/configuration.xml:2:  <option name="CMAKE_BUILD_TYPE" value="Release"/>
+ATOMIC_master/.yamm/configuration.xml:2:  <option name="CMAKE_INCLUDE_DIRECTORIES_BEFORE" value="ON"/>
+ATOMIC_master/.yamm/configuration.xml:3:  <option name="SWIG_EXECUTABLE:PATH" value="$"/>
+ATOMIC_master/.yamm/configuration.xml:4:  <option name="SWIG_DIR:PATH" value="$"/>
+ATOMIC_master/.yamm/configuration.xml:5:  <option name="CMAKE_BUILD_TYPE" value="Release"/>
+PYLIGHT_master/.yamm/configuration.xml:2:  <option name="CMAKE_BUILD_TYPE" value="Release"/>
+NON_REGRESSION_TESTS_CONFIDENTIAL_occ_python3_porting/.yamm/configuration.xml:2:  <option name="WITH_CAOMAILLAGE_TESTS:BOOL" value="ON"/>
+NON_REGRESSION_TESTS_CONFIDENTIAL_occ_python3_porting/.yamm/configuration.xml:3:  <option name="WITH_USECASES_TESTS:BOOL" value="ON"/>
+NON_REGRESSION_TESTS_CONFIDENTIAL_occ_python3_porting/.yamm/configuration.xml:4:  <option name="CMAKE_BUILD_TYPE" value="Release"/>
+GENERICSOLVER_master/.yamm/configuration.xml:2:  <option name="CMAKE_BUILD_TYPE" value="Release"/>
+GEOM_master/.yamm/configuration.xml:2:  <option name="CMAKE_MODULE_PATH" value="&quot;${CONFIGURATION_CMAKE_DIR}&quot;"/>
+GEOM_master/.yamm/configuration.xml:3:  <option name="FREETYPE_INCLUDE_DIR_freetype2" value="&quot;${FREETYPE_INSTALL_DIR}/include/freetype2/freetype&quot;"/>
+GEOM_master/.yamm/configuration.xml:4:  <option name="FREETYPE_INCLUDE_DIR_ft2build" value="&quot;${FREETYPE_INSTALL_DIR}/include/freetype2/freetype&quot;"/>
+GEOM_master/.yamm/configuration.xml:5:  <option name="FREETYPE_LIBRARY" value="&quot;${FREETYPE_INSTALL_DIR}/lib&quot;"/>
+GEOM_master/.yamm/configuration.xml:6:  <option name="SALOME_GEOM_USE_OPENCV" value="ON"/>
+GEOM_master/.yamm/configuration.xml:7:  <option name="SWIG_EXECUTABLE:PATH" value="$"/>
+GEOM_master/.yamm/configuration.xml:8:  <option name="CMAKE_BUILD_TYPE" value="Release"/>
+
diff --git a/config/build_options/edf/options_compilation_salome_master.txt b/config/build_options/edf/options_compilation_salome_master.txt
new file mode 100644
index 0000000..46ef79a
--- /dev/null
+++ b/config/build_options/edf/options_compilation_salome_master.txt
@@ -0,0 +1,148 @@
+KERNEL
+kernel.py:84:      self.config_options += " -DCMAKE_MODULE_PATH=${CONFIGURATION_CMAKE_DIR} "
+
+GUI
+gui.py:78:      self.config_options += ' -DCMAKE_MODULE_PATH="${CONFIGURATION_CMAKE_DIR}" '
+gui.py:81:      self.config_options += " -DPARAVIEW_VERSION=${PVVERSION}"
+gui.py:84:      self.config_options += " -DWITH_MPI=${ENVOPENMPI_LIB}"
+gui.py:87:      self.config_options += " -DSALOME_BUILD_WITH_QT%d=ON " % misc.major(version_name)
+gui.py:90:      self.config_options += " -DCMAKE_INCLUDE_DIRECTORIES_BEFORE=ON"
+gui.py:94:      self.config_options += " -DSWIG_EXECUTABLE:PATH=$(which swig%s) " % swig_version
+gui.py:98:      self.config_options += " -DSPHINX_ROOT_DIR:FILEPATH=$(dirname $(dpkg -L python3-sphinx |grep sphinx-build))"
+gui.py:108:      self.config_options += " -DQWT_LIBRARY=$QWT_INSTALL_DIR/lib/libqwt.so"
+gui.py:111:      self.config_options += " -DCAS_ROOT_DIR=$OCC_INSTALL_DIR"
+gui.py:114:      self.config_options += " -DQT%d_ROOT_DIR=$QT_INSTALL_DIR " % misc.major(version_name)
+gui.py:118:        self.config_options += " -DPYQT%s_ROOT_DIR=$PYQT_INSTALL_DIR" % qtversion
+
+GEOM
+geom.py:62:      self.config_options += " -DSALOME_GEOM_USE_OPENCV=ON "
+geom.py:65:      self.config_options += ' -DCMAKE_MODULE_PATH="${CONFIGURATION_CMAKE_DIR}" '
+geom.py:69:      self.config_options += " -DSWIG_EXECUTABLE:PATH=$(which swig%s) " % swig_version
+geom.py:73:      self.config_options += ' -DFREETYPE_INCLUDE_DIR_freetype2="${FREETYPE_INSTALL_DIR}/include/freetype2/freetype" '
+geom.py:74:      self.config_options += ' -DFREETYPE_INCLUDE_DIR_ft2build="${FREETYPE_INSTALL_DIR}/include/freetype2/freetype" '
+geom.py:75:      self.config_options += ' -DFREETYPE_LIBRARY="${FREETYPE_INSTALL_DIR}/lib" '
+
+HOMARD
+homard.py:81:      self.config_options += " -DSPHINX_ROOT_DIR:FILEPATH=$(dirname $(dpkg -L python3-sphinx |grep sphinx-build))"
+
+GMSHPLUGIN
+gmshplugin.py:55:      self.config_options += " -DSPHINX_ROOT_DIR:FILEPATH=$(dirname $(dpkg -L python3-sphinx |grep sphinx-build))"
+
+FIELDS
+fields.py:70:      self.config_options += ' -DSALOME_USE_MPI=ON -DSALOME_FIELDS_ENABLE_PARTITIONER=OFF '
+fields.py:71:      self.config_options += ' -DSALOME_FIELDS_ENABLE_RENUMBER=OFF -DSALOME_BUILD_TESTS=OFF '
+fields.py:72:      self.config_options += ' -DSALOME_BUILD_DOC=OFF -DSALOME_FIELDS_STANDALONE=OFF '
+fields.py:73:      self.config_options += ' -DSALOME_FIELDS_MICROFIELDS=OFF -DMPI_CXX_LIBRARIES:FILEPATH=${ENVOPENMPI_LIB} libmpi_cxx.so '
+fields.py:74:      self.config_options += ' -DMPI_C_LIBRARIES:FILEPATH=${ENVOPENMPI_LIB} libmpi.so '
+fields.py:75:      self.config_options += ' -DMPI_LIBRARY:PATH=${ENVOPENMPI_LIB} '
+fields.py:76:      self.config_options += ' -DCMAKE_SHARED_LINKER_FLAGS="-L${ENVOPENMPI_LIB}" -lmpi_cxx -lmpi " '
+fields.py:77:      self.config_options += ' -DCMAKE_EXE_LINKER_FLAGS="-L${ENVOPENMPI_LIB}" -lmpi_cxx -lmpi" '
+fields.py:81:      self.config_options += " -DMEDCOUPLING_ROOT_DIR=${MEDCOUPLING_INSTALL_DIR} "
+fields.py:83:      self.config_options += " -DFIELDSFILE_ROOT_DIR=${MEDFICHIER_INSTALL_DIR} "
+fields.py:85:      self.config_options += " -DMMETIS_ROOT_DIR=${METIS_INSTALL_DIR} "
+fields.py:87:      self.config_options += " -DSCOTCH_ROOT_DIR=${SCOTCH_INSTALL_DIR} "
+fields.py:91:      self.config_options += " -DSPHINX_ROOT_DIR:FILEPATH=$(dirname $(dpkg -L python3-sphinx |grep sphinx-build))"
+
+YACS
+yacs.py:81:      self.config_options += " -DSALOME_BUILD_GUI=ON "
+yacs.py:87:      self.config_options += " -DSPHINX_ROOT_DIR:FILEPATH=$(dirname $(dpkg -L python3-sphinx |grep sphinx-build))"
+
+MODULECARMEL
+modulecarmel.py:43:      self.config_options += " -DSPHINX_ROOT_DIR:FILEPATH=$(dirname $(dpkg -L python3-sphinx |grep sphinx-build))"
+
+LIGHT
+light.py:52:      self.config_options += " -DSPHINX_ROOT_DIR:FILEPATH=$(dirname $(dpkg -L python3-sphinx |grep sphinx-build))"
+
+PYCALCULATOR
+pycalculator.py:50:      self.config_options += " -DSPHINX_ROOT_DIR:FILEPATH=$(dirname $(dpkg -L python3-sphinx |grep sphinx-build))"
+hybridplugin.py:54:      self.config_options += "--with-meshgems=$MESHGEMS_INSTALL_DIR"
+hybridplugin.py:58:      self.config_options += " -DSPHINX_ROOT_DIR:FILEPATH=$(dirname $(dpkg -L python3-sphinx |grep sphinx-build))"
+
+component.py:49:      self.config_options += " -DSPHINX_ROOT_DIR:FILEPATH=$(dirname $(dpkg -L python3-sphinx |grep sphinx-build))"
+
+oscard.py:43:      self.config_options += " -DCMAKE_MODULE_PATH=${CONFIGURATION_CMAKE_DIR} "
+
+calculator.py:49:      self.config_options += " -DSPHINX_ROOT_DIR:FILEPATH=$(dirname $(dpkg -L python3-sphinx |grep sphinx-build))"
+
+parametric.py:55:      self.config_options += " -DPYTHON_EXECUTABLE=$(which python%s)" % self.python_version
+parametric.py:59:      self.config_options += " -DPYTHON_ROOT_DIR=${PYTHONHOME}"
+parametric.py:63:      self.config_options += " -DSPHINX_ROOT_DIR:FILEPATH=$(dirname $(dpkg -L python3-sphinx |grep sphinx-build))"
+
+openturns.py:91:      self.config_options += " -DSPHINX_ROOT_DIR:FILEPATH=$(dirname $(dpkg -L python3-sphinx |grep sphinx-build))"
+
+hello1.py:52:      self.config_options += " -DSPHINX_ROOT_DIR:FILEPATH=$(dirname $(dpkg -L python3-sphinx |grep sphinx-build))"
+atomgen.py:55:      self.config_options += " -DSWIG_EXECUTABLE:PATH=$(which swig%s) " % swig_version
+atomgen.py:56:      self.config_options += " -DSWIG_DIR:PATH=$(swig%s -swiglib) " % swig_version
+atomgen.py:59:      self.config_options += " -DCMAKE_INCLUDE_DIRECTORIES_BEFORE=ON"
+atomgen.py:63:      self.config_options += " -DSPHINX_ROOT_DIR:FILEPATH=$(dirname $(dpkg -L python3-sphinx |grep sphinx-build))"
+ghs3dplugin.py:51:      self.config_options += " -DMESHGEMS_ROOT_DIR=\"${MESHGEMS_ROOT_DIR}\" "
+ghs3dplugin.py:55:      self.config_options += " -DSPHINX_ROOT_DIR:FILEPATH=$(dirname $(dpkg -L python3-sphinx |grep sphinx-build))"
+kernel.py:80:      self.config_options += " -DSALOME_BUILD_TESTS=ON "
+kernel.py:82:      self.config_options += " -DSALOME_USE_LIBBATCH=ON "
+kernel.py:84:      self.config_options += " -DCMAKE_MODULE_PATH=${CONFIGURATION_CMAKE_DIR} "
+kernel.py:86:      self.config_options += ' -DSALOME_USE_MPI=ON '
+kernel.py:89:      self.config_options += " -DSWIG_EXECUTABLE:PATH=$(which swig%s) " % swig_version
+kernel.py:93:      self.config_options += " --with-cppunit=${CPPUNIT_INSTALL_DIR} "
+kernel.py:97:      self.config_options += " -DSPHINX_ROOT_DIR:FILEPATH=$(dirname $(dpkg -L python3-sphinx |grep sphinx-build))"
+shaper.py:38:    self.config_options += "-DADD_MODELS_TESTS=TRUE"
+shaper.py:71:      self.config_options += " -DQT%d_ROOT_DIR=${QT_INSTALL_DIR} " % misc.major(version_name)
+shaper.py:75:      self.config_options += " -DSPHINX_ROOT_DIR:FILEPATH=$(dirname $(dpkg -L python3-sphinx |grep sphinx-build))"
+modulemagnetothermic.py:48:      self.config_options += " -DSPHINX_ROOT_DIR:FILEPATH=$(dirname $(dpkg -L python3-sphinx |grep sphinx-build))"
+hexablockplugin.py:48:      self.config_options += " -DSPHINX_ROOT_DIR:FILEPATH=$(dirname $(dpkg -L python3-sphinx |grep sphinx-build))"
+eficas.py:60:      self.config_options += " -DSPHINX_ROOT_DIR:FILEPATH=$(dirname $(dpkg -L python3-sphinx |grep sphinx-build))"
+med.py:70:      self.config_options += ' -DSALOME_USE_MPI=ON -DSALOME_MED_ENABLE_PARTITIONER=OFF '
+med.py:71:      self.config_options += ' -DSALOME_MED_ENABLE_RENUMBER=OFF -DSALOME_BUILD_TESTS=OFF '
+med.py:72:      self.config_options += ' -DSALOME_BUILD_DOC=OFF -DSALOME_MED_STANDALONE=OFF '
+med.py:73:      self.config_options += ' -DSALOME_MED_MICROMED=OFF -DMPI_CXX_LIBRARIES:FILEPATH=${ENVOPENMPI_LIB} libmpi_cxx.so '
+med.py:74:      self.config_options += ' -DMPI_C_LIBRARIES:FILEPATH=${ENVOPENMPI_LIB} libmpi.so '
+med.py:75:      self.config_options += ' -DMPI_LIBRARY:PATH=${ENVOPENMPI_LIB} '
+med.py:76:      self.config_options += ' -DCMAKE_SHARED_LINKER_FLAGS="-L${ENVOPENMPI_LIB}" -lmpi_cxx -lmpi " '
+med.py:77:      self.config_options += ' -DCMAKE_EXE_LINKER_FLAGS="-L${ENVOPENMPI_LIB}" -lmpi_cxx -lmpi" '
+med.py:81:      self.config_options += " -DMEDCOUPLING_ROOT_DIR=${MEDCOUPLING_INSTALL_DIR} "
+med.py:83:      self.config_options += " -DMEDFILE_ROOT_DIR=${MEDFICHIER_INSTALL_DIR} "
+med.py:85:      self.config_options += " -DMMETIS_ROOT_DIR=${METIS_INSTALL_DIR} "
+med.py:87:      self.config_options += " -DSCOTCH_ROOT_DIR=${SCOTCH_INSTALL_DIR} "
+med.py:91:      self.config_options += " -DSPHINX_ROOT_DIR:FILEPATH=$(dirname $(dpkg -L python3-sphinx |grep sphinx-build))"
+modulecarmelcnd.py:47:      self.config_options += " -DSPHINX_ROOT_DIR:FILEPATH=$(dirname $(dpkg -L python3-sphinx |grep sphinx-build))"
+documentation.py:63:      self.config_options += " -DSPHINX_ROOT_DIR:FILEPATH=$(dirname $(dpkg -L python3-sphinx |grep sphinx-build))"
+pylight.py:55:      self.config_options += " -DSPHINX_ROOT_DIR:FILEPATH=$(dirname $(dpkg -L python3-sphinx |grep sphinx-build))"
+pyhello1.py:54:      self.config_options += " -DSPHINX_ROOT_DIR:FILEPATH=$(dirname $(dpkg -L python3-sphinx |grep sphinx-build))"
+hexablock.py:52:      self.config_options += " -DSPHINX_ROOT_DIR:FILEPATH=$(dirname $(dpkg -L python3-sphinx |grep sphinx-build))"
+jobmanager.py:53:      self.config_options += " -DSPHINX_ROOT_DIR:FILEPATH=$(dirname $(dpkg -L python3-sphinx |grep sphinx-build))"
+atomic.py:53:      self.config_options += " -DSWIG_EXECUTABLE:PATH=$(which swig%s) " % swig_version
+atomic.py:54:      self.config_options += " -DSWIG_DIR:PATH=$(swig%s -swiglib) " % swig_version
+atomic.py:57:      self.config_options += " -DCMAKE_INCLUDE_DIRECTORIES_BEFORE=ON"
+ot.py:80:      self.config_options += " -DSPHINX_ROOT_DIR:FILEPATH=$(dirname $(dpkg -L python3-sphinx |grep sphinx-build))"
+dsccode.py:48:      self.config_options += " -DSPHINX_ROOT_DIR:FILEPATH=$(dirname $(dpkg -L python3-sphinx |grep sphinx-build))"
+smesh.py:113:      self.config_options += " -DCMAKE_MODULE_PATH=\"${CONFIGURATION_CMAKE_DIR}\" "
+smesh.py:115:      self.config_options += " -DSALOME_SMESH_USE_TBB=ON "
+smesh.py:117:      self.config_options += " -DSALOME_SMESH_USE_CGNS=ON "
+smesh.py:119:      self.config_options += ' -DSALOME_USE_MPI=ON -DCMAKE_SHARED_LINKER_FLAGS="-L${ENVOPENMPI_LIB} -lmpi_cxx -lmpi" '
+smesh.py:120:      self.config_options += ' -DCMAKE_EXE_LINKER_FLAGS="-L${ENVOPENMPI_LIB} -lmpi_cxx -lmpi" '
+smesh.py:123:      self.config_options += " -DSWIG_EXECUTABLE:PATH=$(which swig%s) " % swig_version
+smesh.py:130:      self.config_options += " -DPADDERHOME:STRING=${PADDERHOME} "
+smesh.py:133:        self.config_options += " --with-TBB=${TBB_INSTALL_DIR}"
+smesh.py:136:        self.config_options += " --with-cgns=${CGNSLIB_INSTALL_DIR}"
+smesh.py:138:        self.config_options += " -DCGNS_ROOT_DIR=${CGNSLIB_INSTALL_DIR} "
+smesh.py:140:      self.config_options += " -DMEDFILE_ROOT_DIR=$MEDFICHIER_INSTALL_DIR "
+smesh.py:142:      self.config_options += " -DQWT_ROOT_DIR=$QWT_INSTALL_DIR "
+smesh.py:148:      self.config_options += " -DSPHINX_ROOT_DIR:FILEPATH=$(dirname $(dpkg -L python3-sphinx |grep sphinx-build))"
+adao.py:53:      self.config_options += " -DSPHINX_ROOT_DIR:FILEPATH=$(dirname $(dpkg -L python3-sphinx |grep sphinx-build))"
+paravis.py:61:    self.config_options += " -DSALOME_PARAVIS_MINIMAL_CORBA=ON "
+paravis.py:77:      self.config_options += " -DPYTHON_EXECUTABLE=$(which python%s)" % self.python_version
+paravis.py:79:      self.config_options += ' -DSALOME_USE_MPI=ON -DHDF5_IS_PARALLEL:BOOL=ON -DSALOME_PARAVIS_BUILD_PLUGINS=ON '
+paravis.py:83:      self.config_options += " -DPYTHON_ROOT_DIR=${PYTHONHOME}"
+paravis.py:87:      self.config_options += " -DVTK_DIR=${PARAVIEW_INSTALL_DIR}/lib/cmake/paraview-%s " % pvversion
+paravis.py:91:      self.config_options += " -DSPHINX_ROOT_DIR:FILEPATH=$(dirname $(dpkg -L python3-sphinx |grep sphinx-build))"
+ghs3dprlplugin.py:53:      self.config_options += ' -DCMAKE_SHARED_LINKER_FLAGS="-L${ENVOPENMPI_LIB} -lmpi_cxx -lmpi" '
+ghs3dprlplugin.py:54:      self.config_options += ' -DCMAKE_EXE_LINKER_FLAGS="-L${ENVOPENMPI_LIB} -lmpi_cxx -lmpi" '
+ghs3dprlplugin.py:61:      self.config_options += " -DMESHGEMS_ROOT_DIR=\"${MESHGEMS_ROOT_DIR}\" "
+moduleinterpol.py:43:      self.config_options += " -DSPHINX_ROOT_DIR:FILEPATH=$(dirname $(dpkg -L python3-sphinx |grep sphinx-build))"
+atomsolv.py:55:      self.config_options += " -DSWIG_EXECUTABLE:PATH=$(which swig%s) " % swig_version
+atomsolv.py:56:      self.config_options += " -DSWIG_DIR:PATH=$(swig%s -swiglib) " % swig_version
+atomsolv.py:59:      self.config_options += " -DCMAKE_INCLUDE_DIRECTORIES_BEFORE=ON"
+atomsolv.py:63:      self.config_options += " -DSPHINX_ROOT_DIR:FILEPATH=$(dirname $(dpkg -L python3-sphinx |grep sphinx-build))"
+netgenplugin.py:57:      self.config_options += " -DSPHINX_ROOT_DIR:FILEPATH=$(dirname $(dpkg -L python3-sphinx |grep sphinx-build))"
+hexoticplugin.py:55:      self.config_options += " -DSPHINX_ROOT_DIR:FILEPATH=$(dirname $(dpkg -L python3-sphinx |grep sphinx-build))"
+
+
diff --git a/config/patches/edf/FreeImage3170_Make.patch b/config/patches/edf/FreeImage3170_Make.patch
new file mode 100644
index 0000000..37ec343
--- /dev/null
+++ b/config/patches/edf/FreeImage3170_Make.patch
@@ -0,0 +1,61 @@
+diff -Naur FreeImage3170/Makefile.fip FreeImage3170p1/Makefile.fip 
+--- FreeImage3170/Makefile.fip	2015-03-08 18:03:56.000000000 +0100
++++ FreeImage3170p1/Makefile.fip	2018-10-18 14:48:29.531048024 +0200
+@@ -4,9 +4,9 @@
+ include fipMakefile.srcs
+ 
+ # General configuration variables:
+-DESTDIR ?= /
+-INCDIR ?= $(DESTDIR)/usr/include
+-INSTALLDIR ?= $(DESTDIR)/usr/lib
++DESTDIR ?= $(DESTDIR)
++INCDIR ?= $(DESTDIR)/include
++INSTALLDIR ?= $(DESTDIR)/lib
+ 
+ # Converts cr/lf to just lf
+ DOS2UNIX = dos2unix
+@@ -72,10 +72,10 @@
+ 
+ install:
+ 	install -d $(INCDIR) $(INSTALLDIR)
+-	install -m 644 -o root -g root $(HEADER) $(INCDIR)
+-	install -m 644 -o root -g root $(HEADERFIP) $(INCDIR)
+-	install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
+-	install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
++	install -m 755 $(HEADER) $(INCDIR)
++	install -m 755 $(HEADERFIP) $(INCDIR)
++	install -m 755 $(STATICLIB) $(INSTALLDIR)
++	install -m 755 $(SHAREDLIB) $(INSTALLDIR)
+ 	ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
+ 	ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)
+
+diff -Naur FreeImage3170/Makefile.gnu FreeImage3170p1/Makefile.gnu
+--- FreeImage3170/Makefile.gnu	2015-03-08 18:04:00.000000000 +0100
++++ FreeImage3170p1/Makefile.gnu	2018-10-18 14:53:23.100138977 +0200
+@@ -4,9 +4,9 @@
+ include Makefile.srcs
+ 
+ # General configuration variables:
+-DESTDIR ?= /
+-INCDIR ?= $(DESTDIR)/usr/include
+-INSTALLDIR ?= $(DESTDIR)/usr/lib
++DESTDIR ?= $(DESTDIR)
++INCDIR ?= $(DESTDIR)/include
++INSTALLDIR ?= $(DESTDIR)/lib
+ 
+ # Converts cr/lf to just lf
+ DOS2UNIX = dos2unix
+@@ -71,9 +71,9 @@
+ 
+ install:
+ 	install -d $(INCDIR) $(INSTALLDIR)
+-	install -m 644 -o root -g root $(HEADER) $(INCDIR)
+-	install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
+-	install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
++	install -m 755 $(HEADER) $(INCDIR)
++	install -m 755 $(STATICLIB) $(INSTALLDIR)
++	install -m 755 $(SHAREDLIB) $(INSTALLDIR)
+ 	ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
+ 	ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)	
+ #	ldconfig
+
diff --git a/config/EDF_patches/SALOME_8_5_0/OCCT-7.2.0.patch b/config/patches/edf/OCCT-7.2.0.patch
similarity index 100%
rename from config/EDF_patches/SALOME_8_5_0/OCCT-7.2.0.patch
rename to config/patches/edf/OCCT-7.2.0.patch
diff --git a/config/EDF_patches/SALOME_8_5_0/ParaView-5.4.0-463c0633-vtkXOpenGLRenderWindow.cxx.patch b/config/patches/edf/ParaView-5.4.0-463c0633-vtkXOpenGLRenderWindow.cxx.patch
similarity index 100%
rename from config/EDF_patches/SALOME_8_5_0/ParaView-5.4.0-463c0633-vtkXOpenGLRenderWindow.cxx.patch
rename to config/patches/edf/ParaView-5.4.0-463c0633-vtkXOpenGLRenderWindow.cxx.patch
diff --git a/config/patches/edf/README.txt b/config/patches/edf/README.txt
new file mode 100644
index 0000000..b9038a8
--- /dev/null
+++ b/config/patches/edf/README.txt
@@ -0,0 +1,12 @@
+In this directory you can find all the patch used for V9_2_0 building :
+
+CGAL		4.0			: cgal_cmake352.patch
+FREEIMAGE	3.1.6			: 
+GL2PS		1.4.0-20170729		: gl2ps.patch
+OCC		7.2.0p3			: OCCT-7.2.0.patch
+OMNIORBPY	4.2.2			: omniORBpy-4.2.1-2-python3.patch
+OPENTURNS_WRAPY	0.7			: otwrapy_0.7_py3.patch
+PARAVIEW	v5.6.0			: ParaView-5.4.0-463c0633-vtkXOpenGLRenderWindow.cxx.patch, patch_pv_b5c4c893_py_catalyst.patch
+PILLOW		3.4.2			: pillow-py3.patch 
+SCOTCH		6.0.4			: scotch604_Make.inc.patch
+SPHINX		1.2.3			: sphinx176_w_intl_napoleon.patch
diff --git a/config/EDF_patches/SALOME_8_5_0/cgal_cmake352.patch b/config/patches/edf/cgal_cmake352.patch
similarity index 100%
rename from config/EDF_patches/SALOME_8_5_0/cgal_cmake352.patch
rename to config/patches/edf/cgal_cmake352.patch
diff --git a/config/EDF_patches/SALOME_8_5_0/gl2ps.patch b/config/patches/edf/gl2ps.patch
similarity index 100%
rename from config/EDF_patches/SALOME_8_5_0/gl2ps.patch
rename to config/patches/edf/gl2ps.patch
diff --git a/config/patches/edf/omniORBpy-4.2.1-2-python3.patch b/config/patches/edf/omniORBpy-4.2.1-2-python3.patch
new file mode 100644
index 0000000..82b749a
--- /dev/null
+++ b/config/patches/edf/omniORBpy-4.2.1-2-python3.patch
@@ -0,0 +1,74 @@
+diff -Naur a/python3/omniORB/__init__.py b/python3/omniORB/__init__.py
+--- a/python3/omniORB/__init__.py	2015-06-08 13:39:59.000000000 +0200
++++ b/python3/omniORB/__init__.py	2017-05-09 14:57:00.521302183 +0200
+@@ -458,17 +458,65 @@
+     def __repr__(self):
+         return self._n
+ 
+-    def __cmp__(self, other):
++    def __eq__(self, other):
+         try:
+             if isinstance(other, EnumItem):
+                 if other._parent_id == self._parent_id:
+-                    return cmp(self._v, other._v)
++                    return self._v == other._v
+                 else:
+-                    return cmp(self._parent_id, other._parent_id)
++                    return self._parent_id == other._parent_id
+             else:
+-                return cmp(id(self), id(other))
++                return id(self) == id(other)
+         except:
+-            return cmp(id(self), id(other))
++            return id(self) == id(other)
++
++    def __lt__(self, other):
++        try:
++            if isinstance(other, EnumItem):
++                if other._parent_id == self._parent_id:
++                    return self._v < other._v
++                else:
++                    return self._parent_id < other._parent_id
++            else:
++                return id(self) < id(other)
++        except:
++            return id(self) < id(other)
++
++    def __le__(self, other):
++        try:
++            if isinstance(other, EnumItem):
++                if other._parent_id == self._parent_id:
++                    return self._v <= other._v
++                else:
++                    return self._parent_id <= other._parent_id
++            else:
++                return id(self) <= id(other)
++        except:
++            return id(self) <= id(other)
++
++    def __gt__(self, other):
++        try:
++            if isinstance(other, EnumItem):
++                if other._parent_id == self._parent_id:
++                    return self._v > other._v
++                else:
++                    return self._parent_id > other._parent_id
++            else:
++                return id(self) > id(other)
++        except:
++            return id(self) > id(other)
++
++    def __ge__(self, other):
++        try:
++            if isinstance(other, EnumItem):
++                if other._parent_id == self._parent_id:
++                    return self._v >= other._v
++                else:
++                    return self._parent_id >= other._parent_id
++            else:
++                return id(self) >= id(other)
++        except:
++            return id(self) >= id(other)
+ 
+     def __hash__(self):
+         return hash(self._parent_id + "/" + self._n)
diff --git a/config/patches/edf/otwrapy_0.7_py3.patch b/config/patches/edf/otwrapy_0.7_py3.patch
new file mode 100644
index 0000000..1935b68
--- /dev/null
+++ b/config/patches/edf/otwrapy_0.7_py3.patch
@@ -0,0 +1,12 @@
+diff -Naur a/setup.py b/setup.py
+--- a/setup.py	2017-10-26 11:31:16.000000000 +0200
++++ b/setup.py	2018-09-13 13:58:34.256434654 +0200
+@@ -6,7 +6,7 @@
+ from codecs import open
+ from os import path
+ 
+-with open('otwrapy/__init__.py') as fid:
++with open('otwrapy/__init__.py', 'r') as fid:
+     for line in fid:
+         if line.startswith('__version__'):
+             version = line.strip().split()[-1][1:-1]
diff --git a/config/EDF_patches/SALOME_8_5_0/patch_pv_b5c4c893_py_catalyst.patch b/config/patches/edf/patch_pv_b5c4c893_py_catalyst.patch
similarity index 100%
rename from config/EDF_patches/SALOME_8_5_0/patch_pv_b5c4c893_py_catalyst.patch
rename to config/patches/edf/patch_pv_b5c4c893_py_catalyst.patch
diff --git a/config/patches/edf/pillow-py3.patch b/config/patches/edf/pillow-py3.patch
new file mode 100644
index 0000000..a77d1d1
--- /dev/null
+++ b/config/patches/edf/pillow-py3.patch
@@ -0,0 +1,12 @@
+diff -Naur Pillow-3.4.2/setup.py Pillow-3.4.2-new/setup.py
+--- Pillow-3.4.2/setup.py	2017-05-10 14:42:20.479585980 +0200
++++ Pillow-3.4.2-new/setup.py	2017-05-10 14:41:33.468524757 +0200
+@@ -116,7 +116,7 @@
+ ZLIB_ROOT = None
+ IMAGEQUANT_ROOT = None
+ TIFF_ROOT = None
+-FREETYPE_ROOT = None
++FREETYPE_ROOT = os.getenv("FREETYPEDIR")
+ LCMS_ROOT = None
+ 
+ 
diff --git a/config/EDF_patches/SALOME_8_5_0/scotch604_Make.inc.patch b/config/patches/edf/scotch604_Make.inc.patch
similarity index 100%
rename from config/EDF_patches/SALOME_8_5_0/scotch604_Make.inc.patch
rename to config/patches/edf/scotch604_Make.inc.patch
diff --git a/config/EDF_patches/SALOME_8_5_0/sphinx_w_intl_napoleon.patch b/config/patches/edf/sphinx_w_intl_napoleon.patch
similarity index 100%
rename from config/EDF_patches/SALOME_8_5_0/sphinx_w_intl_napoleon.patch
rename to config/patches/edf/sphinx_w_intl_napoleon.patch
-- 
2.39.2