e8cb4e64b5
- Rebase GLES patches: * 0001-Correct-GL_BACK-GL_BACK_LEFT-mapping-on-GLES.patch * 0002-Use-GL_DRAW_BUFFER0-instead-of-GL_DRAW_BUFFER-for-GL.patch - Drop obsolete patch: * Do-not-request-CUBE_MAP_SEAMLESS-on-GLES.patch - - Update to version 9.4.0, see: https://gitlab.kitware.com/vtk/vtk/-/blob/master/Documentation/release/9.4.md - Drop upstream patches: * 0001-ioss-update-fmt-includes.patch - Add patches: * 0001-Add-missing-libm-link-library-for-bundled-ExodusII.patch * 0001-Fix-fmt-includes-again.patch * 0001-Fix-missing-GLAD-symbol-mangling-in-Rendering-GL2PSO.patch OBS-URL: https://build.opensuse.org/package/show/science/vtk?expand=0&rev=196
73 lines
2.5 KiB
Diff
73 lines
2.5 KiB
Diff
From 4409560bfae26035cebf474b28097464b9ba4634 Mon Sep 17 00:00:00 2001
|
|
From: Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
|
|
Date: Wed, 4 Sep 2024 18:22:50 -0400
|
|
Subject: [PATCH] ioss: update fmt includes
|
|
|
|
---
|
|
ThirdParty/ioss/vtkioss/Ioss_IOFactory.C | 2 ++
|
|
ThirdParty/ioss/vtkioss/Ioss_StructuredBlock.C | 2 ++
|
|
ThirdParty/ioss/vtkioss/Ioss_Utils.C | 2 ++
|
|
ThirdParty/ioss/vtkioss/Ioss_ZoneConnectivity.C | 2 ++
|
|
4 files changed, 8 insertions(+)
|
|
|
|
diff --git a/ThirdParty/ioss/vtkioss/Ioss_IOFactory.C b/ThirdParty/ioss/vtkioss/Ioss_IOFactory.C
|
|
index 440f352e0e..c9f0d422a3 100644
|
|
--- a/ThirdParty/ioss/vtkioss/Ioss_IOFactory.C
|
|
+++ b/ThirdParty/ioss/vtkioss/Ioss_IOFactory.C
|
|
@@ -11,7 +11,9 @@
|
|
#include <Ioss_Version.h>
|
|
#include <cstddef> // for nullptr
|
|
#include "vtk_fmt.h"
|
|
+#include VTK_FMT(fmt/format.h)
|
|
#include VTK_FMT(fmt/ostream.h)
|
|
+#include VTK_FMT(fmt/ranges.h)
|
|
#include <map> // for _Rb_tree_iterator, etc
|
|
#include <ostream> // for basic_ostream, etc
|
|
#include <set>
|
|
diff --git a/ThirdParty/ioss/vtkioss/Ioss_StructuredBlock.C b/ThirdParty/ioss/vtkioss/Ioss_StructuredBlock.C
|
|
index 1609c31fae..9afc17edbb 100644
|
|
--- a/ThirdParty/ioss/vtkioss/Ioss_StructuredBlock.C
|
|
+++ b/ThirdParty/ioss/vtkioss/Ioss_StructuredBlock.C
|
|
@@ -14,7 +14,9 @@
|
|
#include <Ioss_SmartAssert.h>
|
|
#include <Ioss_StructuredBlock.h>
|
|
#include "vtk_fmt.h"
|
|
+#include VTK_FMT(fmt/format.h)
|
|
#include VTK_FMT(fmt/ostream.h)
|
|
+#include VTK_FMT(fmt/ranges.h)
|
|
|
|
#include <cstddef> // for size_t
|
|
#include <numeric>
|
|
diff --git a/ThirdParty/ioss/vtkioss/Ioss_Utils.C b/ThirdParty/ioss/vtkioss/Ioss_Utils.C
|
|
index 57021abdcb..6a1e2ae243 100644
|
|
--- a/ThirdParty/ioss/vtkioss/Ioss_Utils.C
|
|
+++ b/ThirdParty/ioss/vtkioss/Ioss_Utils.C
|
|
@@ -19,8 +19,10 @@
|
|
#include <cstring>
|
|
#include "vtk_fmt.h"
|
|
#include VTK_FMT(fmt/chrono.h)
|
|
+#include VTK_FMT(fmt/core.h)
|
|
#include VTK_FMT(fmt/format.h)
|
|
#include VTK_FMT(fmt/ostream.h)
|
|
+#include VTK_FMT(fmt/ranges.h)
|
|
#include <fstream>
|
|
#include <sstream>
|
|
#include <string>
|
|
diff --git a/ThirdParty/ioss/vtkioss/Ioss_ZoneConnectivity.C b/ThirdParty/ioss/vtkioss/Ioss_ZoneConnectivity.C
|
|
index 5d324817f2..a1e047f967 100644
|
|
--- a/ThirdParty/ioss/vtkioss/Ioss_ZoneConnectivity.C
|
|
+++ b/ThirdParty/ioss/vtkioss/Ioss_ZoneConnectivity.C
|
|
@@ -8,7 +8,9 @@
|
|
#include <Ioss_ZoneConnectivity.h>
|
|
#include <cstddef> // for size_t
|
|
#include "vtk_fmt.h"
|
|
+#include VTK_FMT(fmt/format.h)
|
|
#include VTK_FMT(fmt/ostream.h)
|
|
+#include VTK_FMT(fmt/ranges.h)
|
|
#include <string> // for string
|
|
#include <vector> // for vector
|
|
|
|
--
|
|
2.35.3
|
|
|