SHA256
1
0
forked from pool/paraview
Dominique Leuenberger 2021-06-06 20:40:23 +00:00 committed by Git OBS Bridge
commit 61d9bb2de2
8 changed files with 71 additions and 44 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b03258b7cddb77f0ee142e3e77b377e5b1f503bcabc02bfa578298c99a06980d
size 62784788

3
ParaView-v5.9.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0d486cb6fbf55e428845c9650486f87466efcb3155e40489182a7ea85dfd4c8d
size 62835572

View File

@ -1,37 +0,0 @@
From 4caacf4577e615a80c4282c700347dfb2e931788 Mon Sep 17 00:00:00 2001
From: Ben Boeckel <ben.boeckel@kitware.com>
Date: Mon, 15 Feb 2021 10:17:53 -0500
Subject: [PATCH 2/2] Adaptors/Cam: include the .txx file
This allows the TU to instantiate the template information as needed.
---
Adaptors/Cam/fv_create_data.cxx | 1 +
Adaptors/Cam/se_create_data.cxx | 1 +
2 files changed, 2 insertions(+)
diff --git a/Adaptors/Cam/fv_create_data.cxx b/Adaptors/Cam/fv_create_data.cxx
index 95dc7260f0..0dc45c3e33 100644
--- a/Adaptors/Cam/fv_create_data.cxx
+++ b/Adaptors/Cam/fv_create_data.cxx
@@ -16,6 +16,7 @@
#include "fv_create_data.h"
#include "Grid.h"
+#include "Grid.txx"
#include "vtkCPDataDescription.h"
#include "vtkCPInputDataDescription.h"
diff --git a/Adaptors/Cam/se_create_data.cxx b/Adaptors/Cam/se_create_data.cxx
index 4552340652..a9877410df 100644
--- a/Adaptors/Cam/se_create_data.cxx
+++ b/Adaptors/Cam/se_create_data.cxx
@@ -16,6 +16,7 @@
#include "se_create_data.h"
#include "Grid.h"
+#include "Grid.txx"
#include "vtkCPDataDescription.h"
#include "vtkCPInputDataDescription.h"
--
GitLab

View File

@ -0,0 +1,48 @@
Index: ParaView-v5.9.1/VTK/Common/Core/vtkGenericDataArrayLookupHelper.h
===================================================================
--- ParaView-v5.9.1.orig/VTK/Common/Core/vtkGenericDataArrayLookupHelper.h
+++ ParaView-v5.9.1/VTK/Common/Core/vtkGenericDataArrayLookupHelper.h
@@ -25,6 +25,7 @@
#include "vtkIdList.h"
#include <algorithm>
#include <cmath>
+#include <limits>
#include <unordered_map>
#include <vector>
Index: ParaView-v5.9.1/VTK/Rendering/Core/vtkColorTransferFunction.cxx
===================================================================
--- ParaView-v5.9.1.orig/VTK/Rendering/Core/vtkColorTransferFunction.cxx
+++ ParaView-v5.9.1/VTK/Rendering/Core/vtkColorTransferFunction.cxx
@@ -21,6 +21,7 @@
#include <algorithm>
#include <cmath>
#include <iterator>
+#include <limits>
#include <set>
#include <vector>
Index: ParaView-v5.9.1/VTK/Common/DataModel/vtkPiecewiseFunction.cxx
===================================================================
--- ParaView-v5.9.1.orig/VTK/Common/DataModel/vtkPiecewiseFunction.cxx
+++ ParaView-v5.9.1/VTK/Common/DataModel/vtkPiecewiseFunction.cxx
@@ -22,6 +22,7 @@
#include <cassert>
#include <cmath>
#include <iterator>
+#include <limits>
#include <set>
#include <vector>
Index: ParaView-v5.9.1/VTK/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
===================================================================
--- ParaView-v5.9.1.orig/VTK/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
+++ ParaView-v5.9.1/VTK/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
@@ -27,6 +27,7 @@
#include "vtkHyperTreeGridNonOrientedCursor.h"
#include <cmath>
+#include <limits>
vtkStandardNewMacro(vtkHyperTreeGridThreshold);

View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Wed Jun 2 19:40:42 UTC 2021 - Atri Bhattacharya <badshah400@gmail.com>
- Add paraview-gcc11-limits.patch: Include limits header wherever
needed to fix compilation with GCC 11
[https://gitlab.kitware.com/vtk/vtk/-/issues/18194].
-------------------------------------------------------------------
Sun May 23 00:00:41 UTC 2021 - Atri Bhattacharya <badshah400@gmail.com>
- Update to vetsion 5.9.1:
* See
https://gitlab.kitware.com/paraview/paraview/-/blob/master/Documentation/release/ParaView-5.9.1.md.
- Drop paraview-Adaptors-include-txx-file.patch: incorporated
upstream.
-------------------------------------------------------------------
Fri Feb 19 16:05:24 UTC 2021 - Atri Bhattacharya <badshah400@gmail.com>

View File

@ -31,7 +31,7 @@
%define __builder ninja
Name: paraview
Version: 5.9.0
Version: 5.9.1
Release: 0
Summary: Data analysis and visualization application
License: BSD-3-Clause
@ -48,8 +48,8 @@ Patch0: paraview-desktop-entry-fix.patch
Patch2: fix-libharu-missing-m.patch
# PATCH-FIX-UPSTREAM paraview-vtkioss-link-pthread.patch badshah400@gmail.com -- Link against pthread when building vtkioss [https://gitlab.kitware.com/paraview/paraview/-/issues/20495]
Patch3: paraview-vtkioss-link-pthread.patch
# PATCH-FIX-UPSTREAM paraview-Adaptors-include-txx-file.patch badshah400@gmail.com -- Fix Cam adaptor template instantiation [https://gitlab.kitware.com/paraview/paraview/-/merge_requests/4729]
Patch4: paraview-Adaptors-include-txx-file.patch
# PATCH-FIX-UPSTREAM paraview-gcc11-limits.patch badshah400@gmail.com -- Include limits header wherever required to fix compilation with GCC 11 [https://gitlab.kitware.com/vtk/vtk/-/issues/18194]
Patch4: paraview-gcc11-limits.patch
BuildRequires: Mesa-devel
BuildRequires: cgns-devel
BuildRequires: cmake >= 3.13
@ -114,7 +114,7 @@ Recommends: %{name}-plugins
Requires: gnuplot
Requires: graphviz
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
Requires(postun):/sbin/ldconfig
# Disable on aarch64 since GLES isn't supported for bundled vtk but is needed for paraview
ExcludeArch: aarch64
BuildRoot: %{_tmppath}/%{name}-%{version}-build