Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[vtk] patch GCC13 compilation errors #31447

Merged
merged 1 commit into from
Jun 1, 2023
Merged

[vtk] patch GCC13 compilation errors #31447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 40 additions & 0 deletions ports/vtk/missing-include-fixes.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <vtksys/SystemTools.hxx>

#include <algorithm>
-#include <cstdint>

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 <array> // for std::array
-#include <string> // for std::string
+#include <array> // for std::array
+#include <cstdint> // for std::uint8_t
+#include <string> // 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 <cstdint>
#include <vector>
#include <string>

dan-shaw marked this conversation as resolved.
Show resolved Hide resolved
1 change: 1 addition & 0 deletions ports/vtk/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ vcpkg_from_github(
iotr.patch
${STRING_PATCH}
9690.diff
missing-include-fixes.patch
)

# =============================================================================
Expand Down
2 changes: 1 addition & 1 deletion ports/vtk/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8426,7 +8426,7 @@
},
"vtk": {
"baseline": "9.2.0-pv5.11.0",
"port-version": 6
"port-version": 7
},
"vtk-dicom": {
"baseline": "0.8.14",
Expand Down
5 changes: 5 additions & 0 deletions versions/v-/vtk.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down