Accepting request 1325853 from science

OBS-URL: https://build.opensuse.org/request/show/1325853
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vtk?expand=0&rev=70

0001-java-support-java-bindings-IO-Avmesh-and-LANLX3D.patch

@@ -1,34 +0,0 @@
-From e1be51aecce8798a643abc4fd486e8beabf252ad Mon Sep 17 00:00:00 2001
-From: Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
-Date: Thu, 19 Jun 2025 21:53:51 -0400
-Subject: [PATCH] java: support java bindings IO Avmesh and LANLX3D
-
----
- IO/Avmesh/vtk.module  | 1 +
- IO/LANLX3D/vtk.module | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/IO/Avmesh/vtk.module b/IO/Avmesh/vtk.module
-index 3c2a3a7ad3..895f9817bc 100644
---- a/IO/Avmesh/vtk.module
-+++ b/IO/Avmesh/vtk.module
-@@ -14,6 +14,7 @@ DEPENDS
-   VTK::CommonCore
-   VTK::IOCore
- PRIVATE_DEPENDS
-+  VTK::CommonExecutionModel
-   VTK::CommonDataModel
- TEST_DEPENDS
-   VTK::CommonDataModel
-diff --git a/IO/LANLX3D/vtk.module b/IO/LANLX3D/vtk.module
-index 2ff7ee2e9e..4a84226d74 100644
---- a/IO/LANLX3D/vtk.module
-+++ b/IO/LANLX3D/vtk.module
-@@ -20,3 +20,4 @@ DEPENDS
-   VTK::FiltersCore
- PRIVATE_DEPENDS
-   VTK::CommonCore
-+  VTK::CommonExecutionModel
--- 
-2.43.0
-

VTK-9.5.0.tar.gz

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

VTK-9.5.2.tar.gz

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

vtk.changes

@@ -1,3 +1,55 @@
+-------------------------------------------------------------------
+Wed Dec 19 19:54:00 UTC 2025 - Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
+
+- Enable modules needed for ParaView to build using external VTK.
+  Modules enabled:
+  * VTK::cli11
+  * VTK::FiltersParallelDIY2
+  * VTK::FiltersParallelStatistics                   
+  * VTK::FiltersParallelVerdict                      
+  * VTK::IOAvmesh                                    
+  * VTK::IOH5part                                    
+  * VTK::IOH5Rage                                    
+  * VTK::IOOMF                                       
+  * VTK::IOParallelExodus                            
+  * VTK::IOParallelLSDyna                            
+  * VTK::IOPIO                                       
+  * VTK::IOTRUCHAS                                   
+  * VTK::IOVPIC                                      
+  * VTK::IOXdmf2                                     
+  * VTK::RenderingMatplotlib                         
+  * VTK::RenderingParallel                           
+  * VTK::RenderingVolumeAMR                          
+  * VTK::WebCore                                     
+  * VTK::WebGLExporter                               
+  * VTK::WebPython       
+
+-------------------------------------------------------------------
+Wed Oct  1 13:48:54 UTC 2025 - Fridrich Strba <fstrba@suse.com>
+
+- Update to version 9.5.2, see:
+  https://gitlab.kitware.com/vtk/vtk/-/blob/v9.5.2/Documentation/release/9.5.md
+- Build with internal libfmt in factory, since the version 12 there
+  is not compatible with this version of vtk
+
+-------------------------------------------------------------------
+Fri Aug 29 14:56:06 UTC 2025 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
+
+- Update to version 9.5.1, see:
+  https://gitlab.kitware.com/vtk/vtk/-/blob/v9.5.1/Documentation/release/9.5.md
+- Drop upstream patches:
+  * 0001-java-support-java-bindings-IO-Avmesh-and-LANLX3D.patch
+- Use system netcdf for SLE15SP7, as it builds fine. Leap/SLE15.6
+  is not buildable due to several more missing dependencies,
+  and 16.0 is around the corner.
+
+-------------------------------------------------------------------
+Mon Aug 25 16:09:04 UTC 2025 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
+
+- Remove references to qml plugin dir. The QQmlVTKPlugin has been
+  deprecated by the QQuickVTKItem in 9.3, and removed in 9.5.
+- Use system libfmt on Leap/SLFO 16.
+
 -------------------------------------------------------------------
 Mon Jun 24 19:54:00 UTC 2025 - Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
 

vtk.spec

