From 5b8117dd4a26fb981de92e3986ed56775db8a361d22bce6a71c638c1dde07234 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Wed, 5 Apr 2023 08:02:10 +0000 Subject: [PATCH] Accepting request 1077233 from home:StefanBruens:branches:science - Fix build with GCC 13, add add_missing_cstdint.patch OBS-URL: https://build.opensuse.org/request/show/1077233 OBS-URL: https://build.opensuse.org/package/show/science/vtk?expand=0&rev=182 --- add_missing_cstdint.patch | 34 ++++++++++++++++++++++++++++++++++ vtk.changes | 5 +++++ vtk.spec | 3 +++ 3 files changed, 42 insertions(+) create mode 100644 add_missing_cstdint.patch diff --git a/add_missing_cstdint.patch b/add_missing_cstdint.patch new file mode 100644 index 0000000..44a38e1 --- /dev/null +++ b/add_missing_cstdint.patch @@ -0,0 +1,34 @@ +From b1a09529f3ab381494f3eecb53b2ce4adc5b55e9 Mon Sep 17 00:00:00 2001 +From: Laurent Rineau +Date: Tue, 17 Jan 2023 16:18:53 +0100 +Subject: [PATCH] Add #include to compile with gcc13 + +The `vtkSEPReader` was introduced by MRs !4909 (from my former +collaborator Maxime) and !4938. Then it was highly modified by +!7516. The later MR is the one that introduced the uses of +`std::uint8_t` and `std::uint32_t`. + +Those types needs the inclusion of ``. +--- + IO/Image/vtkSEPReader.h | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/IO/Image/vtkSEPReader.h b/IO/Image/vtkSEPReader.h +index 83d127a41e4..b9110780f26 100644 +--- a/IO/Image/vtkSEPReader.h ++++ b/IO/Image/vtkSEPReader.h +@@ -25,8 +25,9 @@ + #include "vtkImageAlgorithm.h" + #include "vtkNew.h" // for ivars + +-#include // for std::array +-#include // for std::string ++#include // for std::array ++#include // for std::uint8_t and std::uint32_t ++#include // for std::string + + namespace details + { +-- +GitLab + diff --git a/vtk.changes b/vtk.changes index 4e95acc..c7bb5c7 100644 --- a/vtk.changes +++ b/vtk.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 4 08:52:20 UTC 2023 - Stefan Brüns + +- Fix build with GCC 13, add add_missing_cstdint.patch + ------------------------------------------------------------------- Sat Feb 18 02:07:33 UTC 2023 - Stefan Brüns diff --git a/vtk.spec b/vtk.spec index 1ef2791..e76d297 100644 --- a/vtk.spec +++ b/vtk.spec @@ -120,6 +120,8 @@ Patch10: 0001-GL_POINT_SPRITE-is-only-available-for-Compatibility-.patch Patch17: 0001-Always-generate-Python-Metadata-when-WRAP_PYTHON-is-.patch # PATCH-FIX-UPSTREAM -- Copy generated metadata to the right directory Patch18: 0001-Consider-VTK_PYTHON_SITE_PACKAGES_SUFFIX-for-Python-.patch +# PATCH-FIX-UPSTREAM -- Add missing cstdint header required by GCC 13 +Patch19: https://gitlab.kitware.com/vtk/vtk/-/commit/b1a09529f3ab.patch#/add_missing_cstdint.patch BuildRequires: cgns-devel BuildRequires: chrpath BuildRequires: cmake >= 3.12 @@ -399,6 +401,7 @@ languages. %endif %patch17 -p1 %patch18 -p1 +%patch19 -p1 # Replace relative path ../../../../VTKData with %%{_datadir}/vtkdata # otherwise it will break on symlinks.