From ac793937756e520d941310ca65826c6abc1a37b3 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Dec 18 2015 23:22:06 +0000 Subject: Update to 5.0.0-RC2 - Drop jsoncpp patch applied upstream --- diff --git a/.gitignore b/.gitignore index 7e5de27..a3c46d8 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ ParaView-3.8.1.tar.gz /ParaView-v4.3.1-source.tar.gz /ParaView-v4.4.0-source.tar.gz /ParaView-v5.0.0-RC1-source.tar.gz +/ParaView-v5.0.0-RC2-source.tar.gz diff --git a/paraview-jsoncpp.patch b/paraview-jsoncpp.patch deleted file mode 100644 index c6c4136..0000000 --- a/paraview-jsoncpp.patch +++ /dev/null @@ -1,116 +0,0 @@ -diff -up ParaView-v4.4.0-source/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx.jsoncpp ParaView-v4.4.0-source/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx ---- ParaView-v4.4.0-source/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx.jsoncpp 2015-09-11 11:58:50.000000000 -0600 -+++ ParaView-v4.4.0-source/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx 2015-09-19 13:16:36.369348728 -0600 -@@ -146,7 +146,7 @@ public: - } - } - -- return Json::Value::null; -+ return Json::Value::nullRef; - } - - //---------------------------------------------------------------------------- -@@ -170,7 +170,7 @@ public: - } - } - -- return Json::Value::null; -+ return Json::Value::nullRef; - } - - //---------------------------------------------------------------------------- -@@ -473,7 +473,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) - { -@@ -510,7 +510,7 @@ public: - if (jsonValue.isArray()) - { - // Reset to null so that we aren't setting a value on a Json::Value array -- jsonValue = Json::Value::null; -+ jsonValue = Json::Value::nullRef; - this->Modified(); - } - -@@ -525,7 +525,7 @@ public: - if (!jsonValue.isArray() && !jsonValue.isNull()) - { - // Reset to null so that the jsonValue.resize() operation works -- jsonValue = Json::Value::null; -+ jsonValue = Json::Value::nullRef; - this->Modified(); - } - -@@ -554,7 +554,7 @@ public: - if (jsonValue.isArray()) - { - // Reset to null so that we aren't setting a value on a Json::Value array -- jsonValue = Json::Value::null; -+ jsonValue = Json::Value::nullRef; - this->Modified(); - } - -@@ -569,7 +569,7 @@ public: - if (!jsonValue.isArray() && !jsonValue.isNull()) - { - // Reset to null so that the jsonValue.resize() operation works -- jsonValue = Json::Value::null; -+ jsonValue = Json::Value::nullRef; - this->Modified(); - } - -@@ -598,7 +598,7 @@ public: - if (jsonValue.isArray()) - { - // Reset to null so that we aren't setting a value on a Json::Value array -- jsonValue = Json::Value::null; -+ jsonValue = Json::Value::nullRef; - this->Modified(); - } - -@@ -613,7 +613,7 @@ public: - if (!jsonValue.isArray() && !jsonValue.isNull()) - { - // Reset to null so that the jsonValue.resize() operation works -- jsonValue = Json::Value::null; -+ jsonValue = Json::Value::nullRef; - this->Modified(); - } - -diff -up ParaView-v4.4.0-source/ParaViewCore/VTKExtensions/CosmoTools/vtkPMultiResolutionGenericIOReader.cxx.jsoncpp ParaView-v4.4.0-source/ParaViewCore/VTKExtensions/CosmoTools/vtkPMultiResolutionGenericIOReader.cxx ---- ParaView-v4.4.0-source/ParaViewCore/VTKExtensions/CosmoTools/vtkPMultiResolutionGenericIOReader.cxx.jsoncpp 2015-09-11 11:58:50.000000000 -0600 -+++ ParaView-v4.4.0-source/ParaViewCore/VTKExtensions/CosmoTools/vtkPMultiResolutionGenericIOReader.cxx 2015-09-19 13:15:24.403093100 -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 82ca695..3b67802 100644 --- a/paraview.spec +++ b/paraview.spec @@ -7,7 +7,7 @@ %global pv_min 0 %global pv_patch 0 %global pv_majmin %{pv_maj}.%{pv_min} -%global rcver -RC1 +%global rcver -RC2 # We need jsoncpp >= 0.7 %if 0%{?fedora} >= 24 @@ -29,7 +29,7 @@ Name: paraview Version: %{pv_majmin}.%{pv_patch} -Release: 0.1.RC1%{?dist} +Release: 0.2.RC2%{?dist} Summary: Parallel visualization application Group: Applications/Engineering @@ -43,9 +43,6 @@ Patch0: paraview-desktop.patch # Unbundle eigen # https://bugzilla.redhat.com/show_bug.cgi?id=1251289 Patch2: paraview-eigen.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 @@ -312,10 +309,6 @@ developing applications that use %{name}-mpich. %setup -q -n ParaView-v%{version}%{rcver}-source %patch0 -p1 -b .desktop %patch2 -p1 -b .eigen -# For jsoncpp 0.10 in F24+ -%if 0%{?fedora} >= 24 -%patch4 -p1 -b .jsoncpp -%endif %patch5 -p1 -b .headers %patch7 -p1 -b .plugin-env # Install python properly @@ -556,6 +549,10 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Fri Dec 18 2015 Orion Poplawski - 5.0.0-0.2.RC2 +- Update to 5.0.0-RC2 +- Drop jsoncpp patch applied upstream + * Thu Dec 10 2015 Orion Poplawski - 5.0.0-0.1.RC1 - Update to 5.0.0-RC1 diff --git a/sources b/sources index 9c813a3..f071353 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -18d6bb8a4675e3029ec077da162b2522 ParaView-v5.0.0-RC1-source.tar.gz +867afc9d1b2f8837f61d8f2405194bcf ParaView-v5.0.0-RC2-source.tar.gz