Skip to content

Commit

Permalink
ParaView: Added patches for comiling 5.10.1 and 5.11.2 with Gcc 13
Browse files Browse the repository at this point in the history
  • Loading branch information
Will Bainbridge committed May 16, 2024
1 parent 730bb16 commit 9e5f910
Show file tree
Hide file tree
Showing 2 changed files with 70 additions and 0 deletions.
46 changes: 46 additions & 0 deletions ParaView-5.10.1.patch
Original file line number Diff line number Diff line change
@@ -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 <array> // for std::array
+#include <cstdint> // for std::uint8_t and std::uint32_t
#include <string> // 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 <cstdint>
#include <fstream>
#include <iostream>
#include <list>
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 <cstdint> // for std::uint64_t
#include <vector> // 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
24 changes: 24 additions & 0 deletions ParaView-5.11.2.patch
Original file line number Diff line number Diff line change
@@ -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 <cstdint>
#include <vector>
#include <string>

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

0 comments on commit 9e5f910

Please sign in to comment.