From 0dbea3e4a61c1b0152e84f21f7184f4be644f92596672d38c1f8697ae959250b Mon Sep 17 00:00:00 2001 From: Vicente Adolfo Bolea Sanchez Date: Mon, 24 May 2021 20:42:35 +0000 Subject: [PATCH 1/2] Accepting request 895002 from home:badshah400:branches:science * Update to vetsion 5.9.1. * Drop paraview-Adaptors-include-txx-file.patch: incorporated upstream. OBS-URL: https://build.opensuse.org/request/show/895002 OBS-URL: https://build.opensuse.org/package/show/science/paraview?expand=0&rev=93 --- ParaView-v5.9.0.tar.xz | 3 -- ParaView-v5.9.1.tar.xz | 3 ++ ....0.pdf => ParaViewGettingStarted-5.9.1.pdf | 0 ...al-5.9.0.pdf => ParaViewTutorial-5.9.1.pdf | 0 paraview-Adaptors-include-txx-file.patch | 37 ------------------- paraview.changes | 9 +++++ paraview.spec | 6 +-- 7 files changed, 14 insertions(+), 44 deletions(-) delete mode 100644 ParaView-v5.9.0.tar.xz create mode 100644 ParaView-v5.9.1.tar.xz rename ParaViewGettingStarted-5.9.0.pdf => ParaViewGettingStarted-5.9.1.pdf (100%) rename ParaViewTutorial-5.9.0.pdf => ParaViewTutorial-5.9.1.pdf (100%) delete mode 100644 paraview-Adaptors-include-txx-file.patch diff --git a/ParaView-v5.9.0.tar.xz b/ParaView-v5.9.0.tar.xz deleted file mode 100644 index 92290e0..0000000 --- a/ParaView-v5.9.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b03258b7cddb77f0ee142e3e77b377e5b1f503bcabc02bfa578298c99a06980d -size 62784788 diff --git a/ParaView-v5.9.1.tar.xz b/ParaView-v5.9.1.tar.xz new file mode 100644 index 0000000..29908ae --- /dev/null +++ b/ParaView-v5.9.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0d486cb6fbf55e428845c9650486f87466efcb3155e40489182a7ea85dfd4c8d +size 62835572 diff --git a/ParaViewGettingStarted-5.9.0.pdf b/ParaViewGettingStarted-5.9.1.pdf similarity index 100% rename from ParaViewGettingStarted-5.9.0.pdf rename to ParaViewGettingStarted-5.9.1.pdf diff --git a/ParaViewTutorial-5.9.0.pdf b/ParaViewTutorial-5.9.1.pdf similarity index 100% rename from ParaViewTutorial-5.9.0.pdf rename to ParaViewTutorial-5.9.1.pdf diff --git a/paraview-Adaptors-include-txx-file.patch b/paraview-Adaptors-include-txx-file.patch deleted file mode 100644 index a1cb6c7..0000000 --- a/paraview-Adaptors-include-txx-file.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 4caacf4577e615a80c4282c700347dfb2e931788 Mon Sep 17 00:00:00 2001 -From: Ben Boeckel -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 diff --git a/paraview.changes b/paraview.changes index 47572ff..9ef33cc 100644 --- a/paraview.changes +++ b/paraview.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sun May 23 00:00:41 UTC 2021 - Atri Bhattacharya + +- 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 diff --git a/paraview.spec b/paraview.spec index 3bb8e7e..6a2f75e 100644 --- a/paraview.spec +++ b/paraview.spec @@ -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,6 @@ 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 BuildRequires: Mesa-devel BuildRequires: cgns-devel BuildRequires: cmake >= 3.13 @@ -114,7 +112,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 From 6c63999d66e3fdb53473063affb8be21b308fdaffd9b7a146d3e7ab750b1e27c Mon Sep 17 00:00:00 2001 From: Vicente Adolfo Bolea Sanchez Date: Sat, 5 Jun 2021 19:08:30 +0000 Subject: [PATCH 2/2] Accepting request 896983 from home:badshah400:branches:science Add paraview-gcc11-limits.patch: Include limits header wherever needed to fix compilation with GCC 11 [https://gitlab.kitware.com/vtk/vtk/-/issues/18194]. OBS-URL: https://build.opensuse.org/request/show/896983 OBS-URL: https://build.opensuse.org/package/show/science/paraview?expand=0&rev=94 --- paraview-gcc11-limits.patch | 48 +++++++++++++++++++++++++++++++++++++ paraview.changes | 7 ++++++ paraview.spec | 2 ++ 3 files changed, 57 insertions(+) create mode 100644 paraview-gcc11-limits.patch diff --git a/paraview-gcc11-limits.patch b/paraview-gcc11-limits.patch new file mode 100644 index 0000000..84e8ca3 --- /dev/null +++ b/paraview-gcc11-limits.patch @@ -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 + #include ++#include + #include + #include + +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 + #include + #include ++#include + #include + #include + +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 + #include + #include ++#include + #include + #include + +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 ++#include + + vtkStandardNewMacro(vtkHyperTreeGridThreshold); + diff --git a/paraview.changes b/paraview.changes index 9ef33cc..f4f4231 100644 --- a/paraview.changes +++ b/paraview.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jun 2 19:40:42 UTC 2021 - Atri Bhattacharya + +- 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 diff --git a/paraview.spec b/paraview.spec index 6a2f75e..6f53e21 100644 --- a/paraview.spec +++ b/paraview.spec @@ -48,6 +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-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