From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Thu, 1 Apr 2021 13:44:39 +0000 (+0200)
Subject: ROOT-URANIE patches - seen for Debian 9
X-Git-Tag: V9_7_0~63^2~27
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=69c02530b386f2161f5c84bc5a40caf97f7ce97e;p=tools%2Fsat_salome.git

ROOT-URANIE patches - seen for Debian 9
---

diff --git a/products/URANIE.pyconf b/products/URANIE.pyconf
index f807db2..06be18d 100644
--- a/products/URANIE.pyconf
+++ b/products/URANIE.pyconf
@@ -20,3 +20,7 @@ default :
     }
 }
 
+version_4_5_0 :
+{
+    patches: ['URANIE-4.5.0.patch']
+}
diff --git a/products/patches/URANIE-4.5.0.patch b/products/patches/URANIE-4.5.0.patch
new file mode 100644
index 0000000..28a27ce
--- /dev/null
+++ b/products/patches/URANIE-4.5.0.patch
@@ -0,0 +1,35 @@
+diff -rupN URANIE_ref/CmakePackage/FindCPPUNIT.cmake URANIE_new/CmakePackage/FindCPPUNIT.cmake
+--- URANIE_ref/CmakePackage/FindCPPUNIT.cmake	2020-11-30 12:46:24.000000000 +0100
++++ URANIE_new/CmakePackage/FindCPPUNIT.cmake	2021-04-01 09:38:51.077522950 +0200
+@@ -3,11 +3,16 @@
+ # It tries to find the club-config script which gives you all the needed information.
+ 
+ MESSAGE(STATUS "Looking for CPPUNIT...")
++SET(CPPUNIT_ROOT_DIR $ENV{CPPUNIT_ROOT_DIR}  CACHE PATH "PATH TO CPPUNIT.")
+ SET(CPPUNIT_LIB)
+ SET(CPPUNIT_VERSION)
+ SET(CPPUNIT_INCLUDE_DIR)
+ SET(CPPUNIT_LIBRARY_DIR)
+ 
++IF(CPPUNIT_ROOT_DIR)
++ LIST(APPEND CMAKE_PREFIX_PATH "${CPPUNIT_ROOT_DIR}")
++ENDIF(CPPUNIT_ROOT_DIR)
++
+ if(CMAKE_VERBOSE_MAKEFILE STREQUAL "ON")
+     message(STATUS " **** PKG_CONFIG_FOUND [${PKG_CONFIG_FOUND}]")
+     message(STATUS " **** PKG_CONFIG_EXECUTABLE [${PKG_CONFIG_EXECUTABLE}]")
+
+diff -rupN URANIE_ref/CmakePackage/UranieFindAllPackages.cmake URANIE_new/CmakePackage/UranieFindAllPackages.cmake
+--- URANIE_ref/CmakePackage/UranieFindAllPackages.cmake	2020-11-30 12:46:24.000000000 +0100
++++ URANIE_new/CmakePackage/UranieFindAllPackages.cmake	2021-04-01 09:37:11.801519322 +0200
+@@ -99,6 +99,10 @@ if(--disable-libxml2 STREQUAL "ON")
+     message(STATUS "Libxml2 is disabled")
+ else(--disable-libxml2 STREQUAL "ON")
+     message(STATUS "Looking for LibXml2...")
++    SET(LIBXML2_ROOT_DIR $ENV{LIBXML2_ROOT_DIR} CACHE PATH "Path to the LIBXML2.")
++    IF(LIBXML2_ROOT_DIR)
++      LIST(APPEND CMAKE_PREFIX_PATH "${LIBXML2_ROOT_DIR}")
++    ENDIF(LIBXML2_ROOT_DIR)
+     find_path(LIBXML2_INCLUDE_DIR NAMES libxml/xpath.h
+                                 PATHS ENV PATH
+                                 PATH_SUFFIXES ../include)
diff --git a/products/patches/root-6.22.02.patch b/products/patches/root-6.22.02.patch
new file mode 100644
index 0000000..0446510
--- /dev/null
+++ b/products/patches/root-6.22.02.patch
@@ -0,0 +1,25 @@
+diff -rupN root_ref/cmake/modules/SearchInstalledSoftware.cmake root_new/cmake/modules/SearchInstalledSoftware.cmake
+--- root_ref/cmake/modules/SearchInstalledSoftware.cmake	2020-08-17 14:41:56.000000000 +0200
++++ root_new/cmake/modules/SearchInstalledSoftware.cmake	2021-04-01 13:22:21.914013106 +0200
+@@ -82,6 +82,10 @@ endif()
+ #---Check for Freetype---------------------------------------------------------------
+ if(NOT builtin_freetype)
+   message(STATUS "Looking for Freetype")
++  SET(FREETYPE_ROOT_DIR $ENV{FREETYPE_ROOT_DIR} CACHE PATH "Path to the FreeType.")
++  IF(FREETYPE_ROOT_DIR)
++    LIST(APPEND CMAKE_PREFIX_PATH "${FREETYPE_ROOT_DIR}")
++  ENDIF(FREETYPE_ROOT_DIR)
+   if(fail-on-missing)
+     find_package(Freetype REQUIRED)
+   else()
+@@ -574,6 +578,10 @@ endif()
+ #---Check for XML Parser Support-----------------------------------------------------------
+ if(xml)
+   message(STATUS "Looking for LibXml2")
++  SET(LIBXML2_ROOT_DIR $ENV{LIBXML2_ROOT_DIR} CACHE PATH "Path to the LIBXML2.")
++  IF(LIBXML2_ROOT_DIR)
++    LIST(APPEND CMAKE_PREFIX_PATH "${LIBXML2_ROOT_DIR}")
++  ENDIF(LIBXML2_ROOT_DIR)
+   find_package(LibXml2)
+   if(NOT LIBXML2_FOUND)
+     if(fail-on-missing)
diff --git a/products/patches/root-6.22.06.patch b/products/patches/root-6.22.06.patch
new file mode 100644
index 0000000..0446510
--- /dev/null
+++ b/products/patches/root-6.22.06.patch
@@ -0,0 +1,25 @@
+diff -rupN root_ref/cmake/modules/SearchInstalledSoftware.cmake root_new/cmake/modules/SearchInstalledSoftware.cmake
+--- root_ref/cmake/modules/SearchInstalledSoftware.cmake	2020-08-17 14:41:56.000000000 +0200
++++ root_new/cmake/modules/SearchInstalledSoftware.cmake	2021-04-01 13:22:21.914013106 +0200
+@@ -82,6 +82,10 @@ endif()
+ #---Check for Freetype---------------------------------------------------------------
+ if(NOT builtin_freetype)
+   message(STATUS "Looking for Freetype")
++  SET(FREETYPE_ROOT_DIR $ENV{FREETYPE_ROOT_DIR} CACHE PATH "Path to the FreeType.")
++  IF(FREETYPE_ROOT_DIR)
++    LIST(APPEND CMAKE_PREFIX_PATH "${FREETYPE_ROOT_DIR}")
++  ENDIF(FREETYPE_ROOT_DIR)
+   if(fail-on-missing)
+     find_package(Freetype REQUIRED)
+   else()
+@@ -574,6 +578,10 @@ endif()
+ #---Check for XML Parser Support-----------------------------------------------------------
+ if(xml)
+   message(STATUS "Looking for LibXml2")
++  SET(LIBXML2_ROOT_DIR $ENV{LIBXML2_ROOT_DIR} CACHE PATH "Path to the LIBXML2.")
++  IF(LIBXML2_ROOT_DIR)
++    LIST(APPEND CMAKE_PREFIX_PATH "${LIBXML2_ROOT_DIR}")
++  ENDIF(LIBXML2_ROOT_DIR)
+   find_package(LibXml2)
+   if(NOT LIBXML2_FOUND)
+     if(fail-on-missing)
diff --git a/products/root.pyconf b/products/root.pyconf
index a7398e1..719066b 100644
--- a/products/root.pyconf
+++ b/products/root.pyconf
@@ -30,11 +30,27 @@ version_6_16_00_win:
 }
 
 version_6_22_06:
-{}
+{
+    patches : ['root-6.22.06.patch']
+}
 
 version_6_22_06_win:
 {
     archive_info : {archive_name : "root_v6.22.06.win32.vc16.tar.gz"}
+    patches : []
+    build_source : "script"
+    compil_script :  "root.bat"
+}
+
+version_6_22_02:
+{
+    patches : ['root-6.22.02.patch']
+}
+
+version_6_22_02_win:
+{
+    archive_info : {archive_name : "root_v6.22.02.win32.vc16.tar.gz"}
+    patches : []
     build_source : "script"
     compil_script :  "root.bat"
 }