@@ -2,6 +2,7 @@
 # spec file for package vtk
 #
 # Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -32,25 +33,27 @@
 %define pkgname vtk
 
 # pugixml in Leap 15.x is too old
-# fmt in Leap 15.x and 16.x is too old
+# fmt in Leap 15.x is too old
 # Need haru/hpdf version with HPDF_SHADING, i.e. >= 2.4.0
 # PEGTL >= 3.0 not supported, https://gitlab.kitware.com/vtk/vtk/-/issues/18151
-# netcdf in Leap 15.6 has hdf5 version conflicts
 %if 0%{?suse_version} <= 1500
 %bcond_with    fast_float
 %bcond_with    haru
-%bcond_with    netcdf
 %bcond_with    fmt
 %bcond_with    pugixml
+%bcond_with    nlohmann
+%bcond_with    cli11
 %else
 %bcond_without fast_float
 %bcond_without haru
-%bcond_without netcdf
 %bcond_without pugixml
-%if 0%{?suse_version} == 1600
-%bcond_with    fmt
-%else
+%bcond_without nlohmann
+%bcond_without cli11
+# fmt in Factory is too new
+%if 0%{?suse_version} <= 1600
 %bcond_without fmt
+%else
+%bcond_with fmt
 %endif
 %define have_strip_nondeterminism 1
 %endif
@@ -58,6 +61,8 @@
 %bcond_with    system_pegtl
 %bcond_without gl2ps
 %bcond_without java
+%bcond_without netcdf
+%bcond_without verdict
 
 %if "%{flavor}" == ""
 %define my_suffix %{nil}
@@ -66,6 +71,7 @@
 %define my_libdir %_libdir
 %define my_incdir %_includedir
 %define my_datadir %_datadir
+%define my_python3_sitearch %{python3_sitearch}
 %endif
 
 %if "%{flavor}" == "openmpi4"
@@ -90,13 +96,14 @@
 %define my_libdir %{my_prefix}/%{_lib}/
 %define my_incdir %{my_prefix}/include/
 %define my_datadir %{my_prefix}/share/
+%define my_python3_sitearch %{mpiprefix}/%{_lib}/python%{python3_version}/site-packages
 %endif
 
 %define vtklib  lib%{pkgname}1%{?my_suffix}
 %define shlib   %{vtklib}
 
 Name:           vtk%{?my_suffix}
-Version:        9.5.0
+Version:        9.5.2
 Release:        0
 %define series  9.5
 Summary:        The Visualization Toolkit - A high level 3D visualization library
@@ -124,8 +131,6 @@ Patch18:        0001-Consider-VTK_PYTHON_SITE_PACKAGES_SUFFIX-for-Python-.patch
 Patch19:        0001-Add-missing-libm-link-library-for-bundled-ExodusII.patch
 # PATCH-FIX-OPENSUSE
 Patch20:        0001-Fix-missing-GLAD-symbol-mangling-in-Rendering-GL2PSO.patch
-# PATCH-FIX-UPSTREAM -- Support java bindings for modules IO Avmesh and LANLX3D
-Patch21:        0001-java-support-java-bindings-IO-Avmesh-and-LANLX3D.patch
 BuildRequires:  cgns-devel
 BuildRequires:  chrpath
 BuildRequires:  cmake >= 3.12
@@ -149,6 +154,7 @@ BuildRequires:  python3-devel
 BuildRequires:  python3-numpy-devel
 BuildRequires:  python3-qt5-devel
 BuildRequires:  python3-setuptools
+BuildRequires:  sqlite3
 BuildRequires:  utfcpp-devel
 BuildRequires:  cmake(Verdict)
 BuildRequires:  cmake(nlohmann_json)
@@ -171,9 +177,6 @@ BuildRequires:  pkgconfig(liblz4) >= 1.8.0
 BuildRequires:  pkgconfig(libpng)
 BuildRequires:  pkgconfig(libswscale)
 BuildRequires:  pkgconfig(libxml-2.0)
-%if %{with netcdf}
-BuildRequires:  pkgconfig(netcdf)
-%endif
 BuildRequires:  pkgconfig(proj) >= 5.0.0
 BuildRequires:  pkgconfig(sqlite3)
 BuildRequires:  pkgconfig(theora)
@@ -184,8 +187,15 @@ BuildRequires:  doxygen
 BuildRequires:  gnuplot
 BuildRequires:  graphviz
 %endif
