rpm/paraview
SHA256
1
0
Fork 0
forked from pool/paraview
Code Pull Requests Activity

Accepting request 944130 from science

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/944130
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/paraview?expand=0&rev=41
This commit is contained in:
Dominique Leuenberger 2022-01-07 11:45:43 +00:00 committed by Git OBS Bridge
commit 50d834b1ca
12 changed files with 70 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

0
ParaViewGettingStarted-5.9.1.pdf → ParaViewGettingStarted-5.10.0.pdf
View File

3
ParaViewTutorial-5.10.0.pdf Normal file
View File

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

3
ParaViewTutorial-5.9.1.pdf
View File

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

2
_constraints
View File

@ -1,7 +1,7 @@
<constraints>
<hardware>
<disk>
<size unit="G">16</size>
<size unit="G">22</size>
</disk>
</hardware>
<overwrite>

48
paraview-gcc11-limits.patch
View File

@ -1,48 +0,0 @@
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);

27
paraview-include-sstream.patch Normal file
View File

@ -0,0 +1,27 @@
From eb8de75499a23e6e5d4214ec170ad53d510206f7 Mon Sep 17 00:00:00 2001
From: Elvis Stansvik <elvstone@gmail.com>
Date: Mon, 1 Nov 2021 22:22:29 +0100
Subject: [PATCH] Add missing inclusion of sstream/string headers
Needed for std::ostringstream and std::string.
---
IO/Geometry/vtkGLTFWriterUtils.cxx | 3 +++
1 file changed, 3 insertions(+)
diff --git a/VTK/IO/Geometry/vtkGLTFWriterUtils.cxx b/VTK/IO/Geometry/vtkGLTFWriterUtils.cxx
index a7df4975e07..fdaaead3150 100644
--- a/VTK/IO/Geometry/vtkGLTFWriterUtils.cxx
+++ b/VTK/IO/Geometry/vtkGLTFWriterUtils.cxx
@@ -25,6 +25,9 @@
#include "vtksys/FStream.hxx"
#include "vtksys/SystemTools.hxx"
+#include <sstream>
+#include <string>
+
void vtkGLTFWriterUtils::WriteValues(vtkDataArray* ca, ostream& myFile)
{
myFile.write(reinterpret_cast<char*>(ca->GetVoidPointer(0)),
--
GitLab

1
paraview-rpmlintrc
View File

@ -2,5 +2,6 @@
# See https://gitlab.kitware.com/paraview/paraview/issues/19706
addFilter("non-executable-in-bin .*/usr/bin/paraview\.conf")
addFilter("script-without-shebang .*/usr/bin/paraview\.conf")
addFilter("libparaview5_10.* shlib-policy-name-error")

21
paraview-vtkioss-link-pthread.patch
View File

@ -1,21 +0,0 @@
Index: ParaView-v5.9.0/VTK/ThirdParty/ioss/vtkioss/CMakeLists.txt
===================================================================
--- ParaView-v5.9.0.orig/VTK/ThirdParty/ioss/vtkioss/CMakeLists.txt
+++ ParaView-v5.9.0/VTK/ThirdParty/ioss/vtkioss/CMakeLists.txt
@@ -231,6 +231,8 @@ list(APPEND headers
vtk_ioss_mangle.h)
+vtk_module_find_package(PACKAGE Threads)
+
vtk_module_add_module(VTK::ioss
SOURCES ${sources}
PRIVATE_HEADERS ${headers})
@@ -238,3 +240,7 @@ vtk_module_definitions(VTK::ioss
PRIVATE
NO_ZOLTAN_SUPPORT
NO_PARMETIS_SUPPORT)
+vtk_module_link(VTK::ioss
+ PRIVATE
+ Threads::Threads)
+

23
paraview.changes
View File

@ -1,3 +1,26 @@
-------------------------------------------------------------------
Fri Dec 24 21:01:10 UTC 2021 - Atri Bhattacharya <badshah400@gmail.com>
- Update to version 5.10.0:
* Long list of changes, see
https://gitlab.kitware.com/paraview/paraview/-/blob/master/Documentation/release/ParaView-5.10.0.md
- Drop patches incorporated upstream:
* paraview-gcc11-limits.patch.
* paraview-vtkioss-link-pthread.patch.
- Update guides and tutorials.
- Update _constraits to require 22 GiB for build to prevent
out-of-disk-space build failures.
- Add arguments to cmake command to turn off system installed
libraries individually where these are not available;
specifically turn off system vtkcatalyst, exprtk, fmt, and ioss.
- Add paraview-include-sstream.patch -- Add patch from upstream to
include missing headers and adapt to apply with p1
(https://gitlab.kitware.com/vtk/vtk/-/merge_requests/8597).
- Add rpmlintrc snippet to suppress warnings about shared lib
versioning: we use a versioning consistent with package
major.minor version which is needed due to upstream's otherwise
inconsistent so versions, but rpmlint does not like this.
-------------------------------------------------------------------
Thu Dec 16 13:50:10 UTC 2021 - Andreas Schwab <schwab@suse.de>

20
paraview.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package paraview
#
# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -16,8 +16,8 @@
#
%define major_ver 5.9
%define shlib libparaview5_9
%define major_ver 5.10
%define shlib libparaview5_10
%if 0%{?suse_version} <= 1500
%bcond_with pugixml
@ -31,7 +31,7 @@
%define __builder ninja
Name: paraview
Version: 5.9.1
Version: 5.10.0
Release: 0
Summary: Data analysis and visualization application
License: BSD-3-Clause
@ -46,10 +46,8 @@ Source3: https://www.paraview.org/files/v%{major_ver}/ParaViewTutorial-%{
Patch0: paraview-desktop-entry-fix.patch
# PATCH-FIX-OPENSUSE fix-libharu-missing-m.patch -- missing libraries for linking (gh#libharu/libharu#213)
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
# PATCH-FIX-UPSTREAM paraview-include-sstream.patch -- Add patch from upstream to include missing headers and adapt to apply with p1 (https://gitlab.kitware.com/vtk/vtk/-/merge_requests/8597)
Patch3: paraview-include-sstream.patch
BuildRequires: Mesa-devel
BuildRequires: cgns-devel
BuildRequires: cmake >= 3.13
@ -81,6 +79,7 @@ BuildRequires: python3-qt5-devel
BuildRequires: readline-devel
BuildRequires: utfcpp-devel
BuildRequires: wget
BuildRequires: pkgconfig(CLI11)
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Help)
@ -205,7 +204,11 @@ sed -Ei "1{s|#!/usr/bin/env python3|#!/usr/bin/python3|}" Clients/CommandLineExe
-DVTK_BUILD_QT_DESIGNER_PLUGIN:BOOL=OFF \
-DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON \
-DPARAVIEW_BUILD_WITH_EXTERNAL:BOOL=ON \
-DVTK_MODULE_USE_EXTERNAL_ParaView_vtkcatalyst:BOOL=OFF \
-DVTK_MODULE_USE_EXTERNAL_VTK_exprtk:BOOL=OFF \
-DVTK_MODULE_USE_EXTERNAL_VTK_fmt:BOOL=OFF \
-DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps=%{?with_gl2ps:ON}%{!?with_gl2ps:OFF} \
-DVTK_MODULE_USE_EXTERNAL_VTK_ioss:BOOL=OFF \
-DVTK_MODULE_USE_EXTERNAL_VTK_libharu=%{?with_haru:ON}%{!?with_haru:OFF} \
-DVTK_MODULE_USE_EXTERNAL_VTK_pugixml=%{?with_pugixml:ON}%{!?with_pugixml:OFF}
@ -243,6 +246,7 @@ rm %{buildroot}%{_bindir}/paraview-config
%dir %{_libdir}/vtk/
%dir %{_libdir}/vtk/hierarchy
%{_libdir}/vtk/hierarchy/ParaView/
%{_libdir}/catalyst/
%files -n %{shlib}
%{_libdir}/*.so.*