Accepting request 1039344 from home:badshah400:branches:science
- Update to version 5.11.0: - Drop paraview-include-sstream.patch: incorporated upstream. - New BuildRequires: sqlite3, pkgconfig(liblzma), pkgconfig(nlohmann_json), pkgconfig(proj), pkgconfig(sqlite3). - Build without system nlohmann_json for Leap 15.3 and older. - Update rpmlintrc file to suppress false positives. OBS-URL: https://build.opensuse.org/request/show/1039344 OBS-URL: https://build.opensuse.org/package/show/science/paraview?expand=0&rev=110
This commit is contained in:
Vicente Adolfo Bolea Sanchez
Git OBS Bridge
parent
233a5c417b
commit
3a71f256d1
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:520e3cdfba4f8592be477314c2f6c37ec73fb1d5b25ac30bdbd1c5214758b9c2
|
||||
size 70218088
|
||||
3
ParaView-v5.11.0.tar.xz
Normal file
3
ParaView-v5.11.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9a0b8fe8b1a2cdfd0ace9a87fa87e0ec21ee0f6f0bcb1fdde050f4f585a25165
|
||||
size 70212180
|
||||
@ -1,9 +1,9 @@
|
||||
Index: ParaView-v5.7.0/VTK/ThirdParty/libharu/vtklibharu/CMakeLists.txt
|
||||
Index: ParaView-v5.11.0/VTK/ThirdParty/libharu/vtklibharu/CMakeLists.txt
|
||||
===================================================================
|
||||
--- ParaView-v5.7.0.orig/VTK/ThirdParty/libharu/vtklibharu/CMakeLists.txt
|
||||
+++ ParaView-v5.7.0/VTK/ThirdParty/libharu/vtklibharu/CMakeLists.txt
|
||||
@@ -125,6 +125,8 @@ if(PNG_FOUND)
|
||||
endif(PNG_FOUND)
|
||||
--- ParaView-v5.11.0.orig/VTK/ThirdParty/libharu/vtklibharu/CMakeLists.txt
|
||||
+++ ParaView-v5.11.0/VTK/ThirdParty/libharu/vtklibharu/CMakeLists.txt
|
||||
@@ -68,6 +68,8 @@ find_package(PNG)
|
||||
find_library(M_LIB m)
|
||||
endif ()
|
||||
|
||||
+link_libraries(m dl pthread)
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
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
|
||||
|
||||
@ -2,6 +2,9 @@
|
||||
# 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")
|
||||
|
||||
# This is a (static) plugin
|
||||
addFilter("devel-file-in-non-devel-package .*/usr/lib.*/paraview-[0-9.]*/plugins/GeodesicMeasurement/libFmmMesh.a")
|
||||
|
||||
# python3-matplotlib is not a lib
|
||||
addFilter("python3-paraview.* explicit-lib-dependency python3-matplotlib")
|
||||
|
||||
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 30 16:40:06 UTC 2022 - Atri Bhattacharya <badshah400@gmail.com>
|
||||
|
||||
- Update to version 5.11.0:
|
||||
* Many changes, see
|
||||
<https://www.kitware.com/paraview-5-11-0-release-notes/>.
|
||||
- Drop paraview-include-sstream.patch: incorporated upstream.
|
||||
- New BuildRequires: sqlite3, pkgconfig(liblzma),
|
||||
pkgconfig(nlohmann_json), pkgconfig(proj), pkgconfig(sqlite3).
|
||||
- Build without system nlohmann_json for Leap 15.3 and older.
|
||||
- Update rpmlintrc file to suppress false positives.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 14 12:07:13 UTC 2022 - Atri Bhattacharya <badshah400@gmail.com>
|
||||
|
||||
|
||||
@ -17,8 +17,8 @@
|
||||
|
||||
|
||||
%define major_ver 5
|
||||
%define minor_ver 10
|
||||
%define short_ver 5.10
|
||||
%define minor_ver 11
|
||||
%define short_ver %{major_ver}.%{minor_ver}
|
||||
%define shlib libparaview%{major_ver}_%{minor_ver}
|
||||
|
||||
%if 0%{?suse_version} <= 1500
|
||||
@ -26,6 +26,17 @@
|
||||
%else
|
||||
%bcond_without pugixml
|
||||
%endif
|
||||
|
||||
%if 0%{?sle_version} == 150300 && 0%{?is_opensuse}
|
||||
# No nlohmann_json in Leap 15.3
|
||||
%bcond_with nlohmann
|
||||
# libproj too old in Leap 15.3
|
||||
%bcond_with proj
|
||||
%else
|
||||
%bcond_without nlohmann
|
||||
%bcond_without proj
|
||||
%endif
|
||||
|
||||
%bcond_without gl2ps
|
||||
|
||||
# Need patched version with HPDF_SHADING
|
||||
@ -33,7 +44,7 @@
|
||||
|
||||
%define __builder ninja
|
||||
Name: paraview
|
||||
Version: %{short_ver}.1
|
||||
Version: %{short_ver}.0
|
||||
Release: 0
|
||||
Summary: Data analysis and visualization application
|
||||
License: BSD-3-Clause
|
||||
@ -48,8 +59,6 @@ Source3: https://www.paraview.org/files/v%{short_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-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
|
||||
@ -78,6 +87,7 @@ BuildRequires: python3-devel
|
||||
BuildRequires: python3-matplotlib
|
||||
BuildRequires: python3-qt5-devel
|
||||
BuildRequires: readline-devel
|
||||
BuildRequires: sqlite3
|
||||
BuildRequires: utfcpp-devel
|
||||
BuildRequires: wget
|
||||
BuildRequires: pkgconfig(Qt5Core)
|
||||
@ -96,6 +106,7 @@ BuildRequires: pkgconfig(glew)
|
||||
BuildRequires: pkgconfig(jsoncpp) >= 0.7.0
|
||||
BuildRequires: pkgconfig(libjpeg)
|
||||
BuildRequires: pkgconfig(liblz4) >= 1.7.3
|
||||
BuildRequires: pkgconfig(liblzma)
|
||||
BuildRequires: pkgconfig(libpng)
|
||||
BuildRequires: pkgconfig(libpqxx)
|
||||
BuildRequires: pkgconfig(libtiff-4)
|
||||
@ -103,6 +114,13 @@ BuildRequires: pkgconfig(netcdf)
|
||||
BuildRequires: pkgconfig(ogg)
|
||||
BuildRequires: pkgconfig(openssl)
|
||||
BuildRequires: pkgconfig(protobuf) >= 2.6.0
|
||||
BuildRequires: pkgconfig(sqlite3)
|
||||
%if %{with nlohmann}
|
||||
BuildRequires: pkgconfig(nlohmann_json)
|
||||
%endif
|
||||
%if %{with proj}
|
||||
BuildRequires: pkgconfig(proj)
|
||||
%endif
|
||||
%if %{with pugixml}
|
||||
BuildRequires: pkgconfig(pugixml) >= 1.11
|
||||
%endif
|
||||
@ -215,7 +233,11 @@ sed -Ei "1{s|#!/usr/bin/env python3|#!/usr/bin/python3|}" Clients/CommandLineExe
|
||||
-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}
|
||||
-DVTK_MODULE_USE_EXTERNAL_VTK_libproj=%{?with_proj:ON}%{!?with_proj:OFF} \
|
||||
-DVTK_MODULE_USE_EXTERNAL_VTK_nlohmannjson=%{?with_nlohmann:ON}%{!?with_nlohmann:OFF} \
|
||||
-DVTK_MODULE_USE_EXTERNAL_VTK_pugixml=%{?with_pugixml:ON}%{!?with_pugixml:OFF} \
|
||||
-DVTK_MODULE_USE_EXTERNAL_VTK_verdict=OFF \
|
||||
%{nil}
|
||||
|
||||
%cmake_build
|
||||
|
||||
@ -224,6 +246,9 @@ find . \( -name \*.txt -o -name \*.xml -o -name '*.[ch]' -o -name '*.[ch][px][px
|
||||
|
||||
%cmake_install
|
||||
|
||||
# Unnecessary hash-bang
|
||||
sed -i "1{\@/usr/bin/env@d}" %{buildroot}%{python3_sitearch}/paraview/vtkmodules/generate_pyi.py
|
||||
|
||||
# INSTALL DOCUMENTATION USED BY THE HELP MENU IN MAIN APP
|
||||
install -Dm0644 %{S:2} %{buildroot}%{_datadir}/%{name}-%{short_ver}/doc/GettingStarted.pdf
|
||||
install -Dm0644 %{S:3} %{buildroot}%{_datadir}/%{name}-%{short_ver}/doc/Guide.pdf
|
||||
@ -254,7 +279,9 @@ find %{buildroot}%{_libdir}/cmake/paraview-%{short_ver}/ -size 0 -delete -print
|
||||
%dir %{_libdir}/vtk/
|
||||
%dir %{_libdir}/vtk/hierarchy
|
||||
%{_libdir}/vtk/hierarchy/ParaView/
|
||||
%{_libdir}/catalyst/
|
||||
%if %{without proj}
|
||||
%{_datadir}/vtk-pv%{major_ver}.%{minor_ver}/
|
||||
%endif
|
||||
|
||||
%files -n %{shlib}
|
||||
%{_libdir}/*.so.*
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user