Remove patches applied on YACS and NETGENPLUGIN for Fedora 38

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index c1493463d2523554e4399211ee42aee1bae1f885..5296da9ae3ad3c376e2e08c53162567d60ccd3cf 100644 (file)
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -355,7 +355,5 @@ __overwrite__ :
         'APPLICATION.products.ParaView'         : {tag: '5.11.0',    base: 'no', section: 'version_5_11_0_MPI_FD38', hpc: 'yes' }
         'APPLICATION.products.CONFIGURATION'    : {tag:'master',     base: 'no', section: 'default'                             }
         'APPLICATION.products.SHAPER'           : {tag:'master',     base: 'no', section: 'default',                 hpc: 'no'  }
-        'APPLICATION.products.NETGENPLUGIN'     : {tag:'master',     base: 'no', section: 'version_V9_11_0_FD38'                }
-        'APPLICATION.products.YACS'             : {tag:'master',     base: 'no', section: 'version_V9_11_0_FD38'                }
     }
 ]

diff --git a/products/NETGENPLUGIN.pyconf b/products/NETGENPLUGIN.pyconf
index 508ee00857fa86c2196651a70f42809dd8eaa49b..562b4df348dc525b11549a8768c0105fcf1a89ae 100755 (executable)
--- a/products/NETGENPLUGIN.pyconf
+++ b/products/NETGENPLUGIN.pyconf
@@ -69,11 +69,6 @@ default_win :
               ]
 }
 
-version_V9_11_0_FD38 :
-{
-  patches : ['NETGENPlugin_FD38.patch']
-}
-
 version_V9_3_0 :
 {
   patches : []

diff --git a/products/YACS.pyconf b/products/YACS.pyconf
index cc6ec06b7231e3a8f2e8e51abd5cffcc8f95e29b..b91bc9c2c55db25358a79fd64a842a8223c95aff 100644 (file)
--- a/products/YACS.pyconf
+++ b/products/YACS.pyconf
@@ -52,11 +52,6 @@ version_master_CO9 :
     cmake_options : " -DSALOME_YACS_USE_EMBEDDED_PMML=OFF -DQT_HELP_GENERATOR=${QT5_ROOT_DIR}/bin/qhelpgenerator -DQt5LinguistTools_DIR=${QT5_ROOT_DIR}/lib/cmake/Qt5LinguistTools"
 }
 
-version_V9_11_0_FD38 :
-{
-  patches : ['YACS_FD38.patch']
-} 
-
 default_win :
 {
   patches : []

diff --git a/products/patches/NETGENPlugin_FD38.patch b/products/patches/NETGENPlugin_FD38.patch
deleted file mode 100644 (file)
index 3d93040..0000000
--- a/products/patches/NETGENPlugin_FD38.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur NETGENPLUGIN_ref/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx NETGENPLUGIN_dev/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx
---- NETGENPLUGIN_ref/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx       2023-05-25 16:30:06.119261933 +0200
-+++ NETGENPLUGIN_dev/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx       2023-05-25 16:21:37.764903074 +0200
-@@ -259,7 +259,7 @@
-       if ( elem->NbCornerNodes() != 3 ){
-         return error( COMPERR_BAD_INPUT_MESH, "Not triangle element encounters");
-       }
--      listElements[elem] = tuple(isRev, isInternalFace);
-+      listElements[elem] = tuple<bool, bool>(isRev, isInternalFace);
-     }
-   }
- 
-diff -Naur NETGENPLUGIN_ref/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_SA.cxx NETGENPLUGIN_dev/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_SA.cxx
---- NETGENPLUGIN_ref/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_SA.cxx    2023-05-25 16:30:06.119261933 +0200
-+++ NETGENPLUGIN_dev/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_SA.cxx    2023-05-25 16:17:57.350145584 +0200
-@@ -392,7 +392,7 @@
-     // Get orientation
-     // Netgen requires that all the triangle point outside
-     isRev = elemOrientation[elem->GetID()];
--    listElements[elem] = tuple(isRev, false);
-+    listElements[elem] = tuple<bool, bool>(isRev, false);
-   }
- 
-   return false;

diff --git a/products/patches/YACS_FD38.patch b/products/patches/YACS_FD38.patch
deleted file mode 100644 (file)
index e084ede..0000000
--- a/products/patches/YACS_FD38.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/runtime/ConnectionManager.hxx b/src/runtime/ConnectionManager.hxx
-index 9304a44f..d05088b2 100644
---- a/src/runtime/ConnectionManager.hxx
-+++ b/src/runtime/ConnectionManager.hxx
-@@ -26,6 +26,8 @@
- #include <map>
- #include <mutex>
- 
-+#include <string>
-+
- #include <SALOMEconfig.h>
- #include CORBA_SERVER_HEADER(DSC_Engines)
-