From 9a31f647ae412802c556a8372902d0056316dd7d Mon Sep 17 00:00:00 2001 From: Michael Migliore Date: Mon, 15 May 2023 17:28:28 +0200 Subject: [PATCH] [vtk] patch GCC13 compilation errors --- ports/vtk/missing-include-fixes.patch | 40 +++++++++++++++++++++++++++ ports/vtk/portfile.cmake | 1 + ports/vtk/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/v-/vtk.json | 5 ++++ 5 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 ports/vtk/missing-include-fixes.patch diff --git a/ports/vtk/missing-include-fixes.patch b/ports/vtk/missing-include-fixes.patch new file mode 100644 index 00000000000000..e6f49cab9ef2d3 --- /dev/null +++ b/ports/vtk/missing-include-fixes.patch @@ -0,0 +1,40 @@ +diff --git a/IO/Image/vtkSEPReader.cxx b/IO/Image/vtkSEPReader.cxx +index 2b15bc249e..cec84d1712 100644 +--- a/IO/Image/vtkSEPReader.cxx ++++ b/IO/Image/vtkSEPReader.cxx +@@ -34,7 +34,6 @@ + #include + + #include +-#include + + namespace details + { +diff --git a/IO/Image/vtkSEPReader.h b/IO/Image/vtkSEPReader.h +index 83d127a41e..bdb33a258b 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 ++#include // for std::string + + namespace details + { +diff --git a/ThirdParty/libproj/vtklibproj/src/proj_json_streaming_writer.hpp b/ThirdParty/libproj/vtklibproj/src/proj_json_streaming_writer.hpp +index 6267684218..cf19b83af4 100644 +--- a/ThirdParty/libproj/vtklibproj/src/proj_json_streaming_writer.hpp ++++ b/ThirdParty/libproj/vtklibproj/src/proj_json_streaming_writer.hpp +@@ -31,6 +31,7 @@ + + /*! @cond Doxygen_Suppress */ + ++#include + #include + #include + diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 1f1013529947fc..72eeb48307cce7 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -40,6 +40,7 @@ vcpkg_from_github( iotr.patch ${STRING_PATCH} 9690.diff + missing-include-fixes.patch ) # ============================================================================= diff --git a/ports/vtk/vcpkg.json b/ports/vtk/vcpkg.json index edc09943105b91..26f1cab5ab99e4 100644 --- a/ports/vtk/vcpkg.json +++ b/ports/vtk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "vtk", "version-semver": "9.2.0-pv5.11.0", - "port-version": 6, + "port-version": 7, "description": "Software system for 3D computer graphics, image processing, and visualization", "homepage": "https://github.com/Kitware/VTK", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index ada0f2d06ee0b2..a4f0a93bc53a3d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8426,7 +8426,7 @@ }, "vtk": { "baseline": "9.2.0-pv5.11.0", - "port-version": 6 + "port-version": 7 }, "vtk-dicom": { "baseline": "0.8.14", diff --git a/versions/v-/vtk.json b/versions/v-/vtk.json index 232b24571a3c42..ff008111c0bf92 100644 --- a/versions/v-/vtk.json +++ b/versions/v-/vtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9ec376669498a8b43b3dc1779386dcc383d7cc1f", + "version-semver": "9.2.0-pv5.11.0", + "port-version": 7 + }, { "git-tree": "340d82faf130e467fb4ed6d5e8ce5bf93101513e", "version-semver": "9.2.0-pv5.11.0",