SHA256
1
0
forked from pool/vtk

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
This commit is contained in:
Ana Guerrero 2023-11-02 08:12:54 +00:00 committed by Git OBS Bridge
parent 5b8117dd4a
commit 01be923380
2 changed files with 9 additions and 2 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Oct 31 22:56:50 UTC 2023 - Fridrich Strba <fstrba@suse.com>
- Build with java source and target levels 8
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Apr 4 08:52:20 UTC 2023 - Stefan Brüns <stefan.bruens@rwth-aachen.de> Tue Apr 4 08:52:20 UTC 2023 - Stefan Brüns <stefan.bruens@rwth-aachen.de>

View File

@ -183,7 +183,7 @@ BuildRequires: gl2ps-devel > 1.4.0
BuildRequires: libharu-devel >= 2.4.0 BuildRequires: libharu-devel >= 2.4.0
%endif %endif
%if %{with java} %if %{with java}
BuildRequires: java-devel BuildRequires: java-devel >= 1.8
%endif %endif
%if %{with mpi} %if %{with mpi}
BuildRequires: %{mpi_flavor}-devel BuildRequires: %{mpi_flavor}-devel
@ -292,7 +292,7 @@ Summary: Develoment files for VTK Java bindings
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: %{name}-devel = %{version} Requires: %{name}-devel = %{version}
Requires: %{name}-java = %{version} Requires: %{name}-java = %{version}
Requires: java-devel Requires: java-devel >= 1.8
Provides: %{name}-devel:%{my_libdir}/libvtkJava.so Provides: %{name}-devel:%{my_libdir}/libvtkJava.so
%description java-devel %description java-devel
@ -465,6 +465,8 @@ export CXXFLAGS="%{optflags}"
-DVTK_GROUP_ENABLE_Views=WANT \ -DVTK_GROUP_ENABLE_Views=WANT \
-DVTK_PYTHON_VERSION=3 \ -DVTK_PYTHON_VERSION=3 \
-DVTK_WRAP_JAVA:BOOL=%{?with_java:ON}%{!?with_java:OFF} \ -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 \ -DVTK_WRAP_PYTHON:BOOL=ON \
-DOpenGL_GL_PREFERENCE:STRING='GLVND' \ -DOpenGL_GL_PREFERENCE:STRING='GLVND' \
-DVTK_OPENGL_USE_GLES:BOOL=%{?with_gles:ON}%{!?with_gles:OFF} \ -DVTK_OPENGL_USE_GLES:BOOL=%{?with_gles:ON}%{!?with_gles:OFF} \