diff --git a/.gitignore b/.gitignore index 799171a..50135d9 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ ParaView-3.8.1.tar.gz /ParaView-v5.1.2.tar.gz /ParaView-v5.2.0-RC1.tar.gz /ParaView-v5.2.0-RC2.tar.gz +/ParaView-v5.2.0-RC3.tar.gz diff --git a/paraview-5.2.0-libjsoncpp_so_11.patch b/paraview-5.2.0-libjsoncpp_so_11.patch deleted file mode 100644 index 826adeb..0000000 --- a/paraview-5.2.0-libjsoncpp_so_11.patch +++ /dev/null @@ -1,66 +0,0 @@ -From f29938437db227528e28998d4154aa1f43ae7e26 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= -Date: Tue, 18 Oct 2016 12:16:58 +0200 -Subject: [PATCH] Fix build with JSONcpp >= 1.7.7, specialized template - (#16938) - ---- - ParaViewCore/ServerManager/Core/vtkSMSettings.cxx | 42 +++++++++++++++++++++++ - 1 file changed, 42 insertions(+) - -diff --git a/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx b/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx -index 49a0b22..aa17fa6 100644 ---- a/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx -+++ b/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx -@@ -1465,6 +1465,48 @@ Json::Value vtkConvertXMLElementToJSON( - ; - } - -+// We need a specialized template for `vtkIdType`, if compiling -+// with `VTK_USE_64BIT_IDS=ON`, because JSONcpp >= 1.7.7 switched -+// from at-least width (long long int) to fixed width (int64_t) -+// integers. If compiling with `VTK_USE_64BIT_IDS=OFF` this is -+// not needed, because vtkIdType represents a plain integer in -+// this case. -+// -+// See: https://gitlab.kitware.com/paraview/paraview/issues/16938 -+#ifdef VTK_USE_64BIT_IDS -+template <> -+Json::Value vtkConvertXMLElementToJSON ( -+ vtkSMVectorProperty* vp, -+ const std::vector >& elements) -+{ -+ // Since we need to handle enumeration domain :/. -+ vtkSMEnumerationDomain* enumDomain = vtkSMEnumerationDomain::SafeDownCast( -+ vp->FindDomain("vtkSMEnumerationDomain")); -+ Json::Value value(Json::arrayValue); -+ for (size_t cc=0; cc < elements.size(); ++cc) -+ { -+ vtkIdType xmlValue; -+ elements[cc]->GetScalarAttribute("value", &xmlValue); -+ const char* txt = enumDomain? enumDomain->GetEntryTextForValue(xmlValue) : NULL; -+ if (txt) -+ { -+ value[static_cast(cc)] = Json::Value(txt); -+ } -+ else -+ { -+ // We need to cast from `vtkIdType` to `int64_t` explicitly. -+ value[static_cast(cc)] = Json::Value(static_cast(xmlValue)); -+ } -+ } -+ if (vp->GetNumberOfElements()==1 && vp->GetRepeatCommand()==0 && value.size()==1) -+ { -+ return value[0]; -+ } -+ return value -+ ; -+} -+#endif // VTK_USE_64BIT_IDS -+ - template <> - Json::Value vtkConvertXMLElementToJSON( - vtkSMVectorProperty* vp, --- -2.7.4 - diff --git a/paraview.spec b/paraview.spec index 5602b7f..fe967fb 100644 --- a/paraview.spec +++ b/paraview.spec @@ -7,7 +7,7 @@ %global pv_min 2 %global pv_patch 0 %global pv_majmin %{pv_maj}.%{pv_min} -%global rcver RC2 +%global rcver RC3 # We need jsoncpp >= 0.7 %if 0%{?fedora} || 0%{?rhel} >= 8 @@ -30,7 +30,7 @@ Name: paraview Version: %{pv_majmin}.%{pv_patch} -Release: 0.6%{?rcver:.%rcver}%{?dist} +Release: 0.7%{?rcver:.%rcver}%{?dist} Summary: Parallel visualization application License: BSD @@ -44,10 +44,6 @@ Patch0: paraview-desktop.patch # Unbundle eigen # https://bugzilla.redhat.com/show_bug.cgi?id=1251289 Patch1: paraview-eigen.patch -# Fix call of overloaded 'Value(T&)' is ambiguous. -# https://gitlab.kitware.com/paraview/paraview/issues/16938 -# https://gitlab.kitware.com/paraview/paraview/merge_requests/1123 -Patch2: https://gitlab.kitware.com/paraview/paraview/merge_requests/1123.patch#/paraview-5.2.0-libjsoncpp_so_11.patch %if 0%{?rhel} && 0%{?rhel} <= 7 BuildRequires: cmake3 @@ -340,7 +336,6 @@ developing applications that use %{name}-mpich. %setup -q -n ParaView-v%{version}%{?rcver:-%rcver} %patch0 -p1 -b .desktop %patch1 -p1 -b .eigen -%patch2 -p1 -b .libjsoncpp_so_11 # Install python properly sed -i -s '/VTK_INSTALL_PYTHON_USING_CMAKE/s/TRUE/FALSE/' CMakeLists.txt #Remove included thirdparty sources just to be sure @@ -585,6 +580,10 @@ update-mime-database \ %changelog +* Sat Oct 29 2016 Orion Poplawski - 5.2.0-0.j.RC3 +- Update to 5.2.0-RC3 +- Drop libjsoncpp patch applied upstream + * Fri Oct 21 2016 Björn Esser - 5.2.0-0.6.RC2 - Add needed (Build)Requires - Remove cluttering files from %%{_pkgdocdir} diff --git a/sources b/sources index fefd54b..d872830 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -01c8f00914707689284866c53a990384 ParaView-v5.2.0-RC2.tar.gz +054883096d778537436b00e6ad9249bf ParaView-v5.2.0-RC3.tar.gz