From: vsr <vsr@opencascade.com>
Date: Fri, 19 Dec 2014 13:30:31 +0000 (+0300)
Subject: Update patch for ParaView 4.2
X-Git-Tag: V7_5_1~6
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d893a285b971ccd749d7c87f431a9f84abca49b0;p=tools%2Finstall.git

Update patch for ParaView 4.2
---

diff --git a/config_files/patches/ParaView-4.2.0.patch b/config_files/patches/ParaView-4.2.0.patch
index b799a38..843a068 100644
--- a/config_files/patches/ParaView-4.2.0.patch
+++ b/config_files/patches/ParaView-4.2.0.patch
@@ -1,6 +1,6 @@
 diff -Naur --exclude=CVS --exclude=.git ParaView-4.2.0_SRC/CMakeLists.txt ParaView-4.2.0_SRC.new/CMakeLists.txt
 --- ParaView-4.2.0_SRC/CMakeLists.txt	2014-09-23 18:46:43.000000000 +0400
-+++ ParaView-4.2.0_SRC.new/CMakeLists.txt	2014-11-18 15:23:10.000000000 +0300
++++ ParaView-4.2.0_SRC.new/CMakeLists.txt	2014-12-19 15:39:41.000000000 +0300
 @@ -543,8 +543,8 @@
  
    #----------------------------------------------------------------------------------
@@ -14,7 +14,7 @@ diff -Naur --exclude=CVS --exclude=.git ParaView-4.2.0_SRC/CMakeLists.txt ParaVi
  
 diff -Naur --exclude=CVS --exclude=.git ParaView-4.2.0_SRC/ParaViewCore/ClientServerCore/Core/vtkPVPythonInformation.cxx ParaView-4.2.0_SRC.new/ParaViewCore/ClientServerCore/Core/vtkPVPythonInformation.cxx
 --- ParaView-4.2.0_SRC/ParaViewCore/ClientServerCore/Core/vtkPVPythonInformation.cxx	2014-09-23 18:46:44.000000000 +0400
