0001-Add-missing-libm-link-library-for-bundled-ExodusII.patch

@@ -1,22 +0,0 @@
-From 11749efe6bbe30e8d9a88b624c356a45c3207fd2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
-Date: Thu, 12 Dec 2024 17:27:49 +0100
-Subject: [PATCH] Add missing libm link library for bundled ExodusII
-
----
- VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt b/VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt
-index e3b10bb9..8e4ccd6e 100644
---- a/VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt
-+++ b/VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt
-@@ -338,4 +338,5 @@ vtk_module_include(VTK::exodusII
-     "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>")
- vtk_module_link(VTK::exodusII
-   PRIVATE
-+    m
-     Threads::Threads)
--- 
-2.47.1
-

ParaView-v5.12.1.tar.xz

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

ParaView-v5.13.2.tar.xz

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

paraview-rpmlintrc

@@ -10,4 +10,4 @@ addFilter("devel-file-in-non-devel-package .*/usr/lib.*/paraview-[0-9.]*/plugins
 addFilter("python3-paraview.* explicit-lib-dependency python3-matplotlib")
 
 # 0 size files are referenced in cmake files
-addFilter("paraview.* zero-length")
+addFilter("paraview-devel.* zero-length")

paraview.changes

@@ -1,46 +1,3 @@
--------------------------------------------------------------------
-Thu Jan 06 00:01:00 UTC 2025 - Vicente Adolfo Bolea Sanchez <vicente.bolea@gmail.com>
-
-- Update to version 5.13.2:
-  * Update Insitu logic to use script filename (instead of full
-    path) when searching PYTHONPATH directories (details).
-  * Fixed CLI error loading multiple-file series (details).
-  * Fixed CLI error that was opening two copies of single file
-    specified in command line (details).
-  * Fixed pvbatch syntax warning messages (“invalid escape
-    sequence”) (details).
-  * Fixed spreadsheet view to update correctly when timestep is
-    reset to 0 (details).
-  * Fixed problems loading state file when remote volume rendering
-    is used (details).
-  * More info at:
-    <https://www.kitware.com/paraview-5-13-2-release-notes/>.
-- Use internal pegtl lib due to version incompatibility.
-- Disable ZFP due to building problems with internal/external.
-- Added sed command to fix linker flags in build.ninja.
-- Removed unnecessary shebang at rtImageTest.py.
-- Dropped patches:
-  * 0001-Fix-missing-fmt-ranges.h-include-in-ioss-ThirdParty-.patch
-  * fix-CVE-2024-50602.patch
-- Add patches:
-  * 0001-Add-missing-libm-link-library-for-bundled-ExodusII.patch
-
--------------------------------------------------------------------
-Sat Jan  4 05:54:25 UTC 2025 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
-
-- Various spec file cleanups and fixes:
-  * Fix version dependent bcond's for TW
-  * Remove unused netcdf-cxx build dependency
-  * Remove unnecessary sqlite and wget binary build dependencies
-  * Use system libharu, fast-float and fmt when available
-- Fix build with recent fmt, add
-  * 0001-Fix-missing-fmt-ranges.h-include-in-ioss-ThirdParty-.patch
-
--------------------------------------------------------------------
-Fri Dec 20 00:00:00 UTC 2024 - Vicente Adolfo Bolea Sanchez <vicente.bolea@gmail.com>
-
-- Added patch fix-CVE-2024-50602.patch which fixes CVE-2024-50602.
-
 -------------------------------------------------------------------
 Tue May 28 00:00:00 UTC 2024 - Vicente Adolfo Bolea Sanchez <vicente.bolea@gmail.com>
 

paraview.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package paraview
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,14 +17,11 @@
 
 
 %define major_ver 5
-%define minor_ver 13
+%define minor_ver 12
 %define short_ver %{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    fast_float
-%bcond_with    jsoncpp
-%if 0%{?sle_version} <= 150400
 %bcond_with    pugixml
 %bcond_with    verdict
 %else
@@ -32,30 +29,22 @@
 %bcond_without verdict
 %endif
 
-%if 0%{?sle_version} <= 150600
+%if 0%{?sle_version} <= 150600 && 0%{?is_opensuse}
 %bcond_with    jsoncpp
-%bcond_with    fmt
-%bcond_with    haru
 %else
-%bcond_without fmt
-%bcond_without haru
-%endif
-
-%else
-%bcond_without fast_float
-%bcond_without fmt
-%bcond_without haru
 %bcond_without jsoncpp
-%bcond_without pugixml
-%bcond_without verdict
 %endif
 
 %bcond_without nlohmann
 %bcond_without proj
 %bcond_without gl2ps
 
+# Need patched version with HPDF_SHADING
+%bcond_with    haru
+
+%define __builder ninja
 Name:           paraview
-Version:        %{short_ver}.2
+Version:        %{short_ver}.1
 Release:        0
 Summary:        Data analysis and visualization application
 License:        BSD-3-Clause
@@ -64,15 +53,13 @@ URL:            https://www.paraview.org
 Source0:        https://www.paraview.org/files/v%{short_ver}/ParaView-v%{version}.tar.xz
 Source1:        %{name}-rpmlintrc
 # 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}.2.pdf
+Source2:        https://www.paraview.org/files/v%{short_ver}/ParaViewGettingStarted-%{major_ver}.%{minor_ver}.0.pdf
 # 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
 # PATCH-FIX-OPENSUSE fix-libharu-missing-m.patch -- missing libraries for linking (gh#libharu/libharu#213)
-Patch1:         fix-libharu-missing-m.patch
+Patch2:         fix-libharu-missing-m.patch
 # We need to change the default soname for vtk modules.
-Patch2:         fix-soversion-soname.patch
+Patch3:         fix-soversion-soname.patch
-# PATCH-FIX-UPSTREAM
-Patch3:         0001-Add-missing-libm-link-library-for-bundled-ExodusII.patch
 BuildRequires:  Mesa-devel
 BuildRequires:  cgns-devel
 BuildRequires:  cmake >= 3.13
@@ -87,18 +74,23 @@ BuildRequires:  graphviz
 BuildRequires:  hdf5-devel
 BuildRequires:  libboost_graph-devel
 BuildRequires:  libboost_headers-devel
+%if %{with gl2ps}
+BuildRequires:  gl2ps-devel >= 1.4.1
+%endif
+%if %{with haru}
+BuildRequires:  libharu-devel > 2.3.0
+%endif
+BuildRequires:  libnetcdf_c++-devel
 BuildRequires:  ninja
-BuildRequires:  pkgconfig
-BuildRequires:  protobuf21-devel
 BuildRequires:  python3-Sphinx
 BuildRequires:  python3-Twisted
 BuildRequires:  python3-devel
 BuildRequires:  python3-matplotlib
 BuildRequires:  python3-qt5-devel
 BuildRequires:  readline-devel
+BuildRequires:  sqlite3
 BuildRequires:  utfcpp-devel
 BuildRequires:  wget
-BuildRequires:  pkgconfig(CLI11)
 BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  pkgconfig(Qt5Gui)
 BuildRequires:  pkgconfig(Qt5Help)
@@ -112,6 +104,9 @@ BuildRequires:  pkgconfig(eigen3) >= 2.91.0
 BuildRequires:  pkgconfig(expat)
 BuildRequires:  pkgconfig(freetype2)
 BuildRequires:  pkgconfig(glew)
+%if %{with jsoncpp}
+BuildRequires:  pkgconfig(jsoncpp) >= 1.9.4
+%endif
 BuildRequires:  pkgconfig(libjpeg)
 BuildRequires:  pkgconfig(liblz4) >= 1.7.3
 BuildRequires:  pkgconfig(liblzma)
@@ -121,38 +116,27 @@ BuildRequires:  pkgconfig(libtiff-4)
 BuildRequires:  pkgconfig(netcdf)
 BuildRequires:  pkgconfig(ogg)
 BuildRequires:  pkgconfig(openssl)
-BuildRequires:  pkgconfig(proj) >= 5.0.0
+BuildRequires:  pkgconfig(protobuf)
 BuildRequires:  pkgconfig(sqlite3)
-BuildRequires:  pkgconfig(theora)
-BuildRequires:  pkgconfig(xt)
-BuildRequires:  pkgconfig(zlib)
-%if %{with fmt}
-BuildRequires:  fmt-10-devel
-%endif
-%if %{with gl2ps}
-BuildRequires:  gl2ps-devel >= 1.4.1
-%endif
-%if %{with haru}
-BuildRequires:  libharu-devel > 2.4.0
-%endif
-%if %{with fast_float}
-BuildRequires:  cmake(FastFloat)
-%endif
-%if %{with jsoncpp}
-BuildRequires:  pkgconfig(jsoncpp) >= 1.9.4
-%endif
 %if %{with nlohmann}
 BuildRequires:  pkgconfig(nlohmann_json)
 %endif
+%if %{with proj}
+BuildRequires:  pkgconfig(proj)
+%endif
 %if %{with pugixml}
 BuildRequires:  pkgconfig(pugixml) >= 1.11
 %endif
 %if %{with verdict}
 BuildRequires:  verdict-devel
 %endif
+BuildRequires:  pkgconfig(CLI11)
+BuildRequires:  pkgconfig(theora)
+BuildRequires:  pkgconfig(xt)
+BuildRequires:  pkgconfig(zlib)
+Recommends:     %{name}-plugins
 Requires:       gnuplot
 Requires:       graphviz
-Recommends:     %{name}-plugins
 # Disable on aarch64 since GLES isn't supported for bundled vtk but is needed for paraview
 ExcludeArch:    aarch64
 
@@ -178,7 +162,7 @@ This package provides the shared libraries for paraview.
 Summary:        Headers for building ParaView plugins or embedding Catalyst
 Group:          Development/Libraries/Other
 Requires:       %{shlib} = %{version}
-Requires:       cmake >= 3.13
+Requires:       cmake >= 3.3
 Requires:       glibc-devel
 Requires:       libboost_thread-devel
 
@@ -219,65 +203,51 @@ This package provides the paraview plugins bundled with the upstream release.
 %autosetup -p1 -n ParaView-v%{version}
 
 # FIX env BASED HASHBANG
-sed -Ei "1{s|#!%{_bindir}/env python3|#!%{_bindir}/python3|}" Clients/CommandLineExecutables/paraview-config.in
+sed -Ei "1{s|#!/usr/bin/env python3|#!/usr/bin/python3|}" Clients/CommandLineExecutables/paraview-config.in
-
-# Fix erroneous dependency on sqlite3 binary
-sed -i -e '/set(vtk_sqlite_build_binary 1)/ s/.*/#\0/' CMakeLists.txt
-
-# Allow other versions for fast_float
-sed -i -e '/VERSION .*/ d' VTK/ThirdParty/fast_float/CMakeLists.txt
 
 %build
-%global _lto_cflags %{?_lto_cflags} -ffat-lto-objects
+%global _lto_cflags %{_lto_cflags} -ffat-lto-objects
-%global __builder ninja
 
 %cmake -DCMAKE_INSTALL_LIBDIR=%{_lib} \
        -DCMAKE_INSTALL_DOCDIR=%{_docdir}/%{name} \
        -DPARAVIEW_BUILD_SHARED_LIBS:BOOL=ON \
-%if 0%{?suse_version} <= 1500 && 0%{?is_opensuse}
+%if 0%{?suse_version} <= 1500
        -DCMAKE_SKIP_RPATH:BOOL=OFF \
 %endif
+       -DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON \
+       -DVTK_IGNORE_CMAKE_CXX11_CHECKS:BOOL=ON \
+       -DCMAKE_CXX_EXTENSIONS:BOOL=OFF \
+       -DCMAKE_CXX_STANDARD=17 \
+       -DCMAKE_CXX_STANDARD_REQUIRED:BOOL=ON \
+       -DPARAVIEW_USE_VTKM:BOOL=OFF \
+       -DPARAVIEW_USE_QT:BOOL=ON \
+       -DPARAVIEW_USE_PYTHON:BOOL=ON \
+       -DPARAVIEW_PYTHON_SITE_PACKAGES_SUFFIX=%{_lib}/python%{py3_ver}/site-packages/paraview \
+       -DVTK_PYTHON_OPTIONAL_LINK:BOOL=OFF \
+       -DPARAVIEW_ENABLE_WEB:BOOL=ON \
+       -DVTK_WRAP_PYTHON:BOOL=ON \
+       -DVTK_OPENGL_HAS_OSMESA:BOOL=OFF \
        -DBUILD_EXAMPLES:BOOL=OFF \
        -DBUILD_TESTING:BOOL=OFF \
-       -DCMAKE_CXX_EXTENSIONS:BOOL=OFF \
-       -DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON \
-       -DPARAVIEW_BUILD_WITH_EXTERNAL:BOOL=ON \
-       -DPARAVIEW_ENABLE_WEB:BOOL=ON \
-       -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON \
-       -DPARAVIEW_PYTHON_SITE_PACKAGES_SUFFIX=%{_lib}/python%{py3_ver}/site-packages/paraview \
-       -DPARAVIEW_USE_PYTHON:BOOL=ON \
-       -DPARAVIEW_USE_QT:BOOL=ON \
-       -DPARAVIEW_USE_VTKM:BOOL=OFF \
        -DQtTesting_INSTALL_NO_DEVELOPMENT:BOOL=ON \
        -DVTK_BUILD_QT_DESIGNER_PLUGIN:BOOL=OFF \
-       -DVTK_ENABLE_CATALYST:BOOL=ON \
+       -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON \
-       -DVTK_OPENGL_HAS_OSMESA:BOOL=OFF \
+       -DPARAVIEW_BUILD_WITH_EXTERNAL:BOOL=ON \
-       -DVTK_PYTHON_OPTIONAL_LINK:BOOL=OFF \
+       -DVTK_MODULE_USE_EXTERNAL_ParaView_vtkcatalyst:BOOL=OFF \
-       -DVTK_WRAP_PYTHON:BOOL=ON \
-       -DVTK_MODULE_ENABLE_VTK_libharu:BOOL=YES \
-       -DVTK_MODULE_ENABLE_VTK_pegtl:BOOL=YES \
-       -DVTK_MODULE_ENABLE_VTK_zfp:BOOL=NO \
        -DVTK_MODULE_USE_EXTERNAL_VTK_exprtk:BOOL=OFF \
-       -DVTK_MODULE_USE_EXTERNAL_VTK_fast_float:BOOL=%{?with_fast_float:ON}%{!?with_fast_float:OFF} \
+       -DVTK_MODULE_USE_EXTERNAL_VTK_fast_float:BOOL=OFF \
-       -DVTK_MODULE_USE_EXTERNAL_VTK_fmt:BOOL=%{?with_fmt:ON}%{!?with_fmt: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_jsoncpp=%{?with_jsoncpp:ON}%{!?with_jsoncpp: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_nlohmannjson=%{?with_nlohmann:ON}%{!?with_nlohmann:OFF} \
-       -DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=NO \
        -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} \
-       -Wno-dev \
        %{nil}
 
-# ParaView >= 5.13.2 wrongly adds each option of CMAKE_SHARED_LINKER_FLAGS as a single
-# option with multiple -Wl in betwen, this makes the build fail. Correct it manually
-sed -i 's/,-Wl/ -Wl/g' ./build.ninja
-sed -i 's/,-ffat-lto-objects/ -ffat-lto-objects/g' ./build.ninja
-
 %cmake_build
 
 %install
@@ -286,15 +256,15 @@ find . \( -name \*.txt -o -name \*.xml -o -name '*.[ch]' -o -name '*.[ch][px][px
 %cmake_install
 
 # Unnecessary hash-bang
-sed -i "1{\@%{_bindir}/env@d}" %{buildroot}%{python3_sitearch}/paraview/vtkmodules/generate_pyi.py
+sed -i "1{\@/usr/bin/env@d}" %{buildroot}%{python3_sitearch}/paraview/vtkmodules/generate_pyi.py
-sed -i "1{\@%{_bindir}/env@d}" %{buildroot}%{python3_sitearch}/paraview/vtkmodules/test/rtImageTest.py
 
 # INSTALL DOCUMENTATION USED BY THE HELP MENU IN MAIN APP
-install -Dm0644 %{SOURCE2} %{buildroot}%{_datadir}/%{name}-%{short_ver}/doc/GettingStarted.pdf
+install -Dm0644 %{S:2} %{buildroot}%{_datadir}/%{name}-%{short_ver}/doc/GettingStarted.pdf
 
 %fdupes %{buildroot}/
 
 %post -n %{shlib} -p /sbin/ldconfig
+
 %postun -n %{shlib} -p /sbin/ldconfig
 
 %files