+%if %{with netcdf}
+BuildRequires:  pkgconfig(netcdf)
+%endif
+%if %{with cli11}
+BuildRequires:  pkgconfig(CLI11)
+%endif
 %if %{with fmt}
 BuildRequires:  fmt-devel > 11.0
+BuildConflicts: fmt-devel >= 12
 %endif
 %if %{with gl2ps}
 BuildRequires:  gl2ps-devel > 1.4.0
@@ -218,7 +228,6 @@ BuildRequires:  pkgconfig(pugixml) >= 1.11
 BuildRequires:  (pegtl-devel >= 2.0.0 with pegtl-devel < 3.0)
 %endif
 %if %{with testing}
-BuildRequires:  cli11-devel
 BuildRequires:  vtkdata = %{version}
 %endif
 
@@ -286,6 +295,7 @@ Requires:       pkgconfig(liblz4) >= 1.7.3
 Requires:       pkgconfig(liblzma)
 Requires:       pkgconfig(libpng)
 Requires:       pkgconfig(libswscale)
+Requires:       pkgconfig(proj) >= 5.0.0
 %if %{with netcdf}
 Requires:       pkgconfig(netcdf)
 %endif
@@ -297,6 +307,9 @@ Requires:       (pegtl-devel >= 2.0.0 with pegtl-devel < 3.0)
 %if %{with pugixml}
 Requires:       pkgconfig(pugixml) >= 1.11
 %endif
+%if %{with cli11}
+Requires:       pkgconfig(CLI11)
+%endif
 Conflicts:      vtk-compat_gl-devel
 
 %description    devel
@@ -423,9 +436,6 @@ languages.
 # otherwise it will break on symlinks.
 grep -rl '\.\./\.\./\.\./\.\./VTKData' . | xargs -r perl -pi -e's,\.\./\.\./\.\./\.\./VTKData,%{_datadir}/vtkdata,g'
 
-# Fix erroneous dependency on sqlite3 binary
-sed -i -e '/set(vtk_sqlite_build_binary 1)/ s/.*/#\0/' CMakeLists.txt
-
 # Allow testing also without external downloads - https://gitlab.kitware.com/vtk/vtk/-/issues/18692
 sed -i -e '/set(vtk_enable_tests "OFF")/ s/.*/#\0/' CMakeLists.txt
 
@@ -458,27 +468,19 @@ export CXXFLAGS="%{optflags}"
 # https://discourse.vtk.org/t/building-fails-generating-wrap-hierarchy-for-vtk-commoncore-unable-to-open-libvtkwrappingtools-so-1
 # Disable ioss module for MPI flavors, fails to build with 9.1.0, see MR 8565.
 %cmake \
-    -DCMAKE_INSTALL_PREFIX:PATH=%{my_prefix} \
-    -DCMAKE_INSTALL_LIBDIR:PATH=%{_lib} \
     -DCMAKE_INSTALL_DOCDIR:PATH=%{_docdir}/%{name}-%{series} \
-    -DCMAKE_INSTALL_QMLDIR:PATH=%{my_libdir}/qt5/qml \
+    -DCMAKE_INSTALL_LIBDIR:PATH=%{_lib} \
+    -DCMAKE_INSTALL_PREFIX:PATH=%{my_prefix} \
+    -DCMAKE_NO_BUILTIN_CHRPATH:BOOL=ON \
+    -DVTK_BUILD_DOCUMENTATION:BOOL=%{?with_documentation:ON}%{!?with_documentation:OFF} \
+    -DVTK_BUILD_EXAMPLES:BOOL=%{?with_examples:ON}%{!?with_examples:OFF} \
+    -DVTK_BUILD_TESTING:BOOL=%{?with_testing:ON}%{!?with_testing:OFF} \
     -DVTK_FORBID_DOWNLOADS:BOOL=ON \
     -DVTK_PYTHON_OPTIONAL_LINK:BOOL=OFF \
-    -DVTK_BUILD_TESTING:BOOL=%{?with_testing:ON}%{!?with_testing:OFF} \
-    -DVTK_DATA_STORE:PATH=/usr/share/vtkdata/.ExternalData \
-    -DExternalData_NO_SYMLINKS:BOOL=ON \
-    -DVTK_BUILD_EXAMPLES:BOOL=%{?with_examples:ON}%{!?with_examples:OFF} \
-    -DVTK_BUILD_DOCUMENTATION:BOOL=%{?with_documentation:ON}%{!?with_documentation:OFF} \
-    -DCMAKE_NO_BUILTIN_CHRPATH:BOOL=ON \
 %if 0%{?suse_version} <= 1500
     -DCMAKE_SKIP_RPATH:BOOL=OFF \
     -DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON \
 %endif