-+++ ParaView-4.2.0_SRC.new/ParaViewCore/ClientServerCore/Core/vtkPVPythonInformation.cxx	2014-11-18 15:23:10.000000000 +0300
++++ ParaView-4.2.0_SRC.new/ParaViewCore/ClientServerCore/Core/vtkPVPythonInformation.cxx	2014-12-19 15:39:41.000000000 +0300
 @@ -100,7 +100,9 @@
  namespace {
  bool hasModule(const char *module)
@@ -55,7 +55,7 @@ diff -Naur --exclude=CVS --exclude=.git ParaView-4.2.0_SRC/ParaViewCore/ClientSe
  
 diff -Naur --exclude=CVS --exclude=.git ParaView-4.2.0_SRC/ParaViewCore/ClientServerCore/Core/vtkSession.cxx ParaView-4.2.0_SRC.new/ParaViewCore/ClientServerCore/Core/vtkSession.cxx
 --- ParaView-4.2.0_SRC/ParaViewCore/ClientServerCore/Core/vtkSession.cxx	2014-09-23 18:46:44.000000000 +0400
-+++ ParaView-4.2.0_SRC.new/ParaViewCore/ClientServerCore/Core/vtkSession.cxx	2014-11-18 15:23:10.000000000 +0300
++++ ParaView-4.2.0_SRC.new/ParaViewCore/ClientServerCore/Core/vtkSession.cxx	2014-12-19 15:39:41.000000000 +0300
 @@ -30,13 +30,15 @@
  //----------------------------------------------------------------------------
  void vtkSession::Activate()
@@ -76,7 +76,7 @@ diff -Naur --exclude=CVS --exclude=.git ParaView-4.2.0_SRC/ParaViewCore/ClientSe
  //----------------------------------------------------------------------------
 diff -Naur --exclude=CVS --exclude=.git ParaView-4.2.0_SRC/ParaViewCore/ClientServerCore/Rendering/vtkGeometryRepresentation.cxx ParaView-4.2.0_SRC.new/ParaViewCore/ClientServerCore/Rendering/vtkGeometryRepresentation.cxx
 --- ParaView-4.2.0_SRC/ParaViewCore/ClientServerCore/Rendering/vtkGeometryRepresentation.cxx	2014-09-23 18:46:44.000000000 +0400
-+++ ParaView-4.2.0_SRC.new/ParaViewCore/ClientServerCore/Rendering/vtkGeometryRepresentation.cxx	2014-11-18 15:23:10.000000000 +0300
++++ ParaView-4.2.0_SRC.new/ParaViewCore/ClientServerCore/Rendering/vtkGeometryRepresentation.cxx	2014-12-19 15:39:41.000000000 +0300
 @@ -172,6 +172,7 @@
    if (geomFilter)
      {
@@ -134,7 +134,7 @@ diff -Naur --exclude=CVS --exclude=.git ParaView-4.2.0_SRC/ParaViewCore/ClientSe
    if (vtkPVGeometryFilter::SafeDownCast(this->GeometryFilter))
 diff -Naur --exclude=CVS --exclude=.git ParaView-4.2.0_SRC/ParaViewCore/ClientServerCore/Rendering/vtkGeometryRepresentation.h ParaView-4.2.0_SRC.new/ParaViewCore/ClientServerCore/Rendering/vtkGeometryRepresentation.h
 --- ParaView-4.2.0_SRC/ParaViewCore/ClientServerCore/Rendering/vtkGeometryRepresentation.h	2014-09-23 18:46:44.000000000 +0400
-+++ ParaView-4.2.0_SRC.new/ParaViewCore/ClientServerCore/Rendering/vtkGeometryRepresentation.h	2014-11-18 15:23:10.000000000 +0300
++++ ParaView-4.2.0_SRC.new/ParaViewCore/ClientServerCore/Rendering/vtkGeometryRepresentation.h	2014-12-19 15:39:41.000000000 +0300
 @@ -19,7 +19,7 @@
  // It handles non-polygonal datasets by extracting external surfaces. One can
  // use this representation to show surface/wireframe/points/surface-with-edges.
@@ -172,7 +172,7 @@ diff -Naur --exclude=CVS --exclude=.git ParaView-4.2.0_SRC/ParaViewCore/ClientSe
    // Forwarded to Mapper and LODMapper.
 diff -Naur --exclude=CVS --exclude=.git ParaView-4.2.0_SRC/ParaViewCore/ServerManager/Core/vtkSMTrace.cxx ParaView-4.2.0_SRC.new/ParaViewCore/ServerManager/Core/vtkSMTrace.cxx
 --- ParaView-4.2.0_SRC/ParaViewCore/ServerManager/Core/vtkSMTrace.cxx	2014-09-23 18:46:44.000000000 +0400
-+++ ParaView-4.2.0_SRC.new/ParaViewCore/ServerManager/Core/vtkSMTrace.cxx	2014-11-18 15:23:10.000000000 +0300
++++ ParaView-4.2.0_SRC.new/ParaViewCore/ServerManager/Core/vtkSMTrace.cxx	2014-12-19 15:39:41.000000000 +0300
 @@ -69,6 +69,7 @@
  #ifdef PARAVIEW_ENABLE_PYTHON
    // ensure Python interpreter is initialized.
@@ -490,7 +490,7 @@ diff -Naur --exclude=CVS --exclude=.git ParaView-4.2.0_SRC/ParaViewCore/ServerMa
    (void)arguments;
 diff -Naur --exclude=CVS --exclude=.git ParaView-4.2.0_SRC/ParaViewCore/ServerManager/Rendering/vtkSMPVRepresentationProxy.cxx ParaView-4.2.0_SRC.new/ParaViewCore/ServerManager/Rendering/vtkSMPVRepresentationProxy.cxx
 --- ParaView-4.2.0_SRC/ParaViewCore/ServerManager/Rendering/vtkSMPVRepresentationProxy.cxx	2014-09-23 18:46:44.000000000 +0400
-+++ ParaView-4.2.0_SRC.new/ParaViewCore/ServerManager/Rendering/vtkSMPVRepresentationProxy.cxx	2014-11-18 15:23:10.000000000 +0300
++++ ParaView-4.2.0_SRC.new/ParaViewCore/ServerManager/Rendering/vtkSMPVRepresentationProxy.cxx	2014-12-19 15:39:41.000000000 +0300
 @@ -276,7 +276,7 @@
  {
    if (!info)
@@ -502,7 +502,7 @@ diff -Naur --exclude=CVS --exclude=.git ParaView-4.2.0_SRC/ParaViewCore/ServerMa
  
 diff -Naur --exclude=CVS --exclude=.git ParaView-4.2.0_SRC/ParaViewCore/ServerManager/SMApplication/Resources/views_and_representations.xml ParaView-4.2.0_SRC.new/ParaViewCore/ServerManager/SMApplication/Resources/views_and_representations.xml
 --- ParaView-4.2.0_SRC/ParaViewCore/ServerManager/SMApplication/Resources/views_and_representations.xml	2014-09-23 18:46:44.000000000 +0400
-+++ ParaView-4.2.0_SRC.new/ParaViewCore/ServerManager/SMApplication/Resources/views_and_representations.xml	2014-11-18 15:25:05.000000000 +0300
++++ ParaView-4.2.0_SRC.new/ParaViewCore/ServerManager/SMApplication/Resources/views_and_representations.xml	2014-12-19 15:39:41.000000000 +0300
 @@ -2044,16 +2044,14 @@
        <IntVectorProperty command="SetStereoRender"
                           default_values="0"
@@ -549,7 +549,7 @@ diff -Naur --exclude=CVS --exclude=.git ParaView-4.2.0_SRC/ParaViewCore/ServerMa
                           name="NonlinearSubdivisionLevel"
 diff -Naur --exclude=CVS --exclude=.git ParaView-4.2.0_SRC/ParaViewCore/VTKExtensions/Default/vtkPVImageReader.h ParaView-4.2.0_SRC.new/ParaViewCore/VTKExtensions/Default/vtkPVImageReader.h
 --- ParaView-4.2.0_SRC/ParaViewCore/VTKExtensions/Default/vtkPVImageReader.h	2014-09-23 18:46:44.000000000 +0400
-+++ ParaView-4.2.0_SRC.new/ParaViewCore/VTKExtensions/Default/vtkPVImageReader.h	2014-11-18 15:23:10.000000000 +0300
++++ ParaView-4.2.0_SRC.new/ParaViewCore/VTKExtensions/Default/vtkPVImageReader.h	2014-12-19 15:39:41.000000000 +0300
 @@ -19,27 +19,15 @@
  
  #include "vtkPVVTKExtensionsDefaultModule.h" //needed for exports
@@ -582,7 +582,7 @@ diff -Naur --exclude=CVS --exclude=.git ParaView-4.2.0_SRC/ParaViewCore/VTKExten
  
 diff -Naur --exclude=CVS --exclude=.git ParaView-4.2.0_SRC/ParaViewCore/VTKExtensions/Rendering/vtkPVGeometryFilter.cxx ParaView-4.2.0_SRC.new/ParaViewCore/VTKExtensions/Rendering/vtkPVGeometryFilter.cxx
 --- ParaView-4.2.0_SRC/ParaViewCore/VTKExtensions/Rendering/vtkPVGeometryFilter.cxx	2014-09-23 18:46:44.000000000 +0400
-+++ ParaView-4.2.0_SRC.new/ParaViewCore/VTKExtensions/Rendering/vtkPVGeometryFilter.cxx	2014-11-18 15:23:10.000000000 +0300
++++ ParaView-4.2.0_SRC.new/ParaViewCore/VTKExtensions/Rendering/vtkPVGeometryFilter.cxx	2014-12-19 15:39:41.000000000 +0300
 @@ -64,6 +64,7 @@
  #include "vtkStructuredGrid.h"
  #include "vtkStructuredGridOutlineFilter.h"
@@ -786,7 +786,7 @@ diff -Naur --exclude=CVS --exclude=.git ParaView-4.2.0_SRC/ParaViewCore/VTKExten
  //----------------------------------------------------------------------------
 diff -Naur --exclude=CVS --exclude=.git ParaView-4.2.0_SRC/ParaViewCore/VTKExtensions/Rendering/vtkPVGeometryFilter.h ParaView-4.2.0_SRC.new/ParaViewCore/VTKExtensions/Rendering/vtkPVGeometryFilter.h
 --- ParaView-4.2.0_SRC/ParaViewCore/VTKExtensions/Rendering/vtkPVGeometryFilter.h	2014-09-23 18:46:44.000000000 +0400
-+++ ParaView-4.2.0_SRC.new/ParaViewCore/VTKExtensions/Rendering/vtkPVGeometryFilter.h	2014-11-18 15:23:10.000000000 +0300
++++ ParaView-4.2.0_SRC.new/ParaViewCore/VTKExtensions/Rendering/vtkPVGeometryFilter.h	2014-12-19 15:39:41.000000000 +0300
 @@ -85,6 +85,13 @@
    vtkBooleanMacro(GenerateCellNormals, int);
  
@@ -840,7 +840,7 @@ diff -Naur --exclude=CVS --exclude=.git ParaView-4.2.0_SRC/ParaViewCore/VTKExten
    vtkMultiProcessController* Controller;
 diff -Naur --exclude=CVS --exclude=.git ParaView-4.2.0_SRC/Qt/Components/pqPropertiesPanel.cxx ParaView-4.2.0_SRC.new/Qt/Components/pqPropertiesPanel.cxx
 --- ParaView-4.2.0_SRC/Qt/Components/pqPropertiesPanel.cxx	2014-09-23 18:46:44.000000000 +0400
-+++ ParaView-4.2.0_SRC.new/Qt/Components/pqPropertiesPanel.cxx	2014-11-18 15:23:10.000000000 +0300
++++ ParaView-4.2.0_SRC.new/Qt/Components/pqPropertiesPanel.cxx	2014-12-19 15:39:41.000000000 +0300
 @@ -383,6 +383,14 @@
    this->Internals->Ui.DisplayButton->setVisible(has_multiples_types && has_display);
    this->Internals->Ui.ViewButton->setVisible(has_multiples_types && has_view);
@@ -885,9 +885,29 @@ diff -Naur --exclude=CVS --exclude=.git ParaView-4.2.0_SRC/Qt/Components/pqPrope
      if (_view)
        {
        // create the widgets for this view
+diff -Naur --exclude=CVS --exclude=.git ParaView-4.2.0_SRC/Qt/Python/pqPythonShell.cxx ParaView-4.2.0_SRC.new/Qt/Python/pqPythonShell.cxx
+--- ParaView-4.2.0_SRC/Qt/Python/pqPythonShell.cxx	2014-09-23 18:46:44.000000000 +0400
++++ ParaView-4.2.0_SRC.new/Qt/Python/pqPythonShell.cxx	2014-12-19 15:40:01.000000000 +0300
+@@ -118,6 +118,7 @@
+   /// string list.
+   QStringList getPythonAttributes(const QString& pythonObjectName)
+     {
++    VTK_PY_GIL_ENSURE
+     if (this->Interpreter == NULL ||
+       this->Interpreter->GetInteractiveConsoleLocalsPyObject() == NULL)
+       {
+@@ -191,7 +192,7 @@
+         }
+       Py_DECREF(object);
+       }
+-
++    VTK_PY_GIL_RELEASE
+     return results;
+     }
+ };
 diff -Naur --exclude=CVS --exclude=.git ParaView-4.2.0_SRC/Qt/Python/pqPythonSyntaxHighlighter.cxx ParaView-4.2.0_SRC.new/Qt/Python/pqPythonSyntaxHighlighter.cxx
 --- ParaView-4.2.0_SRC/Qt/Python/pqPythonSyntaxHighlighter.cxx	2014-09-23 18:46:44.000000000 +0400
-+++ ParaView-4.2.0_SRC.new/Qt/Python/pqPythonSyntaxHighlighter.cxx	2014-11-18 15:23:10.000000000 +0300
++++ ParaView-4.2.0_SRC.new/Qt/Python/pqPythonSyntaxHighlighter.cxx	2014-12-19 15:39:41.000000000 +0300
 @@ -65,6 +65,7 @@
    this->Internals->TextEdit = textEdit;
    this->Internals->TextEdit->installEventFilter(this);
@@ -919,7 +939,7 @@ diff -Naur --exclude=CVS --exclude=.git ParaView-4.2.0_SRC/Qt/Python/pqPythonSyn
      int startOfPre = pygmentsOutput.indexOf(">",pygmentsOutput.indexOf("<pre"))+1;
 diff -Naur --exclude=CVS --exclude=.git ParaView-4.2.0_SRC/Utilities/VisItBridge/databases/Velodyne/VelodyneReader.C ParaView-4.2.0_SRC.new/Utilities/VisItBridge/databases/Velodyne/VelodyneReader.C
 --- ParaView-4.2.0_SRC/Utilities/VisItBridge/databases/Velodyne/VelodyneReader.C	2014-09-23 18:46:46.000000000 +0400
-+++ ParaView-4.2.0_SRC.new/Utilities/VisItBridge/databases/Velodyne/VelodyneReader.C	2014-11-18 15:23:10.000000000 +0300
++++ ParaView-4.2.0_SRC.new/Utilities/VisItBridge/databases/Velodyne/VelodyneReader.C	2014-12-19 15:39:41.000000000 +0300
 @@ -2,7 +2,7 @@
  // This code was contributed to the VisIt project by Corvid Technologies
  // on February 10, 2010.
@@ -939,7 +959,7 @@ diff -Naur --exclude=CVS --exclude=.git ParaView-4.2.0_SRC/Utilities/VisItBridge
  #include <set>
 diff -Naur --exclude=CVS --exclude=.git ParaView-4.2.0_SRC/Utilities/VisItBridge/databases/Vs/VsFilter.C ParaView-4.2.0_SRC.new/Utilities/VisItBridge/databases/Vs/VsFilter.C
 --- ParaView-4.2.0_SRC/Utilities/VisItBridge/databases/Vs/VsFilter.C	2014-09-23 18:46:46.000000000 +0400
-+++ ParaView-4.2.0_SRC.new/Utilities/VisItBridge/databases/Vs/VsFilter.C	2014-11-18 15:23:10.000000000 +0300
++++ ParaView-4.2.0_SRC.new/Utilities/VisItBridge/databases/Vs/VsFilter.C	2014-12-19 15:39:41.000000000 +0300
 @@ -1,3 +1,7 @@
 +#define H5Gopen_vers 2
 +#define H5Dopen_vers 2
@@ -962,7 +982,7 @@ diff -Naur --exclude=CVS --exclude=.git ParaView-4.2.0_SRC/Utilities/VisItBridge
          VsLog::errorLog() <<"VsFilter::visitLinks() - unable to get id for external object " <<name <<std::endl;
 diff -Naur --exclude=CVS --exclude=.git ParaView-4.2.0_SRC/Utilities/VisItBridge/databases/Vs/VsH5File.C ParaView-4.2.0_SRC.new/Utilities/VisItBridge/databases/Vs/VsH5File.C
 --- ParaView-4.2.0_SRC/Utilities/VisItBridge/databases/Vs/VsH5File.C	2014-09-23 18:46:46.000000000 +0400
-+++ ParaView-4.2.0_SRC.new/Utilities/VisItBridge/databases/Vs/VsH5File.C	2014-11-18 15:23:10.000000000 +0300
++++ ParaView-4.2.0_SRC.new/Utilities/VisItBridge/databases/Vs/VsH5File.C	2014-12-19 15:39:41.000000000 +0300
 @@ -4,7 +4,7 @@
   *  Created on: Apr 27, 2010
   *      Author: mdurant
@@ -974,7 +994,7 @@ diff -Naur --exclude=CVS --exclude=.git ParaView-4.2.0_SRC/Utilities/VisItBridge
  #include "VsFilter.h"
 diff -Naur --exclude=CVS --exclude=.git ParaView-4.2.0_SRC/VTK/CMake/vtkModuleTop.cmake ParaView-4.2.0_SRC.new/VTK/CMake/vtkModuleTop.cmake
 --- ParaView-4.2.0_SRC/VTK/CMake/vtkModuleTop.cmake	2014-09-23 18:47:10.000000000 +0400
-+++ ParaView-4.2.0_SRC.new/VTK/CMake/vtkModuleTop.cmake	2014-11-18 15:23:10.000000000 +0300
++++ ParaView-4.2.0_SRC.new/VTK/CMake/vtkModuleTop.cmake	2014-12-19 15:39:41.000000000 +0300
 @@ -476,6 +476,7 @@
    get_property(VTK_TARGETS GLOBAL PROPERTY VTK_TARGETS)
    if(VTK_TARGETS)
@@ -985,7 +1005,7 @@ diff -Naur --exclude=CVS --exclude=.git ParaView-4.2.0_SRC/VTK/CMake/vtkModuleTo
      configure_file(${CMAKE_ROOT}/Modules/CMakeConfigurableFile.in
 diff -Naur --exclude=CVS --exclude=.git ParaView-4.2.0_SRC/VTK/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.cxx ParaView-4.2.0_SRC.new/VTK/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.cxx
 --- ParaView-4.2.0_SRC/VTK/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.cxx	2014-09-23 18:47:11.000000000 +0400
-+++ ParaView-4.2.0_SRC.new/VTK/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.cxx	2014-11-18 15:23:10.000000000 +0300
++++ ParaView-4.2.0_SRC.new/VTK/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.cxx	2014-12-19 15:39:41.000000000 +0300
 @@ -48,7 +48,7 @@
  //----------------------------------------------------------------------------
  vtkMatplotlibMathTextUtilities::Availablity
@@ -997,7 +1017,7 @@ diff -Naur --exclude=CVS --exclude=.git ParaView-4.2.0_SRC/VTK/Rendering/Matplot
  // is defined in the environment. Use vtkGenericWarningMacro to allow this to
 diff -Naur --exclude=CVS --exclude=.git ParaView-4.2.0_SRC/VTK/ThirdParty/verdict/vtkverdict/V_TetMetric.cpp ParaView-4.2.0_SRC.new/VTK/ThirdParty/verdict/vtkverdict/V_TetMetric.cpp
 --- ParaView-4.2.0_SRC/VTK/ThirdParty/verdict/vtkverdict/V_TetMetric.cpp	2014-09-23 18:47:11.000000000 +0400
-+++ ParaView-4.2.0_SRC.new/VTK/ThirdParty/verdict/vtkverdict/V_TetMetric.cpp	2014-11-18 15:23:10.000000000 +0300
++++ ParaView-4.2.0_SRC.new/VTK/ThirdParty/verdict/vtkverdict/V_TetMetric.cpp	2014-12-19 15:39:41.000000000 +0300
 @@ -373,7 +373,7 @@
            coordinates[3][1] - coordinates[0][1],
            coordinates[3][2] - coordinates[0][2] );
@@ -1018,7 +1038,7 @@ diff -Naur --exclude=CVS --exclude=.git ParaView-4.2.0_SRC/VTK/ThirdParty/verdic
      return (double) VERDICT_MIN( aspect_ratio, VERDICT_DBL_MAX );
 diff -Naur --exclude=CVS --exclude=.git ParaView-4.2.0_SRC/VTK/Utilities/Python/vtkPython.h ParaView-4.2.0_SRC.new/VTK/Utilities/Python/vtkPython.h
 --- ParaView-4.2.0_SRC/VTK/Utilities/Python/vtkPython.h	2014-09-23 18:47:11.000000000 +0400
-+++ ParaView-4.2.0_SRC.new/VTK/Utilities/Python/vtkPython.h	2014-11-18 15:23:10.000000000 +0300
++++ ParaView-4.2.0_SRC.new/VTK/Utilities/Python/vtkPython.h	2014-12-19 15:39:41.000000000 +0300
 @@ -87,4 +87,14 @@
  #error "Python.h is different version from what VTK was configured with!!"
  #endif
@@ -1036,7 +1056,7 @@ diff -Naur --exclude=CVS --exclude=.git ParaView-4.2.0_SRC/VTK/Utilities/Python/
  #endif
 diff -Naur --exclude=CVS --exclude=.git ParaView-4.2.0_SRC/VTK/Utilities/PythonInterpreter/vtkPythonInteractiveInterpreter.cxx ParaView-4.2.0_SRC.new/VTK/Utilities/PythonInterpreter/vtkPythonInteractiveInterpreter.cxx
 --- ParaView-4.2.0_SRC/VTK/Utilities/PythonInterpreter/vtkPythonInteractiveInterpreter.cxx	2014-09-23 18:47:11.000000000 +0400
-+++ ParaView-4.2.0_SRC.new/VTK/Utilities/PythonInterpreter/vtkPythonInteractiveInterpreter.cxx	2014-11-18 15:23:10.000000000 +0300
++++ ParaView-4.2.0_SRC.new/VTK/Utilities/PythonInterpreter/vtkPythonInteractiveInterpreter.cxx	2014-12-19 15:39:41.000000000 +0300
 @@ -45,6 +45,7 @@
  
    void CleanupPythonObjects()
@@ -1119,7 +1139,7 @@ diff -Naur --exclude=CVS --exclude=.git ParaView-4.2.0_SRC/VTK/Utilities/PythonI
  
 diff -Naur --exclude=CVS --exclude=.git ParaView-4.2.0_SRC/VTK/Utilities/PythonInterpreter/vtkPythonInterpreter.cxx ParaView-4.2.0_SRC.new/VTK/Utilities/PythonInterpreter/vtkPythonInterpreter.cxx
 --- ParaView-4.2.0_SRC/VTK/Utilities/PythonInterpreter/vtkPythonInterpreter.cxx	2014-09-23 18:47:11.000000000 +0400
-+++ ParaView-4.2.0_SRC.new/VTK/Utilities/PythonInterpreter/vtkPythonInterpreter.cxx	2014-11-18 15:23:10.000000000 +0300
++++ ParaView-4.2.0_SRC.new/VTK/Utilities/PythonInterpreter/vtkPythonInterpreter.cxx	2014-12-19 15:39:54.000000000 +0300
 @@ -60,10 +60,12 @@
  
    inline void vtkPrependPythonPath(const char* pathtoadd)
@@ -1199,15 +1219,17 @@ diff -Naur --exclude=CVS --exclude=.git ParaView-4.2.0_SRC/VTK/Utilities/PythonI
      Py_Finalize();
      }
  }
