From fdc77f1628801b6a114cb26d16563c2d52370bd6 Mon Sep 17 00:00:00 2001
From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Thu, 27 May 2021 15:00:19 +0200
Subject: [PATCH] set OCCT tag to V7_5_0p1

---
 applications/SALOME-9.7.0-MPI.pyconf     |  2 +-
 applications/SALOME-9.7.0-int32.pyconf   | 12 +-----------
 applications/SALOME-9.7.0-windows.pyconf |  2 +-
 applications/SALOME-9.7.0.pyconf         |  2 +-
 products/root.pyconf                     | 13 +++++++++++--
 5 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/applications/SALOME-9.7.0-MPI.pyconf b/applications/SALOME-9.7.0-MPI.pyconf
index 129de2d..e7e9081 100644
--- a/applications/SALOME-9.7.0-MPI.pyconf
+++ b/applications/SALOME-9.7.0-MPI.pyconf
@@ -30,7 +30,7 @@ APPLICATION :
         alabaster : '0.7.6'
         Babel : '2.7.0'
         boost : '1.71.0'
-        CAS : {tag: 'CR750-SALOME-PATCH', section: 'version_V7_5_0'}
+        CAS : {tag: 'V7_5_0p1', section: 'version_V7_5_0'}
         certifi : '2018.8.24'
         cgns : {tag : '4.1.1', hpc : 'yes'}
         chardet : '3.0.4'
diff --git a/applications/SALOME-9.7.0-int32.pyconf b/applications/SALOME-9.7.0-int32.pyconf
index d187793..4d393e5 100644
--- a/applications/SALOME-9.7.0-int32.pyconf
+++ b/applications/SALOME-9.7.0-int32.pyconf
@@ -28,7 +28,7 @@ APPLICATION :
         alabaster : '0.7.6'
         Babel : '2.7.0'
         boost : '1.71.0'
-        CAS : {tag: 'CR750-SALOME-PATCH', section: 'version_V7_5_0'}
+        CAS : {tag: 'V7_5_0p1', section: 'version_V7_5_0'}
         certifi : '2018.8.24'
         cgns : '4.1.1'
         chardet : '3.0.4'
@@ -174,16 +174,6 @@ APPLICATION :
 }
 __overwrite__ :
 [
-  {
-   # GTK  compilation issue
-    __condition__ : "VARS.dist in ['CO6']"
-    'APPLICATION.products.opencv' : '2.4.13.5'
-    'APPLICATION.products.tbb' : '4.4'
-    'APPLICATION.products.llvm' : '3.9.1-clang'
-    'APPLICATION.products.mesa' : '13.0.6'
-    'PRODUCTS.embree.default.patches' : ['embree-3.5.2-centos6.patch']
-  }
-
   {
    # tbb as a mandatory native product since SMESH with tbb, not installed on DB8 (temporary)
     __condition__ : "VARS.dist in ['DB08']"
diff --git a/applications/SALOME-9.7.0-windows.pyconf b/applications/SALOME-9.7.0-windows.pyconf
index e718dbe..a84cbe6 100644
--- a/applications/SALOME-9.7.0-windows.pyconf
+++ b/applications/SALOME-9.7.0-windows.pyconf
@@ -35,7 +35,7 @@ APPLICATION :
         alabaster : '0.7.6'
         Babel : '2.7.0'
         boost : '1.67.0'
-        CAS : {tag: 'CR750-SALOME-PATCH', section: 'version_V7_5_0_win'}
+        CAS : {tag: 'V7_5_0p1', section: 'version_V7_5_0_win'}
         certifi : '2019.6.16'
         cgns : '4.1.1'
         chardet : '3.0.4'
diff --git a/applications/SALOME-9.7.0.pyconf b/applications/SALOME-9.7.0.pyconf
index f10453c..5174f56 100644
--- a/applications/SALOME-9.7.0.pyconf
+++ b/applications/SALOME-9.7.0.pyconf
@@ -31,7 +31,7 @@ APPLICATION :
         alabaster : '0.7.6'
         Babel : '2.7.0'
         boost : '1.71.0'
-        CAS : {tag: 'CR750-SALOME-PATCH', section: 'version_V7_5_0'}
+        CAS : {tag: 'V7_5_0p1', section: 'version_V7_5_0'}
         certifi : '2018.8.24'
         cgns : '4.1.1'
         chardet : '3.0.4'
diff --git a/products/root.pyconf b/products/root.pyconf
index 973a20d..1118a06 100644
--- a/products/root.pyconf
+++ b/products/root.pyconf
@@ -3,7 +3,12 @@ default :
     name : "root"
     build_source : "cmake"
     cmake_options : " -Dgminimal:BOOL=ON -Dmathmore:BOOL=ON -Ddataframe:BOOL=ON -Dmlp:BOOL=ON -Dfftw3:BOOL=ON -Dminuit2:BOOL=ON -Dxml:BOOL=ON -Dasimage:BOOL=ON -Dpyroot:BOOL=ON -Dsoversion:BOOL=ON -Ddataframe:BOOL=ON -DPYTHON_EXECUTABLE:STRING=${PYTHONBIN} -DPYTHON_INCLUDE_DIR:STRING=${PYTHON_INCLUDE} "
-    get_source : "archive"
+    get_source : "git"
+    git_info:
+    {
+        repo : "https://github.com/root-project/root.git"
+        repo_dev : $repo
+    }
     environ :
     {
        env_script : $name + ".py"
@@ -34,6 +39,7 @@ version_6_24_00_win:
 
 version_6_22_06:
 {
+    get_source : "archive"
     patches : ['root-6.22.06.patch']
 }
 
@@ -47,6 +53,7 @@ version_6_22_06_win:
 
 version_6_22_02:
 {
+    get_source : "archive"
     patches : ['root-6.22.02.patch']
 }
 
@@ -60,7 +67,9 @@ version_6_22_02_win:
 }
 
 version_6_16_00:
-{}
+{
+    get_source : "archive"
+}
 
 version_6_16_00_win:
 {
-- 
2.39.2