diff options
author | Matthias Maier <tamiko@gentoo.org> | 2018-04-01 13:54:03 -0500 |
---|---|---|
committer | Matthias Maier <tamiko@gentoo.org> | 2018-04-01 15:40:32 -0500 |
commit | 6b900193b7504f5b0c9eab4a56e3584136f7e426 (patch) | |
tree | 8b4059cf96424109f7f3517d4719b2829592180a /sci-visualization/paraview/files | |
parent | app-admin/tripwire: Drops old version 2.4.3.5 (diff) | |
download | gentoo-6b900193b7504f5b0c9eab4a56e3584136f7e426.tar.gz gentoo-6b900193b7504f5b0c9eab4a56e3584136f7e426.tar.bz2 gentoo-6b900193b7504f5b0c9eab4a56e3584136f7e426.zip |
sci-visualization/paraview: version bump to 5.4.1
* add external CGNS dependency
* version bump to 5.4.1
* fix compilation with dev-libs/jsoncpp-1.8.4
* drop 5.2.0
Closes: https://bugs.gentoo.org/636112
Closes: https://bugs.gentoo.org/644716
Closes: https://bugs.gentoo.org/643748
Package-Manager: Portage-2.3.27, Repoman-2.3.9
Diffstat (limited to 'sci-visualization/paraview/files')
-rw-r--r-- | sci-visualization/paraview/files/paraview-5.4.1-jsoncpp_1.8.4.patch | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/sci-visualization/paraview/files/paraview-5.4.1-jsoncpp_1.8.4.patch b/sci-visualization/paraview/files/paraview-5.4.1-jsoncpp_1.8.4.patch new file mode 100644 index 000000000000..b4b64e94eef8 --- /dev/null +++ b/sci-visualization/paraview/files/paraview-5.4.1-jsoncpp_1.8.4.patch @@ -0,0 +1,17 @@ +diff --git a/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx b/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx +index b6e2b55..d27ad9d 100644 +--- a/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx ++++ b/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx +@@ -788,7 +788,10 @@ public: + this->GetSettingBelowPriority(propertySettingCString, highestPriority); + if (lowerPriorityValue.isNull()) + { +- if (!proxyValue.removeMember(property->GetXMLName()).isNull()) ++ // Allocated as done in Json::Value removeMember(const char* key). ++ Json::Value removedValue; ++ if (proxyValue.removeMember(property->GetXMLName(), &removedValue) && ++ !removedValue.isNull()) + { + this->Modified(); + } + |