commit: a8c8e1fc3aec24a202764bbe3c3df4a664f0815f Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Mon Nov 6 13:45:32 2023 +0000 Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org> CommitDate: Tue Nov 21 12:47:17 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8c8e1fc
sci-libs/vtk: VTK_JAVA_SOURCE_VERSION "1.8" Closes: https://bugs.gentoo.org/916951 Closes: https://github.com/gentoo/gentoo/pull/33690 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org> sci-libs/vtk/files/vtk-9.2.6-Java21.patch | 17 +++++++++++++++++ sci-libs/vtk/{vtk-9.2.6.ebuild => vtk-9.2.6-r1.ebuild} | 1 + 2 files changed, 18 insertions(+) diff --git a/sci-libs/vtk/files/vtk-9.2.6-Java21.patch b/sci-libs/vtk/files/vtk-9.2.6-Java21.patch new file mode 100644 index 000000000000..08d4c0bf633f --- /dev/null +++ b/sci-libs/vtk/files/vtk-9.2.6-Java21.patch @@ -0,0 +1,17 @@ +diff --git a/Wrapping/Java/CMakeLists.txt b/Wrapping/Java/CMakeLists.txt +index 01f3f93d..3afd78cf 100644 +--- a/Wrapping/Java/CMakeLists.txt ++++ b/Wrapping/Java/CMakeLists.txt +@@ -201,10 +201,10 @@ set(VTK_JAVA_TARGET_VERSION "<DEFAULT>" CACHE STRING "javac target version") + mark_as_advanced(VTK_JAVA_TARGET_VERSION) + + if (VTK_JAVA_SOURCE_VERSION STREQUAL "<DEFAULT>") +- set(VTK_JAVA_SOURCE_VERSION "1.7") ++ set(VTK_JAVA_SOURCE_VERSION "1.8") + endif () + if (VTK_JAVA_TARGET_VERSION STREQUAL "<DEFAULT>") +- set(VTK_JAVA_TARGET_VERSION "1.7") ++ set(VTK_JAVA_TARGET_VERSION "1.8") + endif () + + set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_JARDIR}") diff --git a/sci-libs/vtk/vtk-9.2.6.ebuild b/sci-libs/vtk/vtk-9.2.6-r1.ebuild similarity index 99% rename from sci-libs/vtk/vtk-9.2.6.ebuild rename to sci-libs/vtk/vtk-9.2.6-r1.ebuild index 7f96653bff6a..aeb17419a172 100644 --- a/sci-libs/vtk/vtk-9.2.6.ebuild +++ b/sci-libs/vtk/vtk-9.2.6-r1.ebuild @@ -164,6 +164,7 @@ PATCHES=( "${FILESDIR}"/${PN}-9.2.5-Add-include-cstdint-to-compile-with-gcc-13.patch "${FILESDIR}"/${PN}-9.2.5-Fix-compilation-error-with-CUDA-12.patch "${FILESDIR}"/${PN}-9.2.5-More-include-cstdint-to-compile-with-gcc13.patch + "${FILESDIR}"/vtk-9.2.6-Java21.patch ) DOCS=( CONTRIBUTING.md README.md )
