diff --git a/paraview-jsoncpp.patch b/paraview-jsoncpp.patch new file mode 100644 index 0000000..81ea638 --- /dev/null +++ b/paraview-jsoncpp.patch @@ -0,0 +1,62 @@ +diff -up ParaView-v4.3.1-source/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx.jsoncpp ParaView-v4.3.1-source/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx +--- ParaView-v4.3.1-source/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx.jsoncpp 2015-01-14 06:07:33.000000000 -0700 ++++ ParaView-v4.3.1-source/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx 2015-09-17 16:00:02.167580486 -0600 +@@ -147,7 +147,7 @@ public: + } + } + +- return Json::Value::null; ++ return Json::Value::nullRef; + } + + //---------------------------------------------------------------------------- +@@ -174,7 +174,7 @@ public: + } + } + +- return Json::Value::null; ++ return Json::Value::nullRef; + } + + //---------------------------------------------------------------------------- +@@ -481,7 +481,7 @@ public: + + Json::Path settingPath(root.c_str()); + Json::Value & jsonValue = settingPath.make(this->SettingCollections[0].Value); +- jsonValue[leaf] = Json::Value::null; ++ jsonValue[leaf] = Json::Value::nullRef; + + if (values.size() > 1) + { +diff -up ParaView-v4.3.1-source/ParaViewCore/VTKExtensions/CosmoTools/vtkPMultiResolutionGenericIOReader.cxx.jsoncpp ParaView-v4.3.1-source/ParaViewCore/VTKExtensions/CosmoTools/vtkPMultiResolutionGenericIOReader.cxx +--- ParaView-v4.3.1-source/ParaViewCore/VTKExtensions/CosmoTools/vtkPMultiResolutionGenericIOReader.cxx.jsoncpp 2015-01-14 06:07:33.000000000 -0700 ++++ ParaView-v4.3.1-source/ParaViewCore/VTKExtensions/CosmoTools/vtkPMultiResolutionGenericIOReader.cxx 2015-09-17 15:59:30.059015745 -0600 +@@ -85,7 +85,7 @@ public: + { + JSON_READ_ERROR(); + } +- const Json::Value& levelsArray = root.get("levels",Json::Value::null); ++ const Json::Value& levelsArray = root.get("levels",Json::Value::nullRef); + if (!levelsArray.isArray()) + { + JSON_READ_ERROR(); +@@ -97,7 +97,7 @@ public: + { + JSON_READ_ERROR(); + } +- const Json::Value& timestepsArray = level.get("timesteps",Json::Value::null); ++ const Json::Value& timestepsArray = level.get("timesteps",Json::Value::nullRef); + if (!timestepsArray.isArray()) + { + JSON_READ_ERROR(); +@@ -111,8 +111,8 @@ public: + { + JSON_READ_ERROR(); + } +- const Json::Value& time = timestep.get("time",Json::Value::null); +- const Json::Value& file = timestep.get("file",Json::Value::null); ++ const Json::Value& time = timestep.get("time",Json::Value::nullRef); ++ const Json::Value& file = timestep.get("file",Json::Value::nullRef); + if (!time.isNumeric()) + { + JSON_READ_ERROR(); diff --git a/paraview.spec b/paraview.spec index d592add..6c363aa 100644 --- a/paraview.spec +++ b/paraview.spec @@ -40,6 +40,9 @@ Patch1: paraview-protobuf.patch Patch2: vtk-type.patch # Patch to vtk to use system netcdf library Patch3: vtk-6.1.0-netcdf.patch +# Patch to compile with jsoncpp 0.10 +# http://www.paraview.org/Bug/view.php?id=15736 +Patch4: paraview-jsoncpp.patch # Install missing headers # https://bugzilla.redhat.com/show_bug.cgi?id=1100911 # http://www.vtk.org/Bug/view.php?id=14700 @@ -291,6 +294,7 @@ developing applications that use %{name}-mpich. %patch1 -p1 -b .protobuf %patch2 -p0 -b .type %patch3 -p0 -b .netcdf +%patch4 -p1 -b .jsoncpp %patch5 -p1 -b .headers %patch6 -p1 -b .topological-sort-cmake %patch7 -p1 -b .plugin-env @@ -530,6 +534,7 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog * Thu Sep 17 2015 Orion Poplawski - 4.3.1-15 - Rebuild for openmpi 1.10.0 +- Add patch for jsoncpp 0.10 support * Thu Aug 27 2015 Jonathan Wakely - 4.3.1-14 - Rebuilt for Boost 1.59