Skip to content

Commit 109b3c6

Browse files
committed
[paraview] Fix compatibility with fmt 12.2.0
1 parent 93c7573 commit 109b3c6

5 files changed

Lines changed: 69 additions & 2 deletions

File tree

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
diff --git a/Plugins/Prism/Filters/vtkPrismGeometryConverter.cxx b/Plugins/Prism/Filters/vtkPrismGeometryConverter.cxx
2+
index 0ba008c239..686adeae19 100644
3+
--- a/Plugins/Prism/Filters/vtkPrismGeometryConverter.cxx
4+
+++ b/Plugins/Prism/Filters/vtkPrismGeometryConverter.cxx
5+
@@ -9,7 +9,7 @@
6+
7+
// clang-format off
8+
#include <vtk_fmt.h> // needed for `fmt`
9+
-#include VTK_FMT(fmt/core.h)
10+
+#include VTK_FMT(fmt/format.h)
11+
// clang-format on
12+
13+
//------------------------------------------------------------------------------
14+
diff --git a/VTKExtensions/Core/vtkPVDataUtilities.cxx b/VTKExtensions/Core/vtkPVDataUtilities.cxx
15+
index 21fbca502b..8fb7c148ad 100644
16+
--- a/VTKExtensions/Core/vtkPVDataUtilities.cxx
17+
+++ b/VTKExtensions/Core/vtkPVDataUtilities.cxx
18+
@@ -15,7 +15,7 @@
19+
20+
// clang-format off
21+
#include <vtk_fmt.h> // needed for `fmt`
22+
-#include VTK_FMT(fmt/core.h)
23+
+#include VTK_FMT(fmt/format.h)
24+
// clang-format on
25+
26+
namespace
27+
diff --git a/VTKExtensions/Core/vtkPVStringFormatter.h b/VTKExtensions/Core/vtkPVStringFormatter.h
28+
index 771052ecad..27be619a42 100644
29+
--- a/VTKExtensions/Core/vtkPVStringFormatter.h
30+
+++ b/VTKExtensions/Core/vtkPVStringFormatter.h
31+
@@ -26,7 +26,7 @@
32+
#include <vtk_fmt.h> // needed for `fmt`
33+
#include VTK_FMT(fmt/args.h)
34+
#include VTK_FMT(fmt/chrono.h)
35+
-#include VTK_FMT(fmt/core.h)
36+
+#include VTK_FMT(fmt/format.h)
37+
#include VTK_FMT(fmt/ranges.h)
38+
// clang-format on
39+
40+
@@ -357,7 +357,7 @@ private:
41+
* If argument already exists, it's ignored.
42+
*/
43+
template <typename T>
44+
- void AddArg(const fmt::detail::named_arg<char_type, T>& fmtArg)
45+
+ void AddArg(const fmt::named_arg<T, char_type>& fmtArg)
46+
{
47+
bool argNotFound = std::find_if(this->Arguments.begin(), this->Arguments.end(),
48+
[&fmtArg](const vtkNamedArgument& arg) {
49+
diff --git a/VTKExtensions/IOCore/vtkParallelSerialWriter.cxx b/VTKExtensions/IOCore/vtkParallelSerialWriter.cxx
50+
index 5f1833ba29..23c4a9d7c9 100644
51+
--- a/VTKExtensions/IOCore/vtkParallelSerialWriter.cxx
52+
+++ b/VTKExtensions/IOCore/vtkParallelSerialWriter.cxx
53+
@@ -29,7 +29,7 @@
54+
55+
// clang-format off
56+
#include <vtk_fmt.h> // needed for `fmt`
57+
-#include VTK_FMT(fmt/core.h)
58+
+#include VTK_FMT(fmt/format.h)
59+
// clang-format on
60+
61+
namespace

ports/paraview/portfile.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ vcpkg_from_github(
6262
protobuf-version.patch
6363
plugin.patch
6464
explicit_int_cast_2.patch
65+
fix-fmt-header.patch
6566
)
6667

6768
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")

ports/paraview/vcpkg.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "paraview",
33
"version": "5.12.1",
4-
"port-version": 6,
4+
"port-version": 7,
55
"description": "VTK-based Data Analysis and Visualization Application",
66
"homepage": "https://www.paraview.org/",
77
"license": "BSD-3-Clause",

versions/baseline.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7654,7 +7654,7 @@
76547654
},
76557655
"paraview": {
76567656
"baseline": "5.12.1",
7657-
"port-version": 6
7657+
"port-version": 7
76587658
},
76597659
"parmetis": {
76607660
"baseline": "2023-03-26",

versions/p-/paraview.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "6c21232526c928776533ab6953ca54231429e831",
5+
"version": "5.12.1",
6+
"port-version": 7
7+
},
38
{
49
"git-tree": "e34cc499ec9b38fd86edad6a233c6fe152f0d145",
510
"version": "5.12.1",

0 commit comments

Comments
 (0)