From 0d733e67af5908ed79fd3d9072f8615ccc00eb15 Mon Sep 17 00:00:00 2001
From: Björn Esser <besser82@fedoraproject.org>
Date: Jan 14 2018 21:14:54 +0000
Subject: Add patch to fix build with jsoncpp-1.8.4


---

diff --git a/paraview-5.4.1-jsoncpp_184.patch b/paraview-5.4.1-jsoncpp_184.patch
new file mode 100644
index 0000000..24c5f09
--- /dev/null
+++ b/paraview-5.4.1-jsoncpp_184.patch
@@ -0,0 +1,15 @@
+diff --git a/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx b/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx
+index b6e2b5592a..1fb2f03a07 100644
+--- a/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx
++++ b/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx
+@@ -788,7 +788,9 @@ public:
+           this->GetSettingBelowPriority(propertySettingCString, highestPriority);
+         if (lowerPriorityValue.isNull())
+         {
+-          if (!proxyValue.removeMember(property->GetXMLName()).isNull())
++          Json::Value& removedValue = Json::objectValue;
++          proxyValue.removeMember(property->GetXMLName(), &removedValue);
++          if (!removedValue.isNull())
+           {
+             this->Modified();
+           }
diff --git a/paraview.spec b/paraview.spec
index 02fc8f3..fb5c7e5 100644
--- a/paraview.spec
+++ b/paraview.spec
@@ -51,7 +51,7 @@
 
 Name:           paraview
 Version:        %{pv_majmin}.%{pv_patch}
-Release:        7%{?relsuf}%{?dist}
+Release:        8%{?relsuf}%{?dist}
 Summary:        Parallel visualization application
 
 License:        BSD
@@ -59,6 +59,9 @@ URL:            http://www.paraview.org/
 Source0:        http://www.paraview.org/files/v%{pv_majmin}/ParaView-v%{version}%{?versuf}.tar.gz
 Source1:        paraview.xml
 
+# Fix for jsoncpp-1.8.4
+Patch0:         paraview-5.4.1-jsoncpp_184.patch
+
 %if 0%{?rhel} && 0%{?rhel} <= 7
 BuildRequires:  cmake3
 BuildRequires:  qt-assistant
@@ -375,7 +378,7 @@ developing applications that use %{name}-mpich.
 
 
 %prep
-%setup -q -n ParaView-v%{version}%{?versuf}
+%autosetup -n ParaView-v%{version}%{?versuf} -p 1
 # Install python properly
 sed -i -s '/VTK_INSTALL_PYTHON_USING_CMAKE/s/TRUE/FALSE/' CMakeLists.txt
 #Remove included thirdparty sources just to be sure
@@ -600,6 +603,9 @@ update-mime-database \
 
 
 %changelog
+* Sun Jan 14 2018 Björn Esser <besser82@fedoraproject.org> - 5.4.1-8
+- Add patch to fix build with jsoncpp-1.8.4
+
 * Tue Dec 26 2017 Björn Esser <besser82@fedoraproject.org> - 5.4.1-7
 - Rebuilt for jsoncpp.so.20