summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Maier <tamiko@gentoo.org>2025-01-06 22:27:13 -0600
committerMatthias Maier <tamiko@gentoo.org>2025-01-06 22:28:06 -0600
commitd4529712f818d81801aecb36e0b04af6d0830d51 (patch)
treeb49b94281b3ae5da29c0130231dcb90de68fc60a /sci-visualization/paraview
parentsci-visualization/paraview: add 5.13.1 (diff)
downloadgentoo-d4529712f818d81801aecb36e0b04af6d0830d51.tar.gz
gentoo-d4529712f818d81801aecb36e0b04af6d0830d51.tar.bz2
gentoo-d4529712f818d81801aecb36e0b04af6d0830d51.zip
sci-visualization/paraview: fix compilation with CMake 3.31 onwards
Closes: https://bugs.gentoo.org/947535 Signed-off-by: Matthias Maier <tamiko@gentoo.org>
Diffstat (limited to 'sci-visualization/paraview')
-rw-r--r--sci-visualization/paraview/files/paraview-5.13.0-cmake-3.31-compat.patch15
-rw-r--r--sci-visualization/paraview/paraview-5.13.0.ebuild3
-rw-r--r--sci-visualization/paraview/paraview-5.13.1.ebuild1
3 files changed, 18 insertions, 1 deletions
diff --git a/sci-visualization/paraview/files/paraview-5.13.0-cmake-3.31-compat.patch b/sci-visualization/paraview/files/paraview-5.13.0-cmake-3.31-compat.patch
new file mode 100644
index 000000000000..715cbe3fcf00
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-5.13.0-cmake-3.31-compat.patch
@@ -0,0 +1,15 @@
+From https://gitlab.kitware.com/paraview/paraview/-/commit/f1543ffcb1db1832d00c0fe8d183c1b63af96827?merge_request_iid=7135
+
+diff --git a/CMake/ParaViewCompilerExtraFlags.cmake b/CMake/ParaViewCompilerExtraFlags.cmake
+index 4feb06da0c481c382605effeee20cc4a00f59cfe..4c1b87876f0b444e751dd3a6ee66d485ae09c32b 100644
+--- a/CMake/ParaViewCompilerExtraFlags.cmake
++++ b/CMake/ParaViewCompilerExtraFlags.cmake
+@@ -37,7 +37,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+ set_target_properties(paraviewbuild
+ PROPERTIES
+ INTERFACE_LINK_OPTIONS
+- "LINKER:SHELL:${PARAVIEW_EXTRA_SHARED_LINKER_FLAGS} -lc ${CMAKE_SHARED_LINKER_FLAGS}")
++ "LINKER:SHELL:${PARAVIEW_EXTRA_SHARED_LINKER_FLAGS} -lc")
+ endif()
+ endif()
+
diff --git a/sci-visualization/paraview/paraview-5.13.0.ebuild b/sci-visualization/paraview/paraview-5.13.0.ebuild
index ab6b661d4c4d..610b10157aeb 100644
--- a/sci-visualization/paraview/paraview-5.13.0.ebuild
+++ b/sci-visualization/paraview/paraview-5.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -100,6 +100,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-5.5.0-allow_custom_build_type.patch
+ "${FILESDIR}"/${P}-cmake-3.31-compat.patch
)
# false positive when checking for available HDF5 interface, bug #904731
diff --git a/sci-visualization/paraview/paraview-5.13.1.ebuild b/sci-visualization/paraview/paraview-5.13.1.ebuild
index d2786fc8642f..b99ee89f50b9 100644
--- a/sci-visualization/paraview/paraview-5.13.1.ebuild
+++ b/sci-visualization/paraview/paraview-5.13.1.ebuild
@@ -100,6 +100,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-5.5.0-allow_custom_build_type.patch
+ "${FILESDIR}"/${PN}-5.13.0-cmake-3.31-compat.patch
)
# false positive when checking for available HDF5 interface, bug #904731