-    -DVTK_MODULE_ENABLE_VTK_TestingCore=WANT \
-    -DVTK_MODULE_ENABLE_VTK_TestingRendering=WANT \
-    -DVTK_MODULE_ENABLE_VTK_RenderingContextOpenGL2=YES \
-    -DVTK_MODULE_ENABLE_VTK_RenderingLICOpenGL2=%{?with_gles:NO}%{!?with_gles:YES} \
-    -DVTK_MODULE_ENABLE_VTK_RenderingFreeTypeFontConfig=YES \
     -DVTK_CUSTOM_LIBRARY_SUFFIX="" \
     -DVTK_GROUP_ENABLE_Imaging=WANT \
 %if %{with mpi}
@@ -487,31 +489,62 @@ export CXXFLAGS="%{optflags}"
 %else
     -DVTK_USE_MPI:BOOL=OFF \
 %endif
+    -DOpenGL_GL_PREFERENCE:STRING='GLVND' \
     -DVTK_GROUP_ENABLE_Qt=WANT \
     -DVTK_GROUP_ENABLE_Rendering=WANT \
     -DVTK_GROUP_ENABLE_StandAlone=WANT \
     -DVTK_GROUP_ENABLE_Views=WANT \
-    -DVTK_PYTHON_VERSION=3 \
-    -DVTK_WRAP_JAVA:BOOL=%{?with_java:ON}%{!?with_java:OFF} \
     -DVTK_JAVA_RELEASE_VERSION:STRING='11' \
