SHA256
1
0
forked from pool/paraview

Accepting request 1156449 from science

- Update to version 5.12.0:
  * Save and load files on either the client or server
  * Internationalization support with translations
  * Importing and exporting of animation settings
  * Copy and paste available for filters in the Pipeline Browser
  * Widget colors linked to color palette
  * Fire Dynamics Simulator file reader
  * New “Toggle file sequence grouping” button in Open File dialog
  * Reorganized Color Map Editor
  * More info at <https://www.kitware.com/paraview-5-12-0-release-notes/>.
- Use internal jsoncpp with leap <= 15.5.
- Use internal token lib.
- Use internal FastFloat lib.
- Use external verdict with leap >= 15.5.
- Use external pugixml with leap >= 15.5.
- Always use external CLI11.
- Drop compatibility to leap 15.3.
- Always skip using RPATH in SUSE builds.
- Added patch: fix-soversion-soname.patch

OBS-URL: https://build.opensuse.org/request/show/1156449
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/paraview?expand=0&rev=53
This commit is contained in:
Dominique Leuenberger 2024-03-09 19:54:34 +00:00 committed by Git OBS Bridge
commit e5b3ba321d
8 changed files with 84 additions and 25 deletions

View File

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

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

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

View File

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

View File

@ -0,0 +1,40 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cb713976cf..e21c2b911f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -664,7 +664,7 @@ else ()
HIERARCHY_DESTINATION "${CMAKE_INSTALL_LIBDIR}/vtk/hierarchy/${CMAKE_PROJECT_NAME}"
LIBRARY_NAME_SUFFIX "${PARAVIEW_CUSTOM_LIBRARY_SUFFIX}"
VERSION "${PARAVIEW_VERSION}"
- SOVERSION "1"
+ SOVERSION "${PARAVIEW_VERSION}"
TEST_DATA_TARGET ParaViewData
BUILD_WITH_KITS "${PARAVIEW_BUILD_WITH_KITS}"
USE_EXTERNAL "${PARAVIEW_BUILD_WITH_EXTERNAL}"
@@ -718,7 +718,7 @@ vtk_module_build(
HIERARCHY_DESTINATION "${CMAKE_INSTALL_LIBDIR}/vtk/hierarchy/${CMAKE_PROJECT_NAME}"
LIBRARY_NAME_SUFFIX "${PARAVIEW_CUSTOM_LIBRARY_SUFFIX}"
VERSION "${PARAVIEW_VERSION}"
- SOVERSION "1"
+ SOVERSION "${PARAVIEW_VERSION}"
TEST_DATA_TARGET ParaViewData
BUILD_WITH_KITS "${PARAVIEW_BUILD_WITH_KITS}"
USE_EXTERNAL "${PARAVIEW_BUILD_WITH_EXTERNAL}"
@@ -741,7 +741,7 @@ vtk_module_build(
HIERARCHY_DESTINATION "${CMAKE_INSTALL_LIBDIR}/vtk/hierarchy/${CMAKE_PROJECT_NAME}"
LIBRARY_NAME_SUFFIX "${PARAVIEW_CUSTOM_LIBRARY_SUFFIX}"
VERSION "${PARAVIEW_VERSION}"
- SOVERSION "1"
+ SOVERSION "${PARAVIEW_VERSION}"
TEST_DATA_TARGET ParaViewData
BUILD_WITH_KITS "${PARAVIEW_BUILD_WITH_KITS}"
USE_EXTERNAL "${PARAVIEW_BUILD_WITH_EXTERNAL}"
@@ -763,7 +763,7 @@ vtk_module_build(
HIERARCHY_DESTINATION "${CMAKE_INSTALL_LIBDIR}/vtk/hierarchy/${CMAKE_PROJECT_NAME}"
LIBRARY_NAME_SUFFIX "${PARAVIEW_CUSTOM_LIBRARY_SUFFIX}"
VERSION "${PARAVIEW_VERSION}"
- SOVERSION "1"
+ SOVERSION "${PARAVIEW_VERSION}"
TEST_DATA_TARGET ParaViewData
TEST_INPUT_DATA_DIRECTORY "${paraview_test_data_directory_input}"
TEST_OUTPUT_DATA_DIRECTORY "${paraview_test_data_directory_output}"

View File

@ -4,7 +4,7 @@ addFilter("non-executable-in-bin .*/usr/bin/paraview\.conf")
addFilter("script-without-shebang .*/usr/bin/paraview\.conf") addFilter("script-without-shebang .*/usr/bin/paraview\.conf")
# This is a (static) plugin # This is a (static) plugin
addFilter("devel-file-in-non-devel-package .*/usr/lib.*/paraview-[0-9.]*/plugins/GeodesicMeasurement/libFmmMesh.a") addFilter("devel-file-in-non-devel-package .*/usr/lib.*/paraview-[0-9.]*/plugins/.*.a")
# python3-matplotlib is not a lib # python3-matplotlib is not a lib
addFilter("python3-paraview.* explicit-lib-dependency python3-matplotlib") addFilter("python3-paraview.* explicit-lib-dependency python3-matplotlib")

View File

@ -1,3 +1,26 @@
-------------------------------------------------------------------
Wed Mar 07 00:00:00 UTC 2024 - Vicente Adolfo Bolea Sanchez <vicente.bolea@gmail.com>
- Update to version 5.12.0:
* Save and load files on either the client or server
* Internationalization support with translations
* Importing and exporting of animation settings
* Copy and paste available for filters in the Pipeline Browser
* Widget colors linked to color palette
* Fire Dynamics Simulator file reader
* New “Toggle file sequence grouping” button in Open File dialog
* Reorganized Color Map Editor
* More info at <https://www.kitware.com/paraview-5-12-0-release-notes/>.
- Use internal jsoncpp with leap <= 15.5.
- Use internal token lib.
- Use internal FastFloat lib.
- Use external verdict with leap >= 15.5.
- Use external pugixml with leap >= 15.5.
- Always use external CLI11.
- Drop compatibility to leap 15.3.
- Always skip using RPATH in SUSE builds.
- Added patch: fix-soversion-soname.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jan 19 13:38:42 UTC 2024 - Atri Bhattacharya <badshah400@gmail.com> Fri Jan 19 13:38:42 UTC 2024 - Atri Bhattacharya <badshah400@gmail.com>

View File

@ -17,11 +17,11 @@
%define major_ver 5 %define major_ver 5
%define minor_ver 11 %define minor_ver 12
%define short_ver %{major_ver}.%{minor_ver} %define short_ver %{major_ver}.%{minor_ver}
%define shlib libparaview%{major_ver}_%{minor_ver} %define shlib libparaview%{major_ver}_%{minor_ver}
%if 0%{?suse_version} <= 1500 %if 0%{?sle_version} <= 150400 && 0%{?is_opensuse}
%bcond_with pugixml %bcond_with pugixml
%bcond_with verdict %bcond_with verdict
%else %else
@ -29,16 +29,14 @@
%bcond_without verdict %bcond_without verdict
%endif %endif
%if 0%{?sle_version} == 150300 && 0%{?is_opensuse} %if 0%{?sle_version} <= 150600 && 0%{?is_opensuse}
# No nlohmann_json in Leap 15.3 %bcond_with jsoncpp
%bcond_with nlohmann
# libproj too old in Leap 15.3
%bcond_with proj
%else %else
%bcond_without nlohmann %bcond_without jsoncpp
%bcond_without proj
%endif %endif
%bcond_without nlohmann
%bcond_without proj
%bcond_without gl2ps %bcond_without gl2ps
# Need patched version with HPDF_SHADING # Need patched version with HPDF_SHADING
@ -46,7 +44,7 @@
%define __builder ninja %define __builder ninja
Name: paraview Name: paraview
Version: %{short_ver}.2 Version: %{short_ver}.0
Release: 0 Release: 0
Summary: Data analysis and visualization application Summary: Data analysis and visualization application
License: BSD-3-Clause License: BSD-3-Clause
@ -55,12 +53,13 @@ URL: https://www.paraview.org
Source0: https://www.paraview.org/files/v%{short_ver}/ParaView-v%{version}.tar.xz Source0: https://www.paraview.org/files/v%{short_ver}/ParaView-v%{version}.tar.xz
Source1: %{name}-rpmlintrc Source1: %{name}-rpmlintrc
# CAUTION: GettingStarted may or may not be updated with each minor version # CAUTION: GettingStarted may or may not be updated with each minor version
Source2: https://www.paraview.org/files/v%{short_ver}/ParaViewGettingStarted-%{major_ver}.%{minor_ver}.1.pdf Source2: https://www.paraview.org/files/v%{short_ver}/ParaViewGettingStarted-%{major_ver}.%{minor_ver}.0.pdf
Source3: https://www.paraview.org/files/v%{short_ver}/ParaViewTutorial-%{major_ver}.%{minor_ver}.1.pdf
# PATCH-FIX-UPSTREAM paraview-desktop-entry-fix.patch badshah400@gmail.com -- Fix desktop menu entry by inserting proper required categories # PATCH-FIX-UPSTREAM paraview-desktop-entry-fix.patch badshah400@gmail.com -- Fix desktop menu entry by inserting proper required categories
Patch0: paraview-desktop-entry-fix.patch Patch0: paraview-desktop-entry-fix.patch
# PATCH-FIX-OPENSUSE fix-libharu-missing-m.patch -- missing libraries for linking (gh#libharu/libharu#213) # PATCH-FIX-OPENSUSE fix-libharu-missing-m.patch -- missing libraries for linking (gh#libharu/libharu#213)
Patch2: fix-libharu-missing-m.patch Patch2: fix-libharu-missing-m.patch
# We need to change the default soname for vtk modules.
Patch3: fix-soversion-soname.patch
BuildRequires: Mesa-devel BuildRequires: Mesa-devel
BuildRequires: cgns-devel BuildRequires: cgns-devel
BuildRequires: cmake >= 3.13 BuildRequires: cmake >= 3.13
@ -105,7 +104,9 @@ BuildRequires: pkgconfig(eigen3) >= 2.91.0
BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(expat)
BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(freetype2)
BuildRequires: pkgconfig(glew) BuildRequires: pkgconfig(glew)
BuildRequires: pkgconfig(jsoncpp) >= 0.7.0 %if %{with jsoncpp}
BuildRequires: pkgconfig(jsoncpp) >= 1.9.4
%endif
BuildRequires: pkgconfig(libjpeg) BuildRequires: pkgconfig(libjpeg)
BuildRequires: pkgconfig(liblz4) >= 1.7.3 BuildRequires: pkgconfig(liblz4) >= 1.7.3
BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(liblzma)
@ -129,11 +130,7 @@ BuildRequires: pkgconfig(pugixml) >= 1.11
%if %{with verdict} %if %{with verdict}
BuildRequires: verdict-devel BuildRequires: verdict-devel
%endif %endif
%if 0%{?suse_version} <= 1500 && 0%{?sle_version} <= 150300
BuildRequires: cli11-devel
%else
BuildRequires: pkgconfig(CLI11) BuildRequires: pkgconfig(CLI11)
%endif
BuildRequires: pkgconfig(theora) BuildRequires: pkgconfig(theora)
BuildRequires: pkgconfig(xt) BuildRequires: pkgconfig(xt)
BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(zlib)
@ -238,13 +235,16 @@ sed -Ei "1{s|#!/usr/bin/env python3|#!/usr/bin/python3|}" Clients/CommandLineExe
-DPARAVIEW_BUILD_WITH_EXTERNAL:BOOL=ON \ -DPARAVIEW_BUILD_WITH_EXTERNAL:BOOL=ON \
-DVTK_MODULE_USE_EXTERNAL_ParaView_vtkcatalyst:BOOL=OFF \ -DVTK_MODULE_USE_EXTERNAL_ParaView_vtkcatalyst:BOOL=OFF \
-DVTK_MODULE_USE_EXTERNAL_VTK_exprtk:BOOL=OFF \ -DVTK_MODULE_USE_EXTERNAL_VTK_exprtk:BOOL=OFF \
-DVTK_MODULE_USE_EXTERNAL_VTK_fast_float:BOOL=OFF \
-DVTK_MODULE_USE_EXTERNAL_VTK_fmt: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_gl2ps=%{?with_gl2ps:ON}%{!?with_gl2ps:OFF} \
-DVTK_MODULE_USE_EXTERNAL_VTK_ioss:BOOL=OFF \ -DVTK_MODULE_USE_EXTERNAL_VTK_ioss:BOOL=OFF \
-DVTK_MODULE_USE_EXTERNAL_VTK_jsoncpp=%{?with_jsoncpp:ON}%{!?with_jsoncpp:OFF} \
-DVTK_MODULE_USE_EXTERNAL_VTK_libharu=%{?with_haru:ON}%{!?with_haru:OFF} \ -DVTK_MODULE_USE_EXTERNAL_VTK_libharu=%{?with_haru:ON}%{!?with_haru:OFF} \
-DVTK_MODULE_USE_EXTERNAL_VTK_libproj=%{?with_proj:ON}%{!?with_proj: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_nlohmannjson=%{?with_nlohmann:ON}%{!?with_nlohmann:OFF} \
-DVTK_MODULE_USE_EXTERNAL_VTK_pugixml=%{?with_pugixml:ON}%{!?with_pugixml:OFF} \ -DVTK_MODULE_USE_EXTERNAL_VTK_pugixml=%{?with_pugixml:ON}%{!?with_pugixml:OFF} \
-DVTK_MODULE_USE_EXTERNAL_VTK_token:BOOL=OFF \
-DVTK_MODULE_USE_EXTERNAL_VTK_verdict=%{?with_verdict:ON}%{!?with_verdict:OFF} \ -DVTK_MODULE_USE_EXTERNAL_VTK_verdict=%{?with_verdict:ON}%{!?with_verdict:OFF} \
%{nil} %{nil}
@ -260,7 +260,6 @@ sed -i "1{\@/usr/bin/env@d}" %{buildroot}%{python3_sitearch}/paraview/vtkmodules
# INSTALL DOCUMENTATION USED BY THE HELP MENU IN MAIN APP # 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:2} %{buildroot}%{_datadir}/%{name}-%{short_ver}/doc/GettingStarted.pdf
install -Dm0644 %{S:3} %{buildroot}%{_datadir}/%{name}-%{short_ver}/doc/Guide.pdf
%fdupes %{buildroot}/ %fdupes %{buildroot}/