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
This commit is contained in:
parent
03cc6fafd7
commit
5b8117dd4a
34
add_missing_cstdint.patch
Normal file
34
add_missing_cstdint.patch
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
From b1a09529f3ab381494f3eecb53b2ce4adc5b55e9 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Laurent Rineau <laurent.rineau@cgal.org>
|
||||||
|
Date: Tue, 17 Jan 2023 16:18:53 +0100
|
||||||
|
Subject: [PATCH] Add #include <cstdint> 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 `<cstdint>`.
|
||||||
|
---
|
||||||
|
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 <array> // for std::array
|
||||||
|
-#include <string> // for std::string
|
||||||
|
+#include <array> // for std::array
|
||||||
|
+#include <cstdint> // for std::uint8_t and std::uint32_t
|
||||||
|
+#include <string> // for std::string
|
||||||
|
|
||||||
|
namespace details
|
||||||
|
{
|
||||||
|
--
|
||||||
|
GitLab
|
||||||
|
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Apr 4 08:52:20 UTC 2023 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
|
||||||
|
|
||||||
|
- Fix build with GCC 13, add add_missing_cstdint.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sat Feb 18 02:07:33 UTC 2023 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
|
Sat Feb 18 02:07:33 UTC 2023 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
|
||||||
|
|
||||||
|
3
vtk.spec
3
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
|
Patch17: 0001-Always-generate-Python-Metadata-when-WRAP_PYTHON-is-.patch
|
||||||
# PATCH-FIX-UPSTREAM -- Copy generated metadata to the right directory
|
# PATCH-FIX-UPSTREAM -- Copy generated metadata to the right directory
|
||||||
Patch18: 0001-Consider-VTK_PYTHON_SITE_PACKAGES_SUFFIX-for-Python-.patch
|
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: cgns-devel
|
||||||
BuildRequires: chrpath
|
BuildRequires: chrpath
|
||||||
BuildRequires: cmake >= 3.12
|
BuildRequires: cmake >= 3.12
|
||||||
@ -399,6 +401,7 @@ languages.
|
|||||||
%endif
|
%endif
|
||||||
%patch17 -p1
|
%patch17 -p1
|
||||||
%patch18 -p1
|
%patch18 -p1
|
||||||
|
%patch19 -p1
|
||||||
|
|
||||||
# Replace relative path ../../../../VTKData with %%{_datadir}/vtkdata
|
# Replace relative path ../../../../VTKData with %%{_datadir}/vtkdata
|
||||||
# otherwise it will break on symlinks.
|
# otherwise it will break on symlinks.
|
||||||
|
Loading…
Reference in New Issue
Block a user