From 3010453cbf2412aa78895e9765c1d887d96d3794 Mon Sep 17 00:00:00 2001
From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Wed, 12 Oct 2022 17:08:50 +0200
Subject: [PATCH] remove PARAVIS and SOLVERLAB patches - do not compile
 NodeEditor ParaView plugin

---
 products/PARAVIS.pyconf                     | 4 ++--
 products/SOLVERLAB.pyconf                   | 2 +-
 products/compil_scripts/ParaView-5.11.0.bat | 4 +++-
 products/compil_scripts/ParaView-5.11.0.sh  | 3 +++
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/products/PARAVIS.pyconf b/products/PARAVIS.pyconf
index 376eac4..041252f 100644
--- a/products/PARAVIS.pyconf
+++ b/products/PARAVIS.pyconf
@@ -70,7 +70,7 @@ default_win:
        "pytz",
        "sphinxintl"
     ]
-    patches : ['PARAVIS-paraview-5.11.0-trace.patch']
+    patches : []
 }
 
 default_MPI :
@@ -97,7 +97,7 @@ default_MPI :
        "pytz",
        "openmpi"
     ]
-    patches : ['PARAVIS-paraview-5.11.0-trace.patch']
+    patches : []
 }
 
 version_V9_7_0_to_V9_8_0 :
diff --git a/products/SOLVERLAB.pyconf b/products/SOLVERLAB.pyconf
index 7950020..0980f8a 100644
--- a/products/SOLVERLAB.pyconf
+++ b/products/SOLVERLAB.pyconf
@@ -38,7 +38,7 @@ default :
         incremental : "yes"
         has_salome_gui : "yes"
     }
-    patches: ['SOLVERLAB-paraview-5.11.patch']
+    patches: []
 }
 
 default_MPI :
diff --git a/products/compil_scripts/ParaView-5.11.0.bat b/products/compil_scripts/ParaView-5.11.0.bat
index bd07e5f..e284301 100644
--- a/products/compil_scripts/ParaView-5.11.0.bat
+++ b/products/compil_scripts/ParaView-5.11.0.bat
@@ -162,11 +162,13 @@ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPARAVIEW_PLUGIN_ENABLE_pvblot:BOOL=OFF
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPARAVIEW_USE_CATALYST:BOOL=ON
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCATALYST_BUILD_STUB_IMPLEMENTATION:BOOL=ON
 
+REM https://gitlab.kitware.com/paraview/paraview/-/issues/21594
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPARAVIEW_PLUGIN_ENABLE_NodeEditor=OFF
+
 REM allow additional plugins
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_ALL_NEW_OBJECT_FACTORY:BOOL=ON
 
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR="Visual Studio 15 2017 Win64"
-
 cd %BUILD_DIR%
 echo.
 echo INFO: running command: %CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% %SOURCE_DIR%
diff --git a/products/compil_scripts/ParaView-5.11.0.sh b/products/compil_scripts/ParaView-5.11.0.sh
index bb078bf..b4dd393 100755
--- a/products/compil_scripts/ParaView-5.11.0.sh
+++ b/products/compil_scripts/ParaView-5.11.0.sh
@@ -276,6 +276,9 @@ if [ -n "$NETCDF_ROOT_DIR" ]; then
     CMAKE_OPTIONS+=" -DVTK_MODULE_ENABLE_VTK_FiltersParallelGeometry=YES"
 fi
 
+# https://gitlab.kitware.com/paraview/paraview/-/issues/21594
+CMAKE_OPTIONS+=" -DPARAVIEW_PLUGIN_ENABLE_NodeEditor=OFF"
+
 echo
 echo "*** cmake" ${CMAKE_OPTIONS}
 cmake ${CMAKE_OPTIONS} $SOURCE_DIR
-- 
2.39.2