Accepting request 1308613 from science

fix build in factory (forwarded request 1308456 from fstrba)

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

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,29 @@
+-------------------------------------------------------------------
+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

@@ -1,7 +1,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,30 +32,29 @@
 %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
 %else
 %bcond_without fast_float
 %bcond_without haru
-%bcond_without netcdf
 %bcond_without pugixml
-%if 0%{?suse_version} == 1600
-%bcond_with    fmt
-%else
+# 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
 
 %bcond_with    system_pegtl
+%bcond_without netcdf
 %bcond_without gl2ps
 %bcond_without java
 
@@ -96,7 +95,7 @@
 %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 +123,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
@@ -186,6 +183,7 @@ BuildRequires:  graphviz
 %endif
 %if %{with fmt}
 BuildRequires:  fmt-devel > 11.0
+BuildConflicts: fmt-devel >= 12
 %endif
 %if %{with gl2ps}
 BuildRequires:  gl2ps-devel > 1.4.0
@@ -461,7 +459,6 @@ export CXXFLAGS="%{optflags}"
     -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 \
     -DVTK_FORBID_DOWNLOADS:BOOL=ON \
     -DVTK_PYTHON_OPTIONAL_LINK:BOOL=OFF \
     -DVTK_BUILD_TESTING:BOOL=%{?with_testing:ON}%{!?with_testing:OFF} \
@@ -681,12 +678,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}" == ""