From 01be923380ac156f3469aaf0b5bd242dea2fab921d7b84d772ddb184633b633d Mon Sep 17 00:00:00 2001 From: Ana Guerrero Date: Thu, 2 Nov 2023 08:12:54 +0000 Subject: [PATCH] Accepting request 1121521 from home:fstrba:branches:science Fix build with JDK21 in Factory OBS-URL: https://build.opensuse.org/request/show/1121521 OBS-URL: https://build.opensuse.org/package/show/science/vtk?expand=0&rev=184 --- vtk.changes | 5 +++++ vtk.spec | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/vtk.changes b/vtk.changes index c7bb5c7..db8a3e3 100644 --- a/vtk.changes +++ b/vtk.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 31 22:56:50 UTC 2023 - Fridrich Strba + +- Build with java source and target levels 8 + ------------------------------------------------------------------- Tue Apr 4 08:52:20 UTC 2023 - Stefan Brüns diff --git a/vtk.spec b/vtk.spec index e76d297..21e6e79 100644 --- a/vtk.spec +++ b/vtk.spec @@ -183,7 +183,7 @@ BuildRequires: gl2ps-devel > 1.4.0 BuildRequires: libharu-devel >= 2.4.0 %endif %if %{with java} -BuildRequires: java-devel +BuildRequires: java-devel >= 1.8 %endif %if %{with mpi} BuildRequires: %{mpi_flavor}-devel @@ -292,7 +292,7 @@ Summary: Develoment files for VTK Java bindings Group: Development/Libraries/C and C++ Requires: %{name}-devel = %{version} Requires: %{name}-java = %{version} -Requires: java-devel +Requires: java-devel >= 1.8 Provides: %{name}-devel:%{my_libdir}/libvtkJava.so %description java-devel @@ -465,6 +465,8 @@ export CXXFLAGS="%{optflags}" -DVTK_GROUP_ENABLE_Views=WANT \ -DVTK_PYTHON_VERSION=3 \ -DVTK_WRAP_JAVA:BOOL=%{?with_java:ON}%{!?with_java:OFF} \ + -DVTK_JAVA_SOURCE_VERSION:STRING='1.8' \ + -DVTK_JAVA_TARGET_VERSION:STRING='1.8' \ -DVTK_WRAP_PYTHON:BOOL=ON \ -DOpenGL_GL_PREFERENCE:STRING='GLVND' \ -DVTK_OPENGL_USE_GLES:BOOL=%{?with_gles:ON}%{!?with_gles:OFF} \