diff options
| author |   Bernd Waibel <waebbl-gentoo@posteo.net> | 2023-05-03 18:14:18 +0200 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2023-05-03 23:23:19 +0100 |
| commit | 86a9526ce8490c8689d8dad8c5c82a2f903e8ffa (patch) | |
| tree | ad7c0d5b98d54dae85c2f499926c1e54372ff3a7 /sci-libs/vtk | |
| parent | sys-apps/less: add 633 (diff) | |
| download | gentoo-86a9526ce8490c8689d8dad8c5c82a2f903e8ffa.tar.gz gentoo-86a9526ce8490c8689d8dad8c5c82a2f903e8ffa.tar.bz2 gentoo-86a9526ce8490c8689d8dad8c5c82a2f903e8ffa.zip | |
sci-libs/vtk: fix build with gcc-13
add upstream patch with gcc-13 related fixes
Closes: https://bugs.gentoo.org/905387
Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/30859
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sci-libs/vtk')
3 files changed, 34 insertions, 21 deletions
diff --git a/sci-libs/vtk/files/vtk-9.2.5-Add-include-cstdint-for-gcc-13.patch b/sci-libs/vtk/files/vtk-9.2.5-Add-include-cstdint-for-gcc-13.patch deleted file mode 100644 index 3ab71521b6b5..000000000000 --- a/sci-libs/vtk/files/vtk-9.2.5-Add-include-cstdint-for-gcc-13.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 69351f357a82c0bb7f97f4f707962de3400760a8 Mon Sep 17 00:00:00 2001 -From: Bernd Waibel <waebbl-gentoo@posteo.net> -Date: Sun, 29 Jan 2023 12:17:36 +0100 -Subject: [PATCH] Add #include <cstdint> for gcc-13 - -Bug: https://gitlab.kitware.com/vtk/vtk/-/issues/18782 -Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> ---- a/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h -+++ b/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h -@@ -50,6 +50,7 @@ - #include "vtkRenderingMatplotlibModule.h" // For export macro - - #include <vector> // for std::vector -+#include <cstdint> // for std::uint64_t - - struct _object; - typedef struct _object PyObject; --- -2.39.1 - diff --git a/sci-libs/vtk/files/vtk-9.2.5-More-include-cstdint-to-compile-with-gcc13.patch b/sci-libs/vtk/files/vtk-9.2.5-More-include-cstdint-to-compile-with-gcc13.patch new file mode 100644 index 000000000000..356efbb4da9a --- /dev/null +++ b/sci-libs/vtk/files/vtk-9.2.5-More-include-cstdint-to-compile-with-gcc13.patch @@ -0,0 +1,33 @@ +https://bugs.gentoo.org/905387 +https://github.com/Kitware/VTK/commit/4d8283bcb460ff60d8df1b7b67b5db19876a5ca3 + +From 890f7574f01cf58cb1522772a62ca07deb438479 Mon Sep 17 00:00:00 2001 +From: Mathieu Westphal <mathieu.westphal@kitware.com> +Date: Thu, 23 Feb 2023 18:06:07 +0100 +Subject: [PATCH 1580/2105] More #include <cstdint> to compile with gcc13 + +--- a/IO/PIO/PIOData.h ++++ b/IO/PIO/PIOData.h +@@ -1,6 +1,7 @@ + #if !defined(_PIODATA_H) + #define _PIODATA_H + ++#include <cstdint> + #include <fstream> + #include <iostream> + #include <list> +--- a/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h ++++ b/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h +@@ -49,7 +49,8 @@ + #include "vtkMathTextUtilities.h" + #include "vtkRenderingMatplotlibModule.h" // For export macro + +-#include <vector> // for std::vector ++#include <cstdint> // for std::uint64_t ++#include <vector> // for std::vector + + struct _object; + typedef struct _object PyObject; +-- +2.40.1 + diff --git a/sci-libs/vtk/vtk-9.2.5.ebuild b/sci-libs/vtk/vtk-9.2.5.ebuild index e4fc6333d5f8..23a48458dd3a 100644 --- a/sci-libs/vtk/vtk-9.2.5.ebuild +++ b/sci-libs/vtk/vtk-9.2.5.ebuild @@ -162,8 +162,8 @@ PATCHES=( "${FILESDIR}"/${PN}-9.2.2-VTKm-respect-user-CXXFLAGS.patch "${FILESDIR}"/${PN}-9.2.2-link-with-glut-library-for-freeglut.patch "${FILESDIR}"/${PN}-9.2.5-Add-include-cstdint-to-compile-with-gcc-13.patch - "${FILESDIR}"/${PN}-9.2.5-Add-include-cstdint-for-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 ) DOCS=( CONTRIBUTING.md README.md ) |