From 9e5f910de743b0860aad2c75cf084c282a56b04a Mon Sep 17 00:00:00 2001 From: Will Bainbridge Date: Thu, 16 May 2024 16:25:35 +0100 Subject: [PATCH] ParaView: Added patches for comiling 5.10.1 and 5.11.2 with Gcc 13 --- ParaView-5.10.1.patch | 46 +++++++++++++++++++++++++++++++++++++++++++ ParaView-5.11.2.patch | 24 ++++++++++++++++++++++ 2 files changed, 70 insertions(+) create mode 100644 ParaView-5.10.1.patch create mode 100644 ParaView-5.11.2.patch diff --git a/ParaView-5.10.1.patch b/ParaView-5.10.1.patch new file mode 100644 index 00000000..609fac19 --- /dev/null +++ b/ParaView-5.10.1.patch @@ -0,0 +1,46 @@ +diff -ruN ParaView-5.10.1.orig/VTK/IO/Image/vtkSEPReader.h ParaView-5.10.1/VTK/IO/Image/vtkSEPReader.h +--- ParaView-5.10.1.orig/VTK/IO/Image/vtkSEPReader.h 2022-03-11 22:19:30.000000000 +0000 ++++ ParaView-5.10.1/VTK/IO/Image/vtkSEPReader.h 2024-05-16 15:10:37.175816582 +0100 +@@ -26,6 +26,7 @@ + #include "vtkNew.h" // for ivars + + #include // for std::array ++#include // for std::uint8_t and std::uint32_t + #include // for std::string + + namespace details +diff -ruN ParaView-5.10.1.orig/VTK/IO/PIO/PIOData.h ParaView-5.10.1/VTK/IO/PIO/PIOData.h +--- ParaView-5.10.1.orig/VTK/IO/PIO/PIOData.h 2022-03-11 22:19:30.000000000 +0000 ++++ ParaView-5.10.1/VTK/IO/PIO/PIOData.h 2024-05-16 15:10:37.175816582 +0100 +@@ -1,6 +1,7 @@ + #if !defined(_PIODATA_H) + #define _PIODATA_H + ++#include + #include + #include + #include +diff -ruN ParaView-5.10.1.orig/VTK/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h ParaView-5.10.1/VTK/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h +--- ParaView-5.10.1.orig/VTK/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h 2022-03-11 22:19:30.000000000 +0000 ++++ ParaView-5.10.1/VTK/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h 2024-05-16 15:56:31.818767407 +0100 +@@ -50,6 +50,7 @@ + #include "vtkMathTextUtilities.h" + #include "vtkRenderingMatplotlibModule.h" // For export macro + ++#include // for std::uint64_t + #include // for std::vector + + struct _object; +diff -ruN ParaView-5.10.1.orig/VTK/ThirdParty/netcdf/vtknetcdf/include/vtk_netcdf_mangle.h ParaView-5.10.1/VTK/ThirdParty/netcdf/vtknetcdf/include/vtk_netcdf_mangle.h +--- ParaView-5.10.1.orig/VTK/ThirdParty/netcdf/vtknetcdf/include/vtk_netcdf_mangle.h 2022-03-11 22:19:30.000000000 +0000 ++++ ParaView-5.10.1/VTK/ThirdParty/netcdf/vtknetcdf/include/vtk_netcdf_mangle.h 2024-05-16 15:10:37.175816582 +0100 +@@ -1229,9 +1229,4 @@ + #define UDF1_magic_number vtknetcdf_UDF1_magic_number + #define write_numrecs vtknetcdf_write_numrecs + +-/* Only define strlcat conditionally, as it's provided by system headers on the BSDs. */ +-#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(_BSD_SOURCE) +-#define strlcat vtknetcdf_strlcat +-#endif +- + #endif diff --git a/ParaView-5.11.2.patch b/ParaView-5.11.2.patch new file mode 100644 index 00000000..c0124753 --- /dev/null +++ b/ParaView-5.11.2.patch @@ -0,0 +1,24 @@ +diff -ruN ParaView-5.11.2.orig/VTK/ThirdParty/libproj/vtklibproj/src/proj_json_streaming_writer.hpp ParaView-5.11.2/VTK/ThirdParty/libproj/vtklibproj/src/proj_json_streaming_writer.hpp +--- ParaView-5.11.2.orig/VTK/ThirdParty/libproj/vtklibproj/src/proj_json_streaming_writer.hpp 2023-09-22 15:35:37.000000000 +0100 ++++ ParaView-5.11.2/VTK/ThirdParty/libproj/vtklibproj/src/proj_json_streaming_writer.hpp 2024-05-16 11:18:43.486605968 +0100 +@@ -31,6 +31,7 @@ + + /*! @cond Doxygen_Suppress */ + ++#include + #include + #include + +diff -ruN ParaView-5.11.2.orig/VTK/ThirdParty/netcdf/vtknetcdf/include/vtk_netcdf_mangle.h ParaView-5.11.2/VTK/ThirdParty/netcdf/vtknetcdf/include/vtk_netcdf_mangle.h +--- ParaView-5.11.2.orig/VTK/ThirdParty/netcdf/vtknetcdf/include/vtk_netcdf_mangle.h 2023-09-22 15:35:37.000000000 +0100 ++++ ParaView-5.11.2/VTK/ThirdParty/netcdf/vtknetcdf/include/vtk_netcdf_mangle.h 2024-05-16 12:02:40.234229912 +0100 +@@ -1245,9 +1245,4 @@ + #define UDF1_magic_number vtknetcdf_UDF1_magic_number + #define write_numrecs vtknetcdf_write_numrecs + +-/* Only define strlcat conditionally, as it's provided by system headers on the BSDs. */ +-#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(_BSD_SOURCE) +-#define strlcat vtknetcdf_strlcat +-#endif +- + #endif