-    -DVTK_WRAP_PYTHON:BOOL=ON \
-    -DOpenGL_GL_PREFERENCE:STRING='GLVND' \
-    -DVTK_OPENGL_USE_GLES:BOOL=%{?with_gles:ON}%{!?with_gles:OFF} \
-    -DVTK_USE_EXTERNAL:BOOL=ON \
+    -DVTK_MODULE_ENABLE_VTK_cli11=WANT \
+    -DVTK_MODULE_ENABLE_VTK_FiltersParallelDIY2=WANT \
+    -DVTK_MODULE_ENABLE_VTK_FiltersParallelStatistics=WANT \
+    -DVTK_MODULE_ENABLE_VTK_FiltersParallelVerdict=WANT \
+    -DVTK_MODULE_ENABLE_VTK_IOAvmesh=WANT \
+    -DVTK_MODULE_ENABLE_VTK_IOH5part=WANT \
+    -DVTK_MODULE_ENABLE_VTK_IOH5Rage=WANT \
+    -DVTK_MODULE_ENABLE_VTK_IOMySQL=%{?with_mysql:ON}%{!?with_mysql:NO} \
+    -DVTK_MODULE_ENABLE_VTK_IOOMF=WANT \
+    -DVTK_MODULE_ENABLE_VTK_IOParallelExodus=WANT \
+    -DVTK_MODULE_ENABLE_VTK_IOParallelLSDyna=WANT \
+    -DVTK_MODULE_ENABLE_VTK_IOPIO=WANT \
+    -DVTK_MODULE_ENABLE_VTK_ioss:STRING=%{!?with_mpi:WANT}%{?with_mpi:NO} \
+    -DVTK_MODULE_ENABLE_VTK_IOTRUCHAS=WANT \
+    -DVTK_MODULE_ENABLE_VTK_IOVPIC=WANT \
+    -DVTK_MODULE_ENABLE_VTK_IOXdmf2=WANT \
+    -DVTK_MODULE_ENABLE_VTK_libharu:BOOL=YES \
+    -DVTK_MODULE_ENABLE_VTK_pegtl=YES \
+    -DVTK_MODULE_ENABLE_VTK_RenderingContextOpenGL2=YES \
+    -DVTK_MODULE_ENABLE_VTK_RenderingFreeTypeFontConfig=YES \
+    -DVTK_MODULE_ENABLE_VTK_RenderingLICOpenGL2=%{?with_gles:NO}%{!?with_gles:YES} \
+    -DVTK_MODULE_ENABLE_VTK_RenderingMatplotlib=WANT \
+    -DVTK_MODULE_ENABLE_VTK_RenderingParallel=WANT \
+    -DVTK_MODULE_ENABLE_VTK_RenderingVolumeAMR=WANT \
+    -DVTK_MODULE_ENABLE_VTK_TestingCore=WANT \
+    -DVTK_MODULE_ENABLE_VTK_TestingRendering=WANT \
+    -DVTK_MODULE_ENABLE_VTK_WebCore=WANT \
+    -DVTK_MODULE_ENABLE_VTK_WebGLExporter=WANT \
+    -DVTK_MODULE_ENABLE_VTK_WebPython=WANT \
+    -DVTK_MODULE_USE_EXTERNAL_VTK_cli11=%{?with_cli11:ON}%{!?with_cli11:OFF} \
     -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_fmt:BOOL=%{?with_fmt:ON}%{!?with_fmt: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_netcdf:BOOL=%{?with_netcdf:ON}%{!?with_netcdf:OFF} \
+    -DVTK_MODULE_USE_EXTERNAL_VTK_nlohmannjson=%{?with_nlohmann:ON}%{!?with_nlohmann:OFF} \
     -DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=%{?with_system_pegtl:YES}%{!?with_system_pegtl:NO} \
     -DVTK_MODULE_USE_EXTERNAL_VTK_pugixml=%{?with_pugixml:ON}%{!?with_pugixml:OFF} \
+    -DVTK_MODULE_USE_EXTERNAL_VTK_sqlite:BOOL=ON \
     -DVTK_MODULE_USE_EXTERNAL_VTK_token:BOOL=OFF \
-    -DVTK_MODULE_ENABLE_VTK_ioss:STRING=%{!?with_mpi:WANT}%{?with_mpi:NO} \
-    -DVTK_MODULE_ENABLE_VTK_pegtl:STRING=YES \
-    -DVTK_MODULE_ENABLE_VTK_zfp:STRING=NO \
-    -DVTK_MODULE_ENABLE_VTK_IOMySQL=%{?with_mysql:ON}%{!?with_mysql:NO} \
+    -DVTK_MODULE_USE_EXTERNAL_VTK_verdict=%{?with_verdict:ON}%{!?with_verdict:OFF} \
+    -DVTK_OPENGL_USE_GLES:BOOL=%{?with_gles:ON}%{!?with_gles:OFF} \
+    -DVTK_PYTHON_VERSION=3 \
+    -DVTK_USE_EXTERNAL:BOOL=ON \
+    -DVTK_WRAP_JAVA:BOOL=%{?with_java:ON}%{!?with_java:OFF} \
+    -DVTK_WRAP_PYTHON:BOOL=ON \
     %{nil}
 
 %cmake_build
@@ -522,6 +555,10 @@ find . -name \*.c -o -name \*.cxx -o -name \*.h -o -name \*.hxx -o -name \*.gif
 %install
 %cmake_install
 
+# Unnecessary hash-bang
+sed -i "1{\@%{_bindir}/env@d}" %{buildroot}%{my_python3_sitearch}/vtkmodules/generate_pyi.py
+sed -i "1{\@%{_bindir}/env@d}" %{buildroot}%{my_python3_sitearch}/vtkmodules/test/rtImageTest.py
+
 %if %{with examples}
 # List of executable examples
 cat > examples.list << EOF
@@ -644,6 +681,7 @@ find %{buildroot} . -name vtk.cpython-3*.pyc -print -delete # drop unreproducibl
 %{?with_mpi: %dir %{my_libdir}/cmake/}
 %{my_libdir}/cmake/%{pkgname}-%{series}/
 %{my_incdir}/%{pkgname}-%{series}/
+%{my_datadir}/vtk/
 # VTK JNI
 %exclude %{my_libdir}/libvtkJava.so
 %exclude %{my_libdir}/cmake/%{pkgname}-%{series}/VTKJava-*.cmake
@@ -681,12 +719,6 @@ find %{buildroot} . -name vtk.cpython-3*.pyc -print -delete # drop unreproducibl
 %files qt
 %license Copyright.txt
 %{my_libdir}/libvtk*Qt*.so.*
-%if %{with mpi}
-%dir %{my_libdir}/qt5
-%{my_libdir}/qt5/qml
-%else
-%{_libqt5_archdatadir}/qml
-%endif
 
 %if %{with examples}
 %if "%{flavor}" == ""