From f8bbe03a12f6428d931fc869078cba5de8a13139 Mon Sep 17 00:00:00 2001
From: wyldckat <wyldckat@gmail.com>
Date: Sun, 5 Jun 2016 20:40:37 +0100
Subject: [PATCH 1/2] Bugfix: Make the PV4FoamReader work properly with
 ParaView 4.3.1. This applies two fixes:  1- The patch provided in report #290
 by Pascal Beckstein:
 https://sourceforge.net/p/openfoam-extend/ticketsfoamextendrelease/290/  2-
 Removed the GUI plugin entry, as per intructions on the wiki page mentioned
 in the bug report.

---
 .../PV4FoamReader/PV4FoamReader/CMakeLists.txt         | 10 +++++-----
 .../PV4FoamReader/PV4FoamReader/PV4FoamReader.qrc      |  5 -----
 .../PV4FoamReader/PV4FoamReader/PV4FoamReader.xml      |  6 ------
 .../PV4FoamReader/PV4FoamReader/PV4FoamReader_SM.xml   |  8 ++++++++
 4 files changed, 13 insertions(+), 16 deletions(-)
 delete mode 100644 applications/utilities/postProcessing/graphics/PV4FoamReader/PV4FoamReader/PV4FoamReader.qrc
 delete mode 100644 applications/utilities/postProcessing/graphics/PV4FoamReader/PV4FoamReader/PV4FoamReader.xml

diff --git a/applications/utilities/postProcessing/graphics/PV4FoamReader/PV4FoamReader/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PV4FoamReader/PV4FoamReader/CMakeLists.txt
index fc2804fd5..9b843f3b4 100644
--- a/applications/utilities/postProcessing/graphics/PV4FoamReader/PV4FoamReader/CMakeLists.txt
+++ b/applications/utilities/postProcessing/graphics/PV4FoamReader/PV4FoamReader/CMakeLists.txt
@@ -45,11 +45,11 @@ ADD_PARAVIEW_PLUGIN(
 )
 
 # Build the client-side plugin
-ADD_PARAVIEW_PLUGIN(
-    PV4FoamReader
-    "1.0"
-    GUI_RESOURCES PV4FoamReader.qrc
-)
+#ADD_PARAVIEW_PLUGIN(
+#    PV4FoamReader
+#    "1.0"
+#    GUI_RESOURCES PV4FoamReader.qrc
+#)
 
 TARGET_LINK_LIBRARIES(
     PV4FoamReader_SM
diff --git a/applications/utilities/postProcessing/graphics/PV4FoamReader/PV4FoamReader/PV4FoamReader.qrc b/applications/utilities/postProcessing/graphics/PV4FoamReader/PV4FoamReader/PV4FoamReader.qrc
deleted file mode 100644
index c5bfc27b7..000000000
--- a/applications/utilities/postProcessing/graphics/PV4FoamReader/PV4FoamReader/PV4FoamReader.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<RCC>
-    <qresource prefix="/ParaViewResources" >
-        <file>PV4FoamReader.xml</file>
-    </qresource>
-</RCC>
diff --git a/applications/utilities/postProcessing/graphics/PV4FoamReader/PV4FoamReader/PV4FoamReader.xml b/applications/utilities/postProcessing/graphics/PV4FoamReader/PV4FoamReader/PV4FoamReader.xml
deleted file mode 100644
index bb940768d..000000000
--- a/applications/utilities/postProcessing/graphics/PV4FoamReader/PV4FoamReader/PV4FoamReader.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<ParaViewReaders>
-  <Reader name="PV4FoamReader"
-          extensions="OpenFOAM"
-          file_description="OpenFOAM Reader">
-  </Reader>
-</ParaViewReaders>
diff --git a/applications/utilities/postProcessing/graphics/PV4FoamReader/PV4FoamReader/PV4FoamReader_SM.xml b/applications/utilities/postProcessing/graphics/PV4FoamReader/PV4FoamReader/PV4FoamReader_SM.xml
index 350a58f0a..9be87c4f3 100644
--- a/applications/utilities/postProcessing/graphics/PV4FoamReader/PV4FoamReader/PV4FoamReader_SM.xml
+++ b/applications/utilities/postProcessing/graphics/PV4FoamReader/PV4FoamReader/PV4FoamReader_SM.xml
@@ -4,6 +4,14 @@
     name="PV4FoamReader"
     class="vtkPV4FoamReader">
 
+    <!-- File extension section for paraview 4.3+ -->
+
+      <Hints>
+        <ReaderFactory
+          extensions="OpenFOAM"
+          file_description="OpenFOAM Reader" />
+      </Hints>
+
     <!-- File name - compulsory -->
     <StringVectorProperty
       name="FileName"

From 8e7cc9199dd6946060e909183f6f2815a24ba640 Mon Sep 17 00:00:00 2001
From: wyldckat <wyldckat@gmail.com>
Date: Sun, 5 Jun 2016 20:51:50 +0100
Subject: [PATCH 2/2] Minor repair for the previous commit.

---
 .../graphics/PV4FoamReader/PV4FoamReader/CMakeLists.txt    | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/applications/utilities/postProcessing/graphics/PV4FoamReader/PV4FoamReader/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PV4FoamReader/PV4FoamReader/CMakeLists.txt
index 9b843f3b4..e9054371f 100644
--- a/applications/utilities/postProcessing/graphics/PV4FoamReader/PV4FoamReader/CMakeLists.txt
+++ b/applications/utilities/postProcessing/graphics/PV4FoamReader/PV4FoamReader/CMakeLists.txt
@@ -44,13 +44,6 @@ ADD_PARAVIEW_PLUGIN(
     SERVER_MANAGER_SOURCES vtkPV4FoamReader.cxx
 )
 
-# Build the client-side plugin
-#ADD_PARAVIEW_PLUGIN(
-#    PV4FoamReader
-#    "1.0"
-#    GUI_RESOURCES PV4FoamReader.qrc
-#)
-
 TARGET_LINK_LIBRARIES(
     PV4FoamReader_SM
     foam