-@@ -213,6 +232,7 @@
+@@ -221,7 +240,9 @@
+     vtkPythonInterpreter::SetProgramName(argv[0]);
+     }
+   vtkPythonInterpreter::Initialize(1);
++  VTK_PY_GIL_ENSURE
+   return Py_Main(argc, argv);
++  // Py_Main already does a finalize etc ...
  }
  
  //----------------------------------------------------------------------------
-+// [ABN] not thread safe for now - only used by pvpython?
- int vtkPythonInterpreter::PyMain(int argc, char** argv)
- {
-   if (!vtkPythonInterpreter::InitializedOnce && Py_IsInitialized() == 0 &&
-@@ -235,7 +255,9 @@
+@@ -235,7 +256,9 @@
    buffer.erase(std::remove(buffer.begin(), buffer.end(), '\r'), buffer.end());
  
    // The cast is necessary because PyRun_SimpleString() hasn't always been const-correct
@@ -1219,7 +1241,7 @@ diff -Naur --exclude=CVS --exclude=.git ParaView-4.2.0_SRC/VTK/Utilities/PythonI
  //----------------------------------------------------------------------------
 diff -Naur --exclude=CVS --exclude=.git ParaView-4.2.0_SRC/VTK/Wrapping/PythonCore/vtkPythonCommand.cxx ParaView-4.2.0_SRC.new/VTK/Wrapping/PythonCore/vtkPythonCommand.cxx
 --- ParaView-4.2.0_SRC/VTK/Wrapping/PythonCore/vtkPythonCommand.cxx	2014-09-23 18:47:11.000000000 +0400
-+++ ParaView-4.2.0_SRC.new/VTK/Wrapping/PythonCore/vtkPythonCommand.cxx	2014-11-18 15:23:10.000000000 +0300
++++ ParaView-4.2.0_SRC.new/VTK/Wrapping/PythonCore/vtkPythonCommand.cxx	2014-12-19 15:39:41.000000000 +0300
 @@ -30,14 +30,18 @@
    vtkPythonUtil::UnRegisterPythonCommand(this);
    if (this->obj && Py_IsInitialized())
@@ -1273,7 +1295,7 @@ diff -Naur --exclude=CVS --exclude=.git ParaView-4.2.0_SRC/VTK/Wrapping/PythonCo
  #if (PY_MAJOR_VERSION > 2) || \
 diff -Naur --exclude=CVS --exclude=.git ParaView-4.2.0_SRC/VTK/Wrapping/PythonCore/vtkSmartPyObject.cxx ParaView-4.2.0_SRC.new/VTK/Wrapping/PythonCore/vtkSmartPyObject.cxx
 --- ParaView-4.2.0_SRC/VTK/Wrapping/PythonCore/vtkSmartPyObject.cxx	2014-09-23 18:47:11.000000000 +0400
-+++ ParaView-4.2.0_SRC.new/VTK/Wrapping/PythonCore/vtkSmartPyObject.cxx	2014-11-18 15:23:10.000000000 +0300
++++ ParaView-4.2.0_SRC.new/VTK/Wrapping/PythonCore/vtkSmartPyObject.cxx	2014-12-19 15:39:41.000000000 +0300
 @@ -30,37 +30,52 @@
  vtkSmartPyObject::vtkSmartPyObject(const vtkSmartPyObject &other) :
    Object(other.Object)
@@ -1339,7 +1361,7 @@ diff -Naur --exclude=CVS --exclude=.git ParaView-4.2.0_SRC/VTK/Wrapping/PythonCo
  }
 diff -Naur --exclude=CVS --exclude=.git ParaView-4.2.0_SRC/Wrapping/Python/paraview/servermanager.py ParaView-4.2.0_SRC.new/Wrapping/Python/paraview/servermanager.py
 --- ParaView-4.2.0_SRC/Wrapping/Python/paraview/servermanager.py	2014-09-23 18:46:44.000000000 +0400
-+++ ParaView-4.2.0_SRC.new/Wrapping/Python/paraview/servermanager.py	2014-11-18 15:23:10.000000000 +0300
++++ ParaView-4.2.0_SRC.new/Wrapping/Python/paraview/servermanager.py	2014-12-19 15:39:41.000000000 +0300
 @@ -1092,7 +1092,7 @@
          property = self.SMProperty
          nElems = property.GetNumberOfElements()