From 669aabceaf3f44ce147a6905fe52471fbbf36523 Mon Sep 17 00:00:00 2001 From: xiaozhuai <798047000@qq.com> Date: Tue, 16 Jun 2026 14:20:56 +0800 Subject: [PATCH 01/15] [fmt] Update to 12.2.0 --- ports/fmt/portfile.cmake | 2 +- ports/fmt/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/fmt.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/fmt/portfile.cmake b/ports/fmt/portfile.cmake index 1136ea74ee02c3..a02123694e841c 100644 --- a/ports/fmt/portfile.cmake +++ b/ports/fmt/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fmtlib/fmt REF "${VERSION}" - SHA512 f0da82c545b01692e9fd30fdfb613dbb8dd9716983dcd0ff19ac2a8d36f74beb5540ef38072fdecc1e34191b3682a8542ecbf3a61ef287dbba0a2679d4e023f2 + SHA512 5ac2ba0f54a484999ed5407d82b77aad170cea49a267decd2c0eedadf3b14413e2a83fcc8e9ca9c16640595e019b8636e160f72314d8be50653324e82ac745eb HEAD_REF master ) diff --git a/ports/fmt/vcpkg.json b/ports/fmt/vcpkg.json index f928cd31a4a3a2..e5b54fcfdbf9a1 100644 --- a/ports/fmt/vcpkg.json +++ b/ports/fmt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fmt", - "version": "12.1.0", + "version": "12.2.0", "description": "{fmt} is an open-source formatting library providing a fast and safe alternative to C stdio and C++ iostreams.", "homepage": "https://github.com/fmtlib/fmt", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index c4ec5de37a473a..85f57a779afb29 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3157,7 +3157,7 @@ "port-version": 3 }, "fmt": { - "baseline": "12.1.0", + "baseline": "12.2.0", "port-version": 0 }, "folly": { diff --git a/versions/f-/fmt.json b/versions/f-/fmt.json index 87f49cac90100e..187f45d8a16602 100644 --- a/versions/f-/fmt.json +++ b/versions/f-/fmt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "823af43db9df2c4be15c4331b36b3cc419afa02c", + "version": "12.2.0", + "port-version": 0 + }, { "git-tree": "936231a2c765082457d348a8781ea9d3610eb331", "version": "12.1.0", From 65516bf2f49dfa6b7f2715058f0d76bf9514999b Mon Sep 17 00:00:00 2001 From: xiaozhuai <798047000@qq.com> Date: Tue, 16 Jun 2026 17:48:26 +0800 Subject: [PATCH 02/15] [libenvpp] Fix compatibility with fmt 12.2.0 --- ports/libenvpp/fix-fmt-header.patch | 114 ++++++++++++++++++++++++++++ ports/libenvpp/portfile.cmake | 1 + ports/libenvpp/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/libenvpp.json | 5 ++ 5 files changed, 122 insertions(+), 1 deletion(-) create mode 100644 ports/libenvpp/fix-fmt-header.patch diff --git a/ports/libenvpp/fix-fmt-header.patch b/ports/libenvpp/fix-fmt-header.patch new file mode 100644 index 00000000000000..b63bf29a37a322 --- /dev/null +++ b/ports/libenvpp/fix-fmt-header.patch @@ -0,0 +1,114 @@ +diff --git a/cmake_integration_test/common/test_app.cpp b/cmake_integration_test/common/test_app.cpp +index 12fdd4b..ff3e626 100644 +--- a/cmake_integration_test/common/test_app.cpp ++++ b/cmake_integration_test/common/test_app.cpp +@@ -1,6 +1,6 @@ + #include + +-#include ++#include + + int main() + { +diff --git a/include/libenvpp/detail/check.hpp b/include/libenvpp/detail/check.hpp +index 5e3fb60..fc3d499 100644 +--- a/include/libenvpp/detail/check.hpp ++++ b/include/libenvpp/detail/check.hpp +@@ -4,7 +4,7 @@ + #include + #include + +-#include ++#include + + #ifndef LIBENVPP_STRINGIFY + #define LIBENVPP_STRINGIFY_HELPER(expression) #expression +diff --git a/include/libenvpp/detail/parser.hpp b/include/libenvpp/detail/parser.hpp +index ad3784c..1383e63 100644 +--- a/include/libenvpp/detail/parser.hpp ++++ b/include/libenvpp/detail/parser.hpp +@@ -10,7 +10,7 @@ + #include + #include + +-#include ++#include + + #include + #include +diff --git a/include/libenvpp/env.hpp b/include/libenvpp/env.hpp +index e5a72dc..a255d58 100644 +--- a/include/libenvpp/env.hpp ++++ b/include/libenvpp/env.hpp +@@ -13,7 +13,7 @@ + #include + #include + +-#include ++#include + #include + + #include +diff --git a/source/libenvpp_errors.cpp b/source/libenvpp_errors.cpp +index ea509db..4aafadd 100644 +--- a/source/libenvpp_errors.cpp ++++ b/source/libenvpp_errors.cpp +@@ -1,6 +1,6 @@ + #include + +-#include ++#include + + #include + +diff --git a/source/libenvpp_testing.cpp b/source/libenvpp_testing.cpp +index f37282e..0b69579 100644 +--- a/source/libenvpp_testing.cpp ++++ b/source/libenvpp_testing.cpp +@@ -1,6 +1,6 @@ + #include + +-#include ++#include + + #include + +diff --git a/test/libenvpp_parser_test.cpp b/test/libenvpp_parser_test.cpp +index 4c61425..1d4c42a 100644 +--- a/test/libenvpp_parser_test.cpp ++++ b/test/libenvpp_parser_test.cpp +@@ -5,7 +5,7 @@ + + #include + #include +-#include ++#include + + #include + +diff --git a/test/libenvpp_test.cpp b/test/libenvpp_test.cpp +index a3e56be..920f9c8 100644 +--- a/test/libenvpp_test.cpp ++++ b/test/libenvpp_test.cpp +@@ -5,7 +5,7 @@ + #include + #include + #include +-#include ++#include + + #include + #include +diff --git a/test/libenvpp_testing_test.cpp b/test/libenvpp_testing_test.cpp +index bfad658..4928dda 100644 +--- a/test/libenvpp_testing_test.cpp ++++ b/test/libenvpp_testing_test.cpp +@@ -5,7 +5,7 @@ + + #include + #include +-#include ++#include + + #include + #include diff --git a/ports/libenvpp/portfile.cmake b/ports/libenvpp/portfile.cmake index 52843e21c4ce1c..a1480a41b72f4d 100644 --- a/ports/libenvpp/portfile.cmake +++ b/ports/libenvpp/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_from_github( HEAD_REF main PATCHES fix-dependencies.patch + fix-fmt-header.patch ) vcpkg_cmake_configure( diff --git a/ports/libenvpp/vcpkg.json b/ports/libenvpp/vcpkg.json index 4109ecf6ddfee6..a66f46ed4c88e8 100644 --- a/ports/libenvpp/vcpkg.json +++ b/ports/libenvpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libenvpp", "version": "1.5.2", + "port-version": 1, "description": "A modern C++ library for type-safe environment variable parsing", "homepage": "https://github.com/ph3at/libenvpp", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 85f57a779afb29..c4582a82def269 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4982,7 +4982,7 @@ }, "libenvpp": { "baseline": "1.5.2", - "port-version": 0 + "port-version": 1 }, "libepoxy": { "baseline": "1.5.10", diff --git a/versions/l-/libenvpp.json b/versions/l-/libenvpp.json index 40ae96d2c25ea9..8a363914ad3e12 100644 --- a/versions/l-/libenvpp.json +++ b/versions/l-/libenvpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ec23e20be92d9a22361ea0776057015102dc7436", + "version": "1.5.2", + "port-version": 1 + }, { "git-tree": "581d4c899ccde22efd257bb2e5f3a8caa0b1c711", "version": "1.5.2", From 6cf7e5c8a85c2c48f704b656eafe81786e40231d Mon Sep 17 00:00:00 2001 From: xiaozhuai <798047000@qq.com> Date: Thu, 18 Jun 2026 11:10:47 +0800 Subject: [PATCH 03/15] [cadons-ctus] Update to 1.0.1 --- ports/cadons-ctus/portfile.cmake | 2 +- ports/cadons-ctus/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/cadons-ctus.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/cadons-ctus/portfile.cmake b/ports/cadons-ctus/portfile.cmake index 40a36312dd9d01..f69e3c49a5cec4 100644 --- a/ports/cadons-ctus/portfile.cmake +++ b/ports/cadons-ctus/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Cadons/ctus REF ${VERSION} - SHA512 79ad70b945d0cb9ac64838dd4e76fa2ed18aa58e63d6b2ecfa20d313f6cfe4b50e42294ebef71e25b7d87d24b5b511decdc4f695987500f8726906925dcc4a97 + SHA512 077c9070db249a2211bf725b81fb4d53f41bb25b4d4935167020313289993c3b981df3de30bcbc9bd4c811bd6af11f947adb0bbfb6507c99e86c65c9a7dbe17d HEAD_REF main ) diff --git a/ports/cadons-ctus/vcpkg.json b/ports/cadons-ctus/vcpkg.json index 98b39a136dbe5e..28da1c322dfdbc 100644 --- a/ports/cadons-ctus/vcpkg.json +++ b/ports/cadons-ctus/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cadons-ctus", - "version": "1.0.0", + "version": "1.0.1", "description": "Library implementing the tus protocol for resumable uploads", "homepage": "https://github.com/Cadons/ctus", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index c4582a82def269..14d877151acb2e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1577,7 +1577,7 @@ "port-version": 0 }, "cadons-ctus": { - "baseline": "1.0.0", + "baseline": "1.0.1", "port-version": 0 }, "caf": { diff --git a/versions/c-/cadons-ctus.json b/versions/c-/cadons-ctus.json index 0862a383be8c06..7e8a93909a6f51 100644 --- a/versions/c-/cadons-ctus.json +++ b/versions/c-/cadons-ctus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d28dc0c4a02005cb0e2fa2ab0e7ca96e17887a6a", + "version": "1.0.1", + "port-version": 0 + }, { "git-tree": "98fe25f88632f2efc7e002181a1cf114497e6742", "version": "1.0.0", From 9b0e68146a180f6d2f40948cce6534adcace0f5d Mon Sep 17 00:00:00 2001 From: xiaozhuai <798047000@qq.com> Date: Tue, 16 Jun 2026 18:05:24 +0800 Subject: [PATCH 04/15] [vowpal-wabbit] Fix compatibility with fmt 12.2.0 --- ports/vowpal-wabbit/fix-fmt-header.patch | 77 ++++++++++++++++++++++++ ports/vowpal-wabbit/portfile.cmake | 1 + ports/vowpal-wabbit/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/v-/vowpal-wabbit.json | 5 ++ 5 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 ports/vowpal-wabbit/fix-fmt-header.patch diff --git a/ports/vowpal-wabbit/fix-fmt-header.patch b/ports/vowpal-wabbit/fix-fmt-header.patch new file mode 100644 index 00000000000000..7befcf6f55b262 --- /dev/null +++ b/ports/vowpal-wabbit/fix-fmt-header.patch @@ -0,0 +1,77 @@ +diff --git a/vowpalwabbit/core/include/vw/core/vw_string_view_fmt.h b/vowpalwabbit/core/include/vw/core/vw_string_view_fmt.h +index 6f3cdff63..422bb04a7 100644 +--- a/vowpalwabbit/core/include/vw/core/vw_string_view_fmt.h ++++ b/vowpalwabbit/core/include/vw/core/vw_string_view_fmt.h +@@ -11,7 +11,6 @@ + #pragma once + #include "vw/common/string_view.h" + +-#include + #include + #include + +diff --git a/vowpalwabbit/core/src/learner.cc b/vowpalwabbit/core/src/learner.cc +index 86e7c46a8..6b97c6a83 100644 +--- a/vowpalwabbit/core/src/learner.cc ++++ b/vowpalwabbit/core/src/learner.cc +@@ -12,7 +12,7 @@ + // 'fmt.v7.format_system_error(fmt.v7.detail.buffer*!System.Runtime.CompilerServices.IsImplicitlyDereferenced,System.Int32,fmt.v7.basic_string_view)': + // badly-formed XML: Invalid at the top level of the document. + #endif +-#include "fmt/core.h" ++#include "fmt/format.h" + #ifdef _WIN32 + # pragma warning(pop) + #endif +diff --git a/vowpalwabbit/core/src/reductions/boosting.cc b/vowpalwabbit/core/src/reductions/boosting.cc +index b514a88d3..2c2aa4ef7 100644 +--- a/vowpalwabbit/core/src/reductions/boosting.cc ++++ b/vowpalwabbit/core/src/reductions/boosting.cc +@@ -19,7 +19,7 @@ + #include "vw/core/vw_math.h" + #include "vw/io/logger.h" + +-#include ++#include + + #include + #include +diff --git a/vowpalwabbit/core/src/reductions/ect.cc b/vowpalwabbit/core/src/reductions/ect.cc +index e4eab18f7..ea2c46992 100644 +--- a/vowpalwabbit/core/src/reductions/ect.cc ++++ b/vowpalwabbit/core/src/reductions/ect.cc +@@ -15,7 +15,7 @@ + #include "vw/core/setup_base.h" + #include "vw/io/logger.h" + +-#include ++#include + + #include + #include +diff --git a/vowpalwabbit/core/src/reductions/topk.cc b/vowpalwabbit/core/src/reductions/topk.cc +index f77458767..45688507a 100644 +--- a/vowpalwabbit/core/src/reductions/topk.cc ++++ b/vowpalwabbit/core/src/reductions/topk.cc +@@ -12,7 +12,7 @@ + #include "vw/io/errno_handling.h" + #include "vw/io/logger.h" + +-#include ++#include + + #include + #include +diff --git a/vowpalwabbit/io/include/vw/io/logger.h b/vowpalwabbit/io/include/vw/io/logger.h +index f3b816361..6f45766bf 100644 +--- a/vowpalwabbit/io/include/vw/io/logger.h ++++ b/vowpalwabbit/io/include/vw/io/logger.h +@@ -6,7 +6,7 @@ + + #include "vw/common/string_view.h" + +-#include ++#include + + #include + #include diff --git a/ports/vowpal-wabbit/portfile.cmake b/ports/vowpal-wabbit/portfile.cmake index 35dfbd2830a5b8..2410abe992036b 100644 --- a/ports/vowpal-wabbit/portfile.cmake +++ b/ports/vowpal-wabbit/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( HEAD_REF master PATCHES fix-android-build.patch + fix-fmt-header.patch ) vcpkg_cmake_configure( diff --git a/ports/vowpal-wabbit/vcpkg.json b/ports/vowpal-wabbit/vcpkg.json index 7c44a9d3fd1755..0a23ee5058f687 100644 --- a/ports/vowpal-wabbit/vcpkg.json +++ b/ports/vowpal-wabbit/vcpkg.json @@ -1,6 +1,7 @@ { "name": "vowpal-wabbit", "version": "9.11.2", + "port-version": 1, "description": "Reduction based online learning framework with a focus on contextual bandits and reinforcement learning.", "homepage": "https://github.com/vowpalwabbit/vowpal_wabbit", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 14d877151acb2e..7a686b6dd970df 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -10754,7 +10754,7 @@ }, "vowpal-wabbit": { "baseline": "9.11.2", - "port-version": 0 + "port-version": 1 }, "vs-yasm": { "baseline": "0.5.0", diff --git a/versions/v-/vowpal-wabbit.json b/versions/v-/vowpal-wabbit.json index 4a4c398f611e9d..0150d5ac82b46e 100644 --- a/versions/v-/vowpal-wabbit.json +++ b/versions/v-/vowpal-wabbit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ca625b7c1bba1772edd1d57566feb76472a059eb", + "version": "9.11.2", + "port-version": 1 + }, { "git-tree": "dc65ab05d8bd53245beb4d0c3b83013d8a98cc8c", "version": "9.11.2", From 54e8d57c10ba1671292cc04da95b76090235f43c Mon Sep 17 00:00:00 2001 From: xiaozhuai <798047000@qq.com> Date: Tue, 16 Jun 2026 18:10:07 +0800 Subject: [PATCH 05/15] [ctbench] Fix compatibility with fmt 12.2.0 --- ports/ctbench/fix-fmt-header.patch | 104 +++++++++++++++++++++++++++++ ports/ctbench/portfile.cmake | 1 + ports/ctbench/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/ctbench.json | 5 ++ 5 files changed, 112 insertions(+), 2 deletions(-) create mode 100644 ports/ctbench/fix-fmt-header.patch diff --git a/ports/ctbench/fix-fmt-header.patch b/ports/ctbench/fix-fmt-header.patch new file mode 100644 index 00000000000000..0e0bab88f39194 --- /dev/null +++ b/ports/ctbench/fix-fmt-header.patch @@ -0,0 +1,104 @@ +diff --git a/compiler-launcher/compiler-launcher.cpp b/compiler-launcher/compiler-launcher.cpp +index f106ff5..faa88ff 100644 +--- a/compiler-launcher/compiler-launcher.cpp ++++ b/compiler-launcher/compiler-launcher.cpp +@@ -25,7 +25,7 @@ + + #include + +-#include ++#include + + /// Concatenates an argument list into a command string + /// in which the arguments are separated by whitespaces. +diff --git a/grapher/include/grapher/utils/error.hpp b/grapher/include/grapher/utils/error.hpp +index 2ba3be0..085d8e2 100644 +--- a/grapher/include/grapher/utils/error.hpp ++++ b/grapher/include/grapher/utils/error.hpp +@@ -7,7 +7,7 @@ + + #include + +-#include ++#include + + namespace grapher { + +diff --git a/grapher/include/grapher/utils/json.hpp b/grapher/include/grapher/utils/json.hpp +index 9a1993f..076c8da 100644 +--- a/grapher/include/grapher/utils/json.hpp ++++ b/grapher/include/grapher/utils/json.hpp +@@ -7,7 +7,7 @@ + + #include + +-#include ++#include + + #include + +diff --git a/grapher/lib/grapher/plotters/compare.cpp b/grapher/lib/grapher/plotters/compare.cpp +index 0de0bd4..eee5626 100644 +--- a/grapher/lib/grapher/plotters/compare.cpp ++++ b/grapher/lib/grapher/plotters/compare.cpp +@@ -5,7 +5,7 @@ + + #include + +-#include ++#include + + #include + +diff --git a/grapher/lib/grapher/plotters/compare_by.cpp b/grapher/lib/grapher/plotters/compare_by.cpp +index ea3cd89..6899095 100644 +--- a/grapher/lib/grapher/plotters/compare_by.cpp ++++ b/grapher/lib/grapher/plotters/compare_by.cpp +@@ -5,7 +5,7 @@ + #include + #include + +-#include ++#include + + #include + +diff --git a/grapher/lib/grapher/plotters/stack.cpp b/grapher/lib/grapher/plotters/stack.cpp +index 7bf5a9c..f4597e9 100644 +--- a/grapher/lib/grapher/plotters/stack.cpp ++++ b/grapher/lib/grapher/plotters/stack.cpp +@@ -4,7 +4,7 @@ + + #include + +-#include ++#include + + #include + #include +diff --git a/grapher/lib/grapher/predicates.cpp b/grapher/lib/grapher/predicates.cpp +index a10e32c..069fe8f 100644 +--- a/grapher/lib/grapher/predicates.cpp ++++ b/grapher/lib/grapher/predicates.cpp +@@ -5,7 +5,7 @@ + + #include + +-#include ++#include + + #include + #include +diff --git a/grapher/lib/grapher/utils/cli.cpp b/grapher/lib/grapher/utils/cli.cpp +index a9b1711..c28e5a0 100644 +--- a/grapher/lib/grapher/utils/cli.cpp ++++ b/grapher/lib/grapher/utils/cli.cpp +@@ -5,7 +5,7 @@ + + #include + +-#include ++#include + + #include + #include diff --git a/ports/ctbench/portfile.cmake b/ports/ctbench/portfile.cmake index 1f29a1fb187a1e..d48ce6f655e88b 100644 --- a/ports/ctbench/portfile.cmake +++ b/ports/ctbench/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( HEAD_REF main PATCHES fix_build_with_boost_1_88_0.diff + fix-fmt-header.patch ) vcpkg_cmake_configure( diff --git a/ports/ctbench/vcpkg.json b/ports/ctbench/vcpkg.json index fa12ba5ec4a9df..84fa6e6d0572f5 100644 --- a/ports/ctbench/vcpkg.json +++ b/ports/ctbench/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ctbench", "version": "1.3.4", - "port-version": 2, + "port-version": 3, "description": "Compiler-assisted variable size benchmarking for the study of C++ metaprogram compile times.", "homepage": "https://github.com/JPenuchot/ctbench", "documentation": "https://jpenuchot.github.io/ctbench-docs/", diff --git a/versions/baseline.json b/versions/baseline.json index 7a686b6dd970df..7f93bc93c18171 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2234,7 +2234,7 @@ }, "ctbench": { "baseline": "1.3.4", - "port-version": 2 + "port-version": 3 }, "ctbignum": { "baseline": "2019-08-02", diff --git a/versions/c-/ctbench.json b/versions/c-/ctbench.json index f0638dbe518b89..6c5d117c580a84 100644 --- a/versions/c-/ctbench.json +++ b/versions/c-/ctbench.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "76e73510880e5de4114fe745e65d3d81cd620613", + "version": "1.3.4", + "port-version": 3 + }, { "git-tree": "9b68d37265af074654888085af613d923a1a4a1c", "version": "1.3.4", From 305a5b0de71487baac6f0edb903e71ac088867dc Mon Sep 17 00:00:00 2001 From: xiaozhuai <798047000@qq.com> Date: Tue, 16 Jun 2026 18:16:51 +0800 Subject: [PATCH 06/15] [folly] Fix compatibility with fmt 12.2.0 --- ports/folly/fix-fmt-header.patch | 480 +++++++++++++++++++++++++++++++ ports/folly/portfile.cmake | 1 + ports/folly/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/folly.json | 5 + 5 files changed, 488 insertions(+), 2 deletions(-) create mode 100644 ports/folly/fix-fmt-header.patch diff --git a/ports/folly/fix-fmt-header.patch b/ports/folly/fix-fmt-header.patch new file mode 100644 index 00000000000000..81596623c951d7 --- /dev/null +++ b/ports/folly/fix-fmt-header.patch @@ -0,0 +1,480 @@ +diff --git a/folly/Format.h b/folly/Format.h +index 23837cff1..e13beda1d 100644 +--- a/folly/Format.h ++++ b/folly/Format.h +@@ -20,7 +20,7 @@ + + /** + * folly::format has been superseded by +- * [fmt](https://fmt.dev/latest/index.html). `#include ` ++ * [fmt](https://fmt.dev/latest/index.html). `#include ` + * + * format() performs text-formatting, similar to Python's str.format. The full + * specification is on github: +diff --git a/folly/IPAddress.cpp b/folly/IPAddress.cpp +index 678412283..c4fa32589 100644 +--- a/folly/IPAddress.cpp ++++ b/folly/IPAddress.cpp +@@ -21,7 +21,7 @@ + #include + #include + +-#include ++#include + + #include + #include +diff --git a/folly/IPAddressV4.cpp b/folly/IPAddressV4.cpp +index 173f39a4e..a214c6064 100644 +--- a/folly/IPAddressV4.cpp ++++ b/folly/IPAddressV4.cpp +@@ -19,7 +19,7 @@ + #include + #include + +-#include ++#include + + #include + #include +diff --git a/folly/IPAddressV6.cpp b/folly/IPAddressV6.cpp +index 22771031a..ec49c54ea 100644 +--- a/folly/IPAddressV6.cpp ++++ b/folly/IPAddressV6.cpp +@@ -20,7 +20,7 @@ + #include + #include + +-#include ++#include + + #include + #include +diff --git a/folly/SocketAddress.cpp b/folly/SocketAddress.cpp +index 74ef1792a..dd5974074 100644 +--- a/folly/SocketAddress.cpp ++++ b/folly/SocketAddress.cpp +@@ -31,7 +31,7 @@ + + #include + +-#include ++#include + + #include + #include +diff --git a/folly/algorithm/simd/test/FindFixedBenchmark.cpp b/folly/algorithm/simd/test/FindFixedBenchmark.cpp +index 3800795fa..2d40ed816 100644 +--- a/folly/algorithm/simd/test/FindFixedBenchmark.cpp ++++ b/folly/algorithm/simd/test/FindFixedBenchmark.cpp +@@ -19,7 +19,7 @@ + #include + #include + +-#include ++#include + + #include + #include +diff --git a/folly/algorithm/simd/test/FindFixedTest.cpp b/folly/algorithm/simd/test/FindFixedTest.cpp +index 7628051ef..d9cb784f5 100644 +--- a/folly/algorithm/simd/test/FindFixedTest.cpp ++++ b/folly/algorithm/simd/test/FindFixedTest.cpp +@@ -20,7 +20,7 @@ + + #include + +-#include ++#include + #include + + #include +diff --git a/folly/cli/Args.cpp b/folly/cli/Args.cpp +index 669d120cd..5f3b01eb7 100644 +--- a/folly/cli/Args.cpp ++++ b/folly/cli/Args.cpp +@@ -24,7 +24,7 @@ + #include + #include + +-#include ++#include + + #include + +diff --git a/folly/concurrency/CacheLocality.cpp b/folly/concurrency/CacheLocality.cpp +index 7f6b8adc1..8f5bc7ed1 100644 +--- a/folly/concurrency/CacheLocality.cpp ++++ b/folly/concurrency/CacheLocality.cpp +@@ -29,7 +29,7 @@ + #include + #include + +-#include ++#include + #include + #include + #include +diff --git a/folly/container/test/F14InterprocessTest.cpp b/folly/container/test/F14InterprocessTest.cpp +index 93a457558..65213d904 100644 +--- a/folly/container/test/F14InterprocessTest.cpp ++++ b/folly/container/test/F14InterprocessTest.cpp +@@ -24,7 +24,7 @@ + #include + #include + +-#include ++#include + + #include + #include +diff --git a/folly/container/test/SparseByteSetBenchmark.cpp b/folly/container/test/SparseByteSetBenchmark.cpp +index b5ab4e6b3..85603abb3 100644 +--- a/folly/container/test/SparseByteSetBenchmark.cpp ++++ b/folly/container/test/SparseByteSetBenchmark.cpp +@@ -24,7 +24,7 @@ + #include + #include + +-#include ++#include + #include + #include + #include +diff --git a/folly/detail/IPAddressSource.h b/folly/detail/IPAddressSource.h +index fc20cf2a2..389b9fa33 100644 +--- a/folly/detail/IPAddressSource.h ++++ b/folly/detail/IPAddressSource.h +@@ -26,7 +26,7 @@ + + #include + +-#include ++#include + #include + + // BSDish platforms don't provide standard access to s6_addr16 +diff --git a/folly/executors/test/IOThreadPoolDeadlockDetectorObserverTest.cpp b/folly/executors/test/IOThreadPoolDeadlockDetectorObserverTest.cpp +index f09081260..2b36463b5 100644 +--- a/folly/executors/test/IOThreadPoolDeadlockDetectorObserverTest.cpp ++++ b/folly/executors/test/IOThreadPoolDeadlockDetectorObserverTest.cpp +@@ -16,7 +16,7 @@ + + #include + +-#include ++#include + + #include + #include +diff --git a/folly/fibers/detail/AtomicBatchDispatcher.cpp b/folly/fibers/detail/AtomicBatchDispatcher.cpp +index cc93904f2..9a6783fc0 100644 +--- a/folly/fibers/detail/AtomicBatchDispatcher.cpp ++++ b/folly/fibers/detail/AtomicBatchDispatcher.cpp +@@ -18,7 +18,7 @@ + + #include + +-#include ++#include + + namespace folly { + namespace fibers { +diff --git a/folly/futures/detail/Core.cpp b/folly/futures/detail/Core.cpp +index 776614c23..bba1f0465 100644 +--- a/folly/futures/detail/Core.cpp ++++ b/folly/futures/detail/Core.cpp +@@ -18,7 +18,7 @@ + + #include + +-#include ++#include + #include + #include + +diff --git a/folly/hash/test/HashBenchmark.cpp b/folly/hash/test/HashBenchmark.cpp +index 15ac43ddb..2128577c3 100644 +--- a/folly/hash/test/HashBenchmark.cpp ++++ b/folly/hash/test/HashBenchmark.cpp +@@ -25,7 +25,7 @@ + #include + #include + +-#include ++#include + #include + + #include +diff --git a/folly/io/async/fdsock/AsyncFdSocket.cpp b/folly/io/async/fdsock/AsyncFdSocket.cpp +index 23841cdd3..3b332241d 100644 +--- a/folly/io/async/fdsock/AsyncFdSocket.cpp ++++ b/folly/io/async/fdsock/AsyncFdSocket.cpp +@@ -15,7 +15,7 @@ + */ + + #include +-#include ++#include + + #include "AsyncFdSocket.h" + +diff --git a/folly/io/test/FsUtilTest.cpp b/folly/io/test/FsUtilTest.cpp +index 204e539fb..b91891b45 100644 +--- a/folly/io/test/FsUtilTest.cpp ++++ b/folly/io/test/FsUtilTest.cpp +@@ -20,7 +20,7 @@ + #include + #include + +-#include ++#include + #include + + #include +diff --git a/folly/io/tool/HugePageUtil.cpp b/folly/io/tool/HugePageUtil.cpp +index 1bea8c66b..ad5cfefbe 100644 +--- a/folly/io/tool/HugePageUtil.cpp ++++ b/folly/io/tool/HugePageUtil.cpp +@@ -18,7 +18,7 @@ + + #include + +-#include ++#include + #include + #include + #include +diff --git a/folly/lang/Exception.h b/folly/lang/Exception.h +index f8e292d7d..8c5d5ef1d 100644 +--- a/folly/lang/Exception.h ++++ b/folly/lang/Exception.h +@@ -17,6 +17,7 @@ + #pragma once + + #include ++#include + #include + #include + #include +diff --git a/folly/lang/test/BitsTest.cpp b/folly/lang/test/BitsTest.cpp +index 176c3e37d..c38415e90 100644 +--- a/folly/lang/test/BitsTest.cpp ++++ b/folly/lang/test/BitsTest.cpp +@@ -20,7 +20,7 @@ + #include + #include + +-#include ++#include + + #include + #include +diff --git a/folly/logging/LogStreamProcessor.h b/folly/logging/LogStreamProcessor.h +index c60a3ff33..f6b0b8032 100644 +--- a/folly/logging/LogStreamProcessor.h ++++ b/folly/logging/LogStreamProcessor.h +@@ -18,7 +18,7 @@ + + #include + +-#include ++#include + #include + #include + #include +diff --git a/folly/observer/WithJitter-inl.h b/folly/observer/WithJitter-inl.h +index 93d720a8c..9e01f955b 100644 +--- a/folly/observer/WithJitter-inl.h ++++ b/folly/observer/WithJitter-inl.h +@@ -22,7 +22,7 @@ + #include + + #include +-#include ++#include + #include + + #include +diff --git a/folly/python/import.h b/folly/python/import.h +index e255d373b..3c0ec63cb 100644 +--- a/folly/python/import.h ++++ b/folly/python/import.h +@@ -18,7 +18,7 @@ + + #include + +-#include ++#include + + #include + #include +diff --git a/folly/result/demo/basketball.cpp b/folly/result/demo/basketball.cpp +index 40a19459c..ef196c814 100644 +--- a/folly/result/demo/basketball.cpp ++++ b/folly/result/demo/basketball.cpp +@@ -14,7 +14,7 @@ + * limitations under the License. + */ + +-#include ++#include + #include // FOLLY_HAS_RESULT + #include + #include +diff --git a/folly/result/rich_error_base.h b/folly/result/rich_error_base.h +index fe2650d13..82132f622 100644 +--- a/folly/result/rich_error_base.h ++++ b/folly/result/rich_error_base.h +@@ -27,7 +27,7 @@ + + #include + #include +-#include ++#include + + // Old `fmt` isn't actually supported, but ... it needs to build :( + #if FMT_VERSION < 80000 +diff --git a/folly/result/rich_error_code.h b/folly/result/rich_error_code.h +index b47556860..79075852d 100644 +--- a/folly/result/rich_error_code.h ++++ b/folly/result/rich_error_code.h +@@ -17,7 +17,7 @@ + #pragma once + + #include +-#include ++#include + + #include + #include +diff --git a/folly/result/test/rich_error_code_test.cpp b/folly/result/test/rich_error_code_test.cpp +index 0f18faf1f..2ce09a292 100644 +--- a/folly/result/test/rich_error_code_test.cpp ++++ b/folly/result/test/rich_error_code_test.cpp +@@ -20,7 +20,7 @@ + #include + #include + +-#include ++#include + #include + #include + #include +diff --git a/folly/result/test/rich_error_codes.h b/folly/result/test/rich_error_codes.h +index 598d28170..8b7d0eace 100644 +--- a/folly/result/test/rich_error_codes.h ++++ b/folly/result/test/rich_error_codes.h +@@ -19,7 +19,7 @@ + #include + #include + +-#include ++#include + #include + #include + #include +diff --git a/folly/settings/CommandLineParser.cpp b/folly/settings/CommandLineParser.cpp +index bce3dcbaf..4868107f9 100644 +--- a/folly/settings/CommandLineParser.cpp ++++ b/folly/settings/CommandLineParser.cpp +@@ -21,7 +21,7 @@ + #include + #include + +-#include ++#include + #include + #include + #include +diff --git a/folly/synchronization/test/SmallLocksBenchmark.cpp b/folly/synchronization/test/SmallLocksBenchmark.cpp +index 7fe37be22..7302046ae 100644 +--- a/folly/synchronization/test/SmallLocksBenchmark.cpp ++++ b/folly/synchronization/test/SmallLocksBenchmark.cpp +@@ -23,7 +23,7 @@ + #include + #include + +-#include ++#include + + #include + #include +diff --git a/folly/system/MemoryMapping.cpp b/folly/system/MemoryMapping.cpp +index 736bab169..9b6af9308 100644 +--- a/folly/system/MemoryMapping.cpp ++++ b/folly/system/MemoryMapping.cpp +@@ -24,7 +24,7 @@ + #include + #include + +-#include ++#include + #include + + #include +diff --git a/folly/test/FileTest.cpp b/folly/test/FileTest.cpp +index d3a2e5488..e537869b8 100644 +--- a/folly/test/FileTest.cpp ++++ b/folly/test/FileTest.cpp +@@ -19,7 +19,7 @@ + #include + #include + +-#include ++#include + #include + + #include +diff --git a/folly/test/IPAddressBenchmark.cpp b/folly/test/IPAddressBenchmark.cpp +index d5023c3c6..cd43e8464 100644 +--- a/folly/test/IPAddressBenchmark.cpp ++++ b/folly/test/IPAddressBenchmark.cpp +@@ -16,7 +16,7 @@ + + #include + +-#include ++#include + #include + + #include +diff --git a/folly/test/IPAddressTest.cpp b/folly/test/IPAddressTest.cpp +index fccb969c5..cb377922a 100644 +--- a/folly/test/IPAddressTest.cpp ++++ b/folly/test/IPAddressTest.cpp +@@ -20,7 +20,7 @@ + + #include + +-#include ++#include + + #include + #include +diff --git a/folly/test/MacAddressTest.cpp b/folly/test/MacAddressTest.cpp +index 9ae28aa7b..ec8a4b774 100644 +--- a/folly/test/MacAddressTest.cpp ++++ b/folly/test/MacAddressTest.cpp +@@ -16,7 +16,7 @@ + + #include + +-#include ++#include + + #include + #include +diff --git a/folly/test/MemsetBenchmark.cpp b/folly/test/MemsetBenchmark.cpp +index fd549278f..b261635c8 100644 +--- a/folly/test/MemsetBenchmark.cpp ++++ b/folly/test/MemsetBenchmark.cpp +@@ -20,7 +20,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index 14ef6a35894824..3418afc2f7c7b6 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_from_github( disable-uninitialized-resize-on-new-stl.patch fix-unistd-include.patch fix-perf_scoped-target.patch + fix-fmt-header.patch ) file(REMOVE "${SOURCE_PATH}/CMake/FindFastFloat.cmake") file(REMOVE "${SOURCE_PATH}/CMake/FindFmt.cmake") diff --git a/ports/folly/vcpkg.json b/ports/folly/vcpkg.json index 98f298746f7d6e..717ac0af3e1686 100644 --- a/ports/folly/vcpkg.json +++ b/ports/folly/vcpkg.json @@ -1,7 +1,7 @@ { "name": "folly", "version-string": "2026.02.23.00", - "port-version": 1, + "port-version": 2, "description": "An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows", "homepage": "https://github.com/facebook/folly", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 7f93bc93c18171..6a63fe83bbddb6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3162,7 +3162,7 @@ }, "folly": { "baseline": "2026.02.23.00", - "port-version": 1 + "port-version": 2 }, "font-chef": { "baseline": "1.1.0", diff --git a/versions/f-/folly.json b/versions/f-/folly.json index 01316292ffef0f..01eed9a70055a4 100644 --- a/versions/f-/folly.json +++ b/versions/f-/folly.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2d4ed2106b0c0a7ba6b7d4d04c5be835197443b5", + "version-string": "2026.02.23.00", + "port-version": 2 + }, { "git-tree": "9b30ba73dcd60645143155b4b8a57cd0d3c88e66", "version-string": "2026.02.23.00", From 803da2ec18752b241a613cd6a055af4de3c18192 Mon Sep 17 00:00:00 2001 From: xiaozhuai <798047000@qq.com> Date: Tue, 16 Jun 2026 19:54:39 +0800 Subject: [PATCH 07/15] [vtk] Fix compatibility with fmt 12.2.0 --- ports/vtk/fix-fmt-header.patch | 52 ++++++++++++++++++++++++++++++++++ ports/vtk/portfile.cmake | 1 + ports/vtk/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/v-/vtk.json | 5 ++++ 5 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 ports/vtk/fix-fmt-header.patch diff --git a/ports/vtk/fix-fmt-header.patch b/ports/vtk/fix-fmt-header.patch new file mode 100644 index 00000000000000..494314eca01efc --- /dev/null +++ b/ports/vtk/fix-fmt-header.patch @@ -0,0 +1,52 @@ +diff --git a/Common/Core/Testing/Cxx/TestFMT.cxx b/Common/Core/Testing/Cxx/TestFMT.cxx +index f57188e938..e44e369093 100644 +--- a/Common/Core/Testing/Cxx/TestFMT.cxx ++++ b/Common/Core/Testing/Cxx/TestFMT.cxx +@@ -8,7 +8,7 @@ + #include + + // clang-format off +-#include VTK_FMT(fmt/core.h) ++#include VTK_FMT(fmt/format.h) + #include VTK_FMT(fmt/ranges.h) + // clang-format on + +diff --git a/Filters/General/vtkGroupDataSetsFilter.cxx b/Filters/General/vtkGroupDataSetsFilter.cxx +index 261bcf0976..03aff2cf5a 100644 +--- a/Filters/General/vtkGroupDataSetsFilter.cxx ++++ b/Filters/General/vtkGroupDataSetsFilter.cxx +@@ -22,7 +22,7 @@ + #include + + // clang-format off +-#include VTK_FMT(fmt/core.h) ++#include VTK_FMT(fmt/format.h) + // clang-format on + + VTK_ABI_NAMESPACE_BEGIN +diff --git a/IO/IOSS/vtkIOSSWriter.cxx b/IO/IOSS/vtkIOSSWriter.cxx +index 914dea5fd3..83760011ab 100644 +--- a/IO/IOSS/vtkIOSSWriter.cxx ++++ b/IO/IOSS/vtkIOSSWriter.cxx +@@ -44,7 +44,7 @@ + + // clang-format off + #include // needed for `fmt` +-#include VTK_FMT(fmt/core.h) ++#include VTK_FMT(fmt/format.h) + // clang-format on + + VTK_ABI_NAMESPACE_BEGIN +diff --git a/Rendering/WebGPU/vtkWGPUContext.cxx b/Rendering/WebGPU/vtkWGPUContext.cxx +index b280022873..5244738f4d 100644 +--- a/Rendering/WebGPU/vtkWGPUContext.cxx ++++ b/Rendering/WebGPU/vtkWGPUContext.cxx +@@ -4,7 +4,7 @@ + #include "vtkObject.h" + #include "vtk_fmt.h" + // clang-format off +-#include VTK_FMT(fmt/core.h) ++#include VTK_FMT(fmt/format.h) + // clang-format on + + #include diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 416713e447f22f..300614dcc130cd 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -50,6 +50,7 @@ vcpkg_from_github( mpi-language.diff fix-eigen3.patch avoid-stdext.diff + fix-fmt-header.patch ) # ============================================================================= diff --git a/ports/vtk/vcpkg.json b/ports/vtk/vcpkg.json index 0781966e42f91b..84d53116e5b811 100644 --- a/ports/vtk/vcpkg.json +++ b/ports/vtk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "vtk", "version-semver": "9.3.0-pv5.12.1", - "port-version": 16, + "port-version": 17, "description": "Software system for 3D computer graphics, image processing, and visualization", "homepage": "https://github.com/Kitware/VTK", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 6a63fe83bbddb6..bba3b37869365e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -10782,7 +10782,7 @@ }, "vtk": { "baseline": "9.3.0-pv5.12.1", - "port-version": 16 + "port-version": 17 }, "vtk-compile-tools": { "baseline": "9.3.0-pv5.12.1", diff --git a/versions/v-/vtk.json b/versions/v-/vtk.json index 2fc7f08b0fb69b..581c145ed8d5f7 100644 --- a/versions/v-/vtk.json +++ b/versions/v-/vtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f160b26f794ea0b6d9bce6a24eb4e1a151eda298", + "version-semver": "9.3.0-pv5.12.1", + "port-version": 17 + }, { "git-tree": "4d16c590cfad9e7d5e92f2933d8aae199fcc8377", "version-semver": "9.3.0-pv5.12.1", From c690d176e2542632ec9e0df06c0dc61acde74b8c Mon Sep 17 00:00:00 2001 From: xiaozhuai <798047000@qq.com> Date: Tue, 16 Jun 2026 20:00:46 +0800 Subject: [PATCH 08/15] [irsdkcpp] Fix compatibility with fmt 12.2.0 --- ports/irsdkcpp/fix-format-header.patch | 65 ++++++++++++++++++++++++++ ports/irsdkcpp/portfile.cmake | 2 + ports/irsdkcpp/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/i-/irsdkcpp.json | 5 ++ 5 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 ports/irsdkcpp/fix-format-header.patch diff --git a/ports/irsdkcpp/fix-format-header.patch b/ports/irsdkcpp/fix-format-header.patch new file mode 100644 index 00000000000000..4fa2ee7295c796 --- /dev/null +++ b/ports/irsdkcpp/fix-format-header.patch @@ -0,0 +1,65 @@ +diff --git a/packages/sdk/include/IRacingSDK/DiskClientDataFrameProcessor.h b/packages/sdk/include/IRacingSDK/DiskClientDataFrameProcessor.h +index fc6d1df..6b785bd 100644 +--- a/packages/sdk/include/IRacingSDK/DiskClientDataFrameProcessor.h ++++ b/packages/sdk/include/IRacingSDK/DiskClientDataFrameProcessor.h +@@ -1,7 +1,7 @@ + #pragma once + + #include +-#include ++#include + #include + #include + #include +diff --git a/packages/sdk/include/IRacingSDK/ErrorTypes.h b/packages/sdk/include/IRacingSDK/ErrorTypes.h +index 7310f1c..2917570 100644 +--- a/packages/sdk/include/IRacingSDK/ErrorTypes.h ++++ b/packages/sdk/include/IRacingSDK/ErrorTypes.h +@@ -3,7 +3,7 @@ + // + + #pragma once +-#include ++#include + #include + #include + +diff --git a/packages/sdk/include/IRacingSDK/Utils/LUT.h b/packages/sdk/include/IRacingSDK/Utils/LUT.h +index 6dbdb8a..9d14813 100644 +--- a/packages/sdk/include/IRacingSDK/Utils/LUT.h ++++ b/packages/sdk/include/IRacingSDK/Utils/LUT.h +@@ -4,7 +4,7 @@ + #include + #include + #include +-#include ++#include + + namespace IRacingSDK::Utils { + template +diff --git a/packages/sdk/tests/DiskClientTests.cpp b/packages/sdk/tests/DiskClientTests.cpp +index 0724cc0..a9e7058 100644 +--- a/packages/sdk/tests/DiskClientTests.cpp ++++ b/packages/sdk/tests/DiskClientTests.cpp +@@ -11,7 +11,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +diff --git a/packages/sdk/tests/SDKUtilTests.cpp b/packages/sdk/tests/SDKUtilTests.cpp +index 3835bfa..3e9468c 100644 +--- a/packages/sdk/tests/SDKUtilTests.cpp ++++ b/packages/sdk/tests/SDKUtilTests.cpp +@@ -2,7 +2,7 @@ + #include + #include + #include +-#include ++#include + + using namespace IRacingSDK::Utils; + diff --git a/ports/irsdkcpp/portfile.cmake b/ports/irsdkcpp/portfile.cmake index 51c4e67e5bd9a8..db33ebaf90680b 100644 --- a/ports/irsdkcpp/portfile.cmake +++ b/ports/irsdkcpp/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF "v${VERSION}" SHA512 c702479259d77b3eeec85f5fbe177b040c598f2c0b3812139f4c95a1d3c292eff96cc84baa2c620bbfb2c507c61b4425f2cbeb4cb143235b8b25098ab816796a HEAD_REF develop + PATCHES + fix-format-header.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" IRSDKCPP_BUILD_SHARED) diff --git a/ports/irsdkcpp/vcpkg.json b/ports/irsdkcpp/vcpkg.json index 5662141a06ee06..e7270f6b61162a 100644 --- a/ports/irsdkcpp/vcpkg.json +++ b/ports/irsdkcpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "irsdkcpp", "version": "1.0.9", + "port-version": 1, "description": "iRacing Modern C++ SDK", "license": "MIT", "supports": "windows & !uwp & x64", diff --git a/versions/baseline.json b/versions/baseline.json index bba3b37869365e..29fc802b6a485d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4086,7 +4086,7 @@ }, "irsdkcpp": { "baseline": "1.0.9", - "port-version": 0 + "port-version": 1 }, "isal": { "baseline": "2.30.0", diff --git a/versions/i-/irsdkcpp.json b/versions/i-/irsdkcpp.json index 377dc9b3055adc..af84b70da15aab 100644 --- a/versions/i-/irsdkcpp.json +++ b/versions/i-/irsdkcpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ceb295062b1aa909b9426153d5578183418960bf", + "version": "1.0.9", + "port-version": 1 + }, { "git-tree": "62f0ba705f813060c5927a8bf8f2fcd59148dc66", "version": "1.0.9", From 190448bc17befe0dc0f7f00c1ac735e0621764f1 Mon Sep 17 00:00:00 2001 From: xiaozhuai <798047000@qq.com> Date: Tue, 16 Jun 2026 20:07:22 +0800 Subject: [PATCH 09/15] [saucer] Fix compatibility with fmt 12.2.0 --- ports/saucer/0003-fix-fmt-header.patch | 195 +++++++++++++++++++++++++ ports/saucer/portfile.cmake | 1 + ports/saucer/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/saucer.json | 5 + 5 files changed, 203 insertions(+), 2 deletions(-) create mode 100644 ports/saucer/0003-fix-fmt-header.patch diff --git a/ports/saucer/0003-fix-fmt-header.patch b/ports/saucer/0003-fix-fmt-header.patch new file mode 100644 index 00000000000000..792dac1a157def --- /dev/null +++ b/ports/saucer/0003-fix-fmt-header.patch @@ -0,0 +1,195 @@ +diff --git a/include/saucer/serializers/generic/generic.inl b/include/saucer/serializers/generic/generic.inl +index 3e22654..b8f7bab 100644 +--- a/include/saucer/serializers/generic/generic.inl ++++ b/include/saucer/serializers/generic/generic.inl +@@ -5,7 +5,7 @@ + #include "../../utils/tuple.hpp" + #include "../../utils/traits.hpp" + +-#include ++#include + #include + + namespace saucer::serializers::generic +diff --git a/src/gtk.window.cpp b/src/gtk.window.cpp +index 0466501..74760b8 100644 +--- a/src/gtk.window.cpp ++++ b/src/gtk.window.cpp +@@ -3,7 +3,7 @@ + #include "instantiate.hpp" + #include "gtk.app.impl.hpp" + +-#include ++#include + #include + #include + +diff --git a/src/qt.webview.cpp b/src/qt.webview.cpp +index 9ecb5e8..e3b98f7 100644 +--- a/src/qt.webview.cpp ++++ b/src/qt.webview.cpp +@@ -4,7 +4,7 @@ + #include "qt.icon.impl.hpp" + #include "qt.window.impl.hpp" + +-#include ++#include + #include + + #include +diff --git a/src/qt.webview.impl.cpp b/src/qt.webview.impl.cpp +index 0ab8da7..e47f11b 100644 +--- a/src/qt.webview.impl.cpp ++++ b/src/qt.webview.impl.cpp +@@ -8,7 +8,7 @@ + #include + #include + +-#include ++#include + + #include + #include +diff --git a/src/qt.window.cpp b/src/qt.window.cpp +index 4c2747b..dcd16e2 100644 +--- a/src/qt.window.cpp ++++ b/src/qt.window.cpp +@@ -7,7 +7,7 @@ + + #include + +-#include ++#include + #include + + #include +diff --git a/src/qt5.webview.cpp b/src/qt5.webview.cpp +index 1dda4f8..e777c0a 100644 +--- a/src/qt5.webview.cpp ++++ b/src/qt5.webview.cpp +@@ -5,7 +5,7 @@ + #include + #include + +-#include ++#include + + namespace saucer + { +diff --git a/src/qt6.webview.cpp b/src/qt6.webview.cpp +index 49fb09e..b19ad36 100644 +--- a/src/qt6.webview.cpp ++++ b/src/qt6.webview.cpp +@@ -5,7 +5,7 @@ + #include + #include + +-#include ++#include + + namespace saucer + { +diff --git a/src/smartview.cpp b/src/smartview.cpp +index e02d4a3..b4f823c 100644 +--- a/src/smartview.cpp ++++ b/src/smartview.cpp +@@ -3,7 +3,7 @@ + #include "scripts.hpp" + + #include +-#include ++#include + + namespace saucer + { +diff --git a/src/webview.cpp b/src/webview.cpp +index 3c8e716..b3d86f5 100644 +--- a/src/webview.cpp ++++ b/src/webview.cpp +@@ -4,7 +4,7 @@ + + #include + +-#include ++#include + + namespace saucer + { +diff --git a/src/wk.webview.impl.mm b/src/wk.webview.impl.mm +index 4646288..c621d7a 100644 +--- a/src/wk.webview.impl.mm ++++ b/src/wk.webview.impl.mm +@@ -5,7 +5,7 @@ + #include "cocoa.window.impl.hpp" + #include "wk.navigation.impl.hpp" + +-#include ++#include + #include + + #import +diff --git a/src/wk.webview.mm b/src/wk.webview.mm +index 038b35d..ce7b244 100644 +--- a/src/wk.webview.mm ++++ b/src/wk.webview.mm +@@ -5,7 +5,7 @@ + + #include + +-#include ++#include + + #import + #import +diff --git a/src/wkg.webview.cpp b/src/wkg.webview.cpp +index 87a6448..ee81889 100644 +--- a/src/wkg.webview.cpp ++++ b/src/wkg.webview.cpp +@@ -7,7 +7,7 @@ + #include "handle.hpp" + #include "instantiate.hpp" + +-#include ++#include + + namespace saucer + { +diff --git a/src/wkg.webview.impl.cpp b/src/wkg.webview.impl.cpp +index c8c983d..adc6a3d 100644 +--- a/src/wkg.webview.impl.cpp ++++ b/src/wkg.webview.impl.cpp +@@ -9,7 +9,7 @@ + #include + #include + +-#include ++#include + + namespace saucer + { +diff --git a/src/wv2.webview.cpp b/src/wv2.webview.cpp +index bab9cf1..b8528d7 100644 +--- a/src/wv2.webview.cpp ++++ b/src/wv2.webview.cpp +@@ -12,7 +12,7 @@ + #include + #include + +-#include ++#include + #include + + #include +diff --git a/src/wv2.webview.impl.cpp b/src/wv2.webview.impl.cpp +index c2c2e39..347fd26 100644 +--- a/src/wv2.webview.impl.cpp ++++ b/src/wv2.webview.impl.cpp +@@ -10,7 +10,7 @@ + + #include + +-#include ++#include + #include + + #include diff --git a/ports/saucer/portfile.cmake b/ports/saucer/portfile.cmake index 939b571f30c839..a21509575c5d69 100644 --- a/ports/saucer/portfile.cmake +++ b/ports/saucer/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( PATCHES 0001-use-local-packages.patch 0002-fix-glaze-opts.patch + 0003-fix-fmt-header.patch ) vcpkg_cmake_configure( diff --git a/ports/saucer/vcpkg.json b/ports/saucer/vcpkg.json index bc2fd7e0a8fc37..ff7ce0fb52d3ff 100644 --- a/ports/saucer/vcpkg.json +++ b/ports/saucer/vcpkg.json @@ -1,7 +1,7 @@ { "name": "saucer", "version": "6.0.1", - "port-version": 7, + "port-version": 8, "description": "Next-gen desktop apps with web-frontend in C++", "homepage": "https://saucer.github.io/", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 29fc802b6a485d..24598adb0ca487 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9058,7 +9058,7 @@ }, "saucer": { "baseline": "6.0.1", - "port-version": 7 + "port-version": 8 }, "sbgecom": { "baseline": "5.6.2730", diff --git a/versions/s-/saucer.json b/versions/s-/saucer.json index fcfc0210b9cbba..2c8d245ce96b50 100644 --- a/versions/s-/saucer.json +++ b/versions/s-/saucer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "169fc7b08e1be9e415cdeb36daca620e36783ad1", + "version": "6.0.1", + "port-version": 8 + }, { "git-tree": "b631433269704bfb92c0f4bdb957a5a43754cc30", "version": "6.0.1", From 044f15f7b8caf85849a6ba21d98b6674180bc53f Mon Sep 17 00:00:00 2001 From: xiaozhuai <798047000@qq.com> Date: Tue, 16 Jun 2026 20:38:12 +0800 Subject: [PATCH 10/15] [openal-soft] Fix compatibility with fmt 12.2.0 --- ports/openal-soft/fix-fmt-header.patch | 54 ++++++++++++++++++++++++++ ports/openal-soft/portfile.cmake | 1 + ports/openal-soft/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/openal-soft.json | 5 +++ 5 files changed, 62 insertions(+), 2 deletions(-) create mode 100644 ports/openal-soft/fix-fmt-header.patch diff --git a/ports/openal-soft/fix-fmt-header.patch b/ports/openal-soft/fix-fmt-header.patch new file mode 100644 index 00000000000000..6332e5948eb10d --- /dev/null +++ b/ports/openal-soft/fix-fmt-header.patch @@ -0,0 +1,54 @@ +diff --git a/alc/alc.cpp b/alc/alc.cpp +index 729f91ec4..d10d186be 100644 +--- a/alc/alc.cpp ++++ b/alc/alc.cpp +@@ -104,7 +104,7 @@ + #include "effects/base.h" + #include "export_list.h" + #include "flexarray.h" +-#include "fmt/core.h" ++#include "fmt/format.h" + #include "fmt/ranges.h" + #include "gsl/gsl" + #include "inprogext.h" +diff --git a/alc/backends/pipewire.cpp b/alc/backends/pipewire.cpp +index 7f925db5d..855a6d89e 100644 +--- a/alc/backends/pipewire.cpp ++++ b/alc/backends/pipewire.cpp +@@ -54,7 +54,7 @@ + #include "core/helpers.h" + #include "core/logging.h" + #include "dynload.h" +-#include "fmt/core.h" ++#include "fmt/format.h" + #include "fmt/ranges.h" + #include "gsl/gsl" + #include "opthelpers.h" +diff --git a/common/pffft.cpp b/common/pffft.cpp +index 8dc965064..82a471cdb 100644 +--- a/common/pffft.cpp ++++ b/common/pffft.cpp +@@ -74,7 +74,7 @@ + + #include "almalloc.h" + #include "alnumeric.h" +-#include "fmt/core.h" ++#include "fmt/format.h" + #include "fmt/ranges.h" + #include "gsl/gsl" + #include "opthelpers.h" +diff --git a/core/hrtf_loader.cpp b/core/hrtf_loader.cpp +index 3582964ac..3ffa48a32 100644 +--- a/core/hrtf_loader.cpp ++++ b/core/hrtf_loader.cpp +@@ -13,8 +13,9 @@ + + #include "alformat.hpp" + #include "alnumeric.h" +-#include "fmt/core.h" ++#include "fmt/format.h" + #include "fmt/ranges.h" ++#include "fmt/std.h" + #include "gsl/gsl" + #include "hrtf.h" + #include "logging.h" diff --git a/ports/openal-soft/portfile.cmake b/ports/openal-soft/portfile.cmake index 5c0c3b3a73354d..8725a3c91d9118 100644 --- a/ports/openal-soft/portfile.cmake +++ b/ports/openal-soft/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( PATCHES pkgconfig-cxx.diff devendor-fmt.diff + fix-fmt-header.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/openal-soft/vcpkg.json b/ports/openal-soft/vcpkg.json index a92e399496cbc6..601f5a0e478abb 100644 --- a/ports/openal-soft/vcpkg.json +++ b/ports/openal-soft/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openal-soft", "version": "1.25.1", - "port-version": 1, + "port-version": 2, "description": "OpenAL Soft is an LGPL-licensed, cross-platform, software implementation of the OpenAL 3D audio API.", "homepage": "https://github.com/kcat/openal-soft", "license": "LGPL-2.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 24598adb0ca487..a805c47a58cbd7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7354,7 +7354,7 @@ }, "openal-soft": { "baseline": "1.25.1", - "port-version": 1 + "port-version": 2 }, "openblas": { "baseline": "0.3.33", diff --git a/versions/o-/openal-soft.json b/versions/o-/openal-soft.json index 92d384a4ff9f77..8f2bf884b7a9f9 100644 --- a/versions/o-/openal-soft.json +++ b/versions/o-/openal-soft.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "35d7e2a2f7dfc87f25ee7d95b8063d31090653f2", + "version": "1.25.1", + "port-version": 2 + }, { "git-tree": "ba7a19e35c8e759b284e01ec32c03c499f154181", "version": "1.25.1", From 665a07d1b7071a411c004be6d71ea1c6115a896a Mon Sep 17 00:00:00 2001 From: xiaozhuai <798047000@qq.com> Date: Wed, 17 Jun 2026 11:27:42 +0800 Subject: [PATCH 11/15] [sdflib] Fix missing header --- ports/sdflib/fix-missing-header.patch | 32 +++++++++++++++++++++++++++ ports/sdflib/portfile.cmake | 1 + ports/sdflib/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/s-/sdflib.json | 5 +++++ 5 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 ports/sdflib/fix-missing-header.patch diff --git a/ports/sdflib/fix-missing-header.patch b/ports/sdflib/fix-missing-header.patch new file mode 100644 index 00000000000000..2027d9da264848 --- /dev/null +++ b/ports/sdflib/fix-missing-header.patch @@ -0,0 +1,32 @@ +diff --git a/include/SdfLib/ExactOctreeSdfDepthFirst.h b/include/SdfLib/ExactOctreeSdfDepthFirst.h +index a1c79a1..ca6d858 100644 +--- a/include/SdfLib/ExactOctreeSdfDepthFirst.h ++++ b/include/SdfLib/ExactOctreeSdfDepthFirst.h +@@ -1,6 +1,7 @@ + #ifndef EXACT_OCTREE_SDF_DEPTH_FIRST_H + #define EXACT_OCTREE_SDF_DEPTH_FIRST_H + ++#include + #include + #include + #ifdef OPENMP_AVAILABLE +diff --git a/src/tools/SdfLibUnity/SdfExportFunc.cpp b/src/tools/SdfLibUnity/SdfExportFunc.cpp +index ff4e017..85d7842 100644 +--- a/src/tools/SdfLibUnity/SdfExportFunc.cpp ++++ b/src/tools/SdfLibUnity/SdfExportFunc.cpp +@@ -1,3 +1,4 @@ ++#include + #include "SdfExportFunc.h" + #include "spdlog/sinks/rotating_file_sink.h" + +diff --git a/src/utils/Mesh.cpp b/src/utils/Mesh.cpp +index 8bc7c6a..9ce200b 100644 +--- a/src/utils/Mesh.cpp ++++ b/src/utils/Mesh.cpp +@@ -1,5 +1,6 @@ + #include "SdfLib/utils/Mesh.h" + #include ++#include + #include + #include + diff --git a/ports/sdflib/portfile.cmake b/ports/sdflib/portfile.cmake index 42a39515f34740..d0e2f2c058fff8 100644 --- a/ports/sdflib/portfile.cmake +++ b/ports/sdflib/portfile.cmake @@ -4,6 +4,7 @@ vcpkg_from_github( REF 8db373ef71d65be24badf6ae10750a932bbc223b SHA512 1231128e66b19923f78e2e3d9b827376c79abb22fe86bb200874a2ce3c283b4d6b8a077a1ab6749cd64b6d81f71a7d2f96d1f6dcc252a3a4aefaeb2145bbacf4 PATCHES + fix-missing-header.patch ) vcpkg_cmake_configure( diff --git a/ports/sdflib/vcpkg.json b/ports/sdflib/vcpkg.json index 4a4e7c6c25581a..56d1c7cb186876 100644 --- a/ports/sdflib/vcpkg.json +++ b/ports/sdflib/vcpkg.json @@ -1,6 +1,7 @@ { "name": "sdflib", "version-date": "2025-11-03", + "port-version": 1, "description": "Library for accelerating the queries of signed distance fields from triangle meshes.", "homepage": "https://github.com/UPC-ViRVIG/SdfLib", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index a805c47a58cbd7..88a35730bef347 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9106,7 +9106,7 @@ }, "sdflib": { "baseline": "2025-11-03", - "port-version": 0 + "port-version": 1 }, "sdformat": { "baseline": "15.4.0", diff --git a/versions/s-/sdflib.json b/versions/s-/sdflib.json index adcaa53b4e7c92..a8e44f78b9c0f6 100644 --- a/versions/s-/sdflib.json +++ b/versions/s-/sdflib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e7c67b249eb70b14303e8f145a723f4a2b6d7922", + "version-date": "2025-11-03", + "port-version": 1 + }, { "git-tree": "5b2dd16f6487ebd6fcbbbb3dea0a4a4d409cb14b", "version-date": "2025-11-03", From 4f2bd99fdc7f655d4c383508f2f36ad76893205c Mon Sep 17 00:00:00 2001 From: xiaozhuai <798047000@qq.com> Date: Wed, 17 Jun 2026 11:30:59 +0800 Subject: [PATCH 12/15] [vanillapdf] Fix missing header --- ports/vanillapdf/fix-missing-header.patch | 12 ++++++++++++ ports/vanillapdf/portfile.cmake | 1 + ports/vanillapdf/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/v-/vanillapdf.json | 5 +++++ 5 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 ports/vanillapdf/fix-missing-header.patch diff --git a/ports/vanillapdf/fix-missing-header.patch b/ports/vanillapdf/fix-missing-header.patch new file mode 100644 index 00000000000000..c37f4466ca674e --- /dev/null +++ b/ports/vanillapdf/fix-missing-header.patch @@ -0,0 +1,12 @@ +diff --git a/src/vanillapdf/utils/buffer.h b/src/vanillapdf/utils/buffer.h +index f2bcba10..32a238b6 100644 +--- a/src/vanillapdf/utils/buffer.h ++++ b/src/vanillapdf/utils/buffer.h +@@ -12,6 +12,7 @@ + #include + #include + #include ++#include + + namespace vanillapdf { + diff --git a/ports/vanillapdf/portfile.cmake b/ports/vanillapdf/portfile.cmake index af0790b0b1294c..03cee68bcd3088 100644 --- a/ports/vanillapdf/portfile.cmake +++ b/ports/vanillapdf/portfile.cmake @@ -5,6 +5,7 @@ vcpkg_from_github( SHA512 7e8e555901ea8c60d0bbd69933b284b88930c8bff771363d83228302832f43e3ae560f9666b1410ce388e60285c4a41b297a2d99fa465cbe23b406afd0647612 PATCHES disable-autosubscribe.diff + fix-missing-header.patch ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" VANILLAPDF_USE_STATIC_CRT) diff --git a/ports/vanillapdf/vcpkg.json b/ports/vanillapdf/vcpkg.json index db55680c6fe733..f20bfabee46f43 100644 --- a/ports/vanillapdf/vcpkg.json +++ b/ports/vanillapdf/vcpkg.json @@ -1,6 +1,7 @@ { "name": "vanillapdf", "version": "2.2.1", + "port-version": 1, "description": "Vanilla.PDF is a cross-platform SDK for creating and modifying PDF documents.", "homepage": "https://github.com/vanillapdf/vanillapdf", "documentation": "https://vanillapdf.github.io/vanillapdf", diff --git a/versions/baseline.json b/versions/baseline.json index 88a35730bef347..a19d8153ed6460 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -10566,7 +10566,7 @@ }, "vanillapdf": { "baseline": "2.2.1", - "port-version": 0 + "port-version": 1 }, "variant-lite": { "baseline": "3.0.0", diff --git a/versions/v-/vanillapdf.json b/versions/v-/vanillapdf.json index 2a94020c5f70a5..fd0a51f6049f31 100644 --- a/versions/v-/vanillapdf.json +++ b/versions/v-/vanillapdf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "48975bd730fb424b7cb9d0bb332a9d88d50d0633", + "version": "2.2.1", + "port-version": 1 + }, { "git-tree": "05d27d757604863bb0d22f6e7da868153d11e259", "version": "2.2.1", From 602a49f5a60c98c2567d79387dfa4b5ae291e754 Mon Sep 17 00:00:00 2001 From: xiaozhuai <798047000@qq.com> Date: Wed, 17 Jun 2026 11:40:50 +0800 Subject: [PATCH 13/15] [paraview] Fix compatibility with fmt 12.2.0 --- ports/paraview/fix-fmt-header.patch | 61 +++++++++++++++++++++++++++++ ports/paraview/portfile.cmake | 1 + ports/paraview/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/paraview.json | 5 +++ 5 files changed, 69 insertions(+), 2 deletions(-) create mode 100644 ports/paraview/fix-fmt-header.patch diff --git a/ports/paraview/fix-fmt-header.patch b/ports/paraview/fix-fmt-header.patch new file mode 100644 index 00000000000000..42ad18fc7517e2 --- /dev/null +++ b/ports/paraview/fix-fmt-header.patch @@ -0,0 +1,61 @@ +diff --git a/Plugins/Prism/Filters/vtkPrismGeometryConverter.cxx b/Plugins/Prism/Filters/vtkPrismGeometryConverter.cxx +index 0ba008c239..686adeae19 100644 +--- a/Plugins/Prism/Filters/vtkPrismGeometryConverter.cxx ++++ b/Plugins/Prism/Filters/vtkPrismGeometryConverter.cxx +@@ -9,7 +9,7 @@ + + // clang-format off + #include // needed for `fmt` +-#include VTK_FMT(fmt/core.h) ++#include VTK_FMT(fmt/format.h) + // clang-format on + + //------------------------------------------------------------------------------ +diff --git a/VTKExtensions/Core/vtkPVDataUtilities.cxx b/VTKExtensions/Core/vtkPVDataUtilities.cxx +index 21fbca502b..8fb7c148ad 100644 +--- a/VTKExtensions/Core/vtkPVDataUtilities.cxx ++++ b/VTKExtensions/Core/vtkPVDataUtilities.cxx +@@ -15,7 +15,7 @@ + + // clang-format off + #include // needed for `fmt` +-#include VTK_FMT(fmt/core.h) ++#include VTK_FMT(fmt/format.h) + // clang-format on + + namespace +diff --git a/VTKExtensions/Core/vtkPVStringFormatter.h b/VTKExtensions/Core/vtkPVStringFormatter.h +index 771052ecad..27be619a42 100644 +--- a/VTKExtensions/Core/vtkPVStringFormatter.h ++++ b/VTKExtensions/Core/vtkPVStringFormatter.h +@@ -26,7 +26,7 @@ + #include // needed for `fmt` + #include VTK_FMT(fmt/args.h) + #include VTK_FMT(fmt/chrono.h) +-#include VTK_FMT(fmt/core.h) ++#include VTK_FMT(fmt/format.h) + #include VTK_FMT(fmt/ranges.h) + // clang-format on + +@@ -357,7 +357,7 @@ private: + * If argument already exists, it's ignored. + */ + template +- void AddArg(const fmt::detail::named_arg& fmtArg) ++ void AddArg(const fmt::named_arg& fmtArg) + { + bool argNotFound = std::find_if(this->Arguments.begin(), this->Arguments.end(), + [&fmtArg](const vtkNamedArgument& arg) { +diff --git a/VTKExtensions/IOCore/vtkParallelSerialWriter.cxx b/VTKExtensions/IOCore/vtkParallelSerialWriter.cxx +index 5f1833ba29..23c4a9d7c9 100644 +--- a/VTKExtensions/IOCore/vtkParallelSerialWriter.cxx ++++ b/VTKExtensions/IOCore/vtkParallelSerialWriter.cxx +@@ -29,7 +29,7 @@ + + // clang-format off + #include // needed for `fmt` +-#include VTK_FMT(fmt/core.h) ++#include VTK_FMT(fmt/format.h) + // clang-format on + + namespace diff --git a/ports/paraview/portfile.cmake b/ports/paraview/portfile.cmake index 06c203f3b63239..cf103314d8c892 100644 --- a/ports/paraview/portfile.cmake +++ b/ports/paraview/portfile.cmake @@ -62,6 +62,7 @@ vcpkg_from_github( protobuf-version.patch plugin.patch explicit_int_cast_2.patch + fix-fmt-header.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") diff --git a/ports/paraview/vcpkg.json b/ports/paraview/vcpkg.json index 6591ddbf582f00..8590aa3cbe7bf5 100644 --- a/ports/paraview/vcpkg.json +++ b/ports/paraview/vcpkg.json @@ -1,7 +1,7 @@ { "name": "paraview", "version": "5.12.1", - "port-version": 6, + "port-version": 7, "description": "VTK-based Data Analysis and Visualization Application", "homepage": "https://www.paraview.org/", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index a19d8153ed6460..ee5fd4d00b51f7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7666,7 +7666,7 @@ }, "paraview": { "baseline": "5.12.1", - "port-version": 6 + "port-version": 7 }, "parmetis": { "baseline": "2023-03-26", diff --git a/versions/p-/paraview.json b/versions/p-/paraview.json index c7fc9fae3f5b6f..d8c326ddab557a 100644 --- a/versions/p-/paraview.json +++ b/versions/p-/paraview.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6c21232526c928776533ab6953ca54231429e831", + "version": "5.12.1", + "port-version": 7 + }, { "git-tree": "e34cc499ec9b38fd86edad6a233c6fe152f0d145", "version": "5.12.1", From 6e04f2b11e0cf5f35412f388e9d78c268fc0fd92 Mon Sep 17 00:00:00 2001 From: xiaozhuai <798047000@qq.com> Date: Wed, 17 Jun 2026 11:50:30 +0800 Subject: [PATCH 14/15] [fbthrift] Fix compatibility with fmt 12.2.0 --- ports/fbthrift/fix-fmt-header.patch | 1738 +++++++++++++++++++++++++++ ports/fbthrift/portfile.cmake | 1 + ports/fbthrift/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/f-/fbthrift.json | 5 + 5 files changed, 1746 insertions(+), 1 deletion(-) create mode 100644 ports/fbthrift/fix-fmt-header.patch diff --git a/ports/fbthrift/fix-fmt-header.patch b/ports/fbthrift/fix-fmt-header.patch new file mode 100644 index 00000000000000..c8ddd94d83e8b5 --- /dev/null +++ b/ports/fbthrift/fix-fmt-header.patch @@ -0,0 +1,1738 @@ +diff --git a/thrift/common/test/universal_name_test.cc b/thrift/common/test/universal_name_test.cc +index 3c18f966dc..74322ae2a0 100644 +--- a/thrift/common/test/universal_name_test.cc ++++ b/thrift/common/test/universal_name_test.cc +@@ -17,7 +17,7 @@ + #include + + #include +-#include ++#include + #include + #include + +diff --git a/thrift/common/tree_printer.h b/thrift/common/tree_printer.h +index f79ea4474c..93b6c33e3d 100644 +--- a/thrift/common/tree_printer.h ++++ b/thrift/common/tree_printer.h +@@ -23,7 +23,7 @@ + #include + #include + +-#include ++#include + + namespace apache::thrift::tree_printer { + +diff --git a/thrift/common/universal_name.cc b/thrift/common/universal_name.cc +index 58aa53d68b..f0ba741048 100644 +--- a/thrift/common/universal_name.cc ++++ b/thrift/common/universal_name.cc +@@ -19,7 +19,6 @@ + #include + #include + #include +-#include + #include + + namespace apache::thrift { +diff --git a/thrift/compiler/ast/scope_identifier.cc b/thrift/compiler/ast/scope_identifier.cc +index 67eb249d74..261bfc1806 100644 +--- a/thrift/compiler/ast/scope_identifier.cc ++++ b/thrift/compiler/ast/scope_identifier.cc +@@ -15,7 +15,7 @@ + */ + + #include +-#include ++#include + + #include + +diff --git a/thrift/compiler/ast/t_const.cc b/thrift/compiler/ast/t_const.cc +index 98b0f58f53..5b180c622a 100644 +--- a/thrift/compiler/ast/t_const.cc ++++ b/thrift/compiler/ast/t_const.cc +@@ -16,7 +16,7 @@ + + #include + +-#include ++#include + #include + #include + +diff --git a/thrift/compiler/ast/t_include.h b/thrift/compiler/ast/t_include.h +index 78b0645e3f..6b2ccff4d7 100644 +--- a/thrift/compiler/ast/t_include.h ++++ b/thrift/compiler/ast/t_include.h +@@ -16,7 +16,7 @@ + + #pragma once + +-#include ++#include + #include + + namespace apache::thrift::compiler { +diff --git a/thrift/compiler/ast/t_named.cc b/thrift/compiler/ast/t_named.cc +index d912ca796b..5e6add765e 100644 +--- a/thrift/compiler/ast/t_named.cc ++++ b/thrift/compiler/ast/t_named.cc +@@ -21,7 +21,7 @@ + #include + #include + +-#include ++#include + + namespace apache::thrift::compiler { + +diff --git a/thrift/compiler/ast/t_program.h b/thrift/compiler/ast/t_program.h +index 7f99da6bc4..f0e60d7bcd 100644 +--- a/thrift/compiler/ast/t_program.h ++++ b/thrift/compiler/ast/t_program.h +@@ -26,7 +26,7 @@ + #include + #include + +-#include ++#include + + #include + #include +diff --git a/thrift/compiler/ast/thrift_ast_debug_tree_utils.cc b/thrift/compiler/ast/thrift_ast_debug_tree_utils.cc +index efdfcadc27..7199174f6c 100644 +--- a/thrift/compiler/ast/thrift_ast_debug_tree_utils.cc ++++ b/thrift/compiler/ast/thrift_ast_debug_tree_utils.cc +@@ -17,7 +17,7 @@ + #include "thrift/compiler/ast/thrift_ast_debug_tree_utils.h" + + #include +-#include ++#include + + #include "thrift/common/tree_printer.h" + #include "thrift/compiler/ast/t_program_bundle.h" +diff --git a/thrift/compiler/codemod/annotate_allow_legacy_missing_uris.cc b/thrift/compiler/codemod/annotate_allow_legacy_missing_uris.cc +index 8756abd000..5e747bf43c 100644 +--- a/thrift/compiler/codemod/annotate_allow_legacy_missing_uris.cc ++++ b/thrift/compiler/codemod/annotate_allow_legacy_missing_uris.cc +@@ -18,7 +18,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +diff --git a/thrift/compiler/codemod/annotate_allow_unsafe_non_sealed_key_type.cc b/thrift/compiler/codemod/annotate_allow_unsafe_non_sealed_key_type.cc +index 254636c93f..a6b888b11a 100644 +--- a/thrift/compiler/codemod/annotate_allow_unsafe_non_sealed_key_type.cc ++++ b/thrift/compiler/codemod/annotate_allow_unsafe_non_sealed_key_type.cc +@@ -16,7 +16,7 @@ + + #include + #include +-#include ++#include + #include + #include + #include +diff --git a/thrift/compiler/codemod/annotate_custom_default_optional_fields.cc b/thrift/compiler/codemod/annotate_custom_default_optional_fields.cc +index ce0f991d5b..9c1fb59b53 100644 +--- a/thrift/compiler/codemod/annotate_custom_default_optional_fields.cc ++++ b/thrift/compiler/codemod/annotate_custom_default_optional_fields.cc +@@ -16,7 +16,7 @@ + + #include + #include +-#include ++#include + #include + #include + #include +diff --git a/thrift/compiler/codemod/annotate_deprecated_terse_writes_fields.cc b/thrift/compiler/codemod/annotate_deprecated_terse_writes_fields.cc +index 9206e40bfe..f0df930f24 100644 +--- a/thrift/compiler/codemod/annotate_deprecated_terse_writes_fields.cc ++++ b/thrift/compiler/codemod/annotate_deprecated_terse_writes_fields.cc +@@ -16,7 +16,7 @@ + + #include + #include +-#include ++#include + #include + #include + #include +diff --git a/thrift/compiler/codemod/annotate_non_optional_cpp_ref_fields.cc b/thrift/compiler/codemod/annotate_non_optional_cpp_ref_fields.cc +index cc2cde0ea2..82c4cbe1a5 100644 +--- a/thrift/compiler/codemod/annotate_non_optional_cpp_ref_fields.cc ++++ b/thrift/compiler/codemod/annotate_non_optional_cpp_ref_fields.cc +@@ -16,7 +16,7 @@ + + #include + #include +-#include ++#include + #include + #include + #include +diff --git a/thrift/compiler/codemod/annotate_required_fields.cc b/thrift/compiler/codemod/annotate_required_fields.cc +index fd24846a07..02a367c90c 100644 +--- a/thrift/compiler/codemod/annotate_required_fields.cc ++++ b/thrift/compiler/codemod/annotate_required_fields.cc +@@ -16,7 +16,7 @@ + + #include + #include +-#include ++#include + #include + #include + #include +diff --git a/thrift/compiler/codemod/codemod.cc b/thrift/compiler/codemod/codemod.cc +index 60696bad78..20b29e996d 100644 +--- a/thrift/compiler/codemod/codemod.cc ++++ b/thrift/compiler/codemod/codemod.cc +@@ -14,7 +14,7 @@ + * limitations under the License. + */ + +-#include ++#include + #include + #include + #include +diff --git a/thrift/compiler/codemod/file_manager.cc b/thrift/compiler/codemod/file_manager.cc +index a665de62d4..f394880ef9 100644 +--- a/thrift/compiler/codemod/file_manager.cc ++++ b/thrift/compiler/codemod/file_manager.cc +@@ -15,7 +15,7 @@ + */ + + #include +-#include ++#include + #include + #include + +diff --git a/thrift/compiler/codemod/file_manager.h b/thrift/compiler/codemod/file_manager.h +index 8fcfa9ee05..d5abb14bab 100644 +--- a/thrift/compiler/codemod/file_manager.h ++++ b/thrift/compiler/codemod/file_manager.h +@@ -20,7 +20,7 @@ + #include + #include + #include +-#include ++#include + + #include + +diff --git a/thrift/compiler/codemod/package_generator.h b/thrift/compiler/codemod/package_generator.h +index 30b1b77ace..7b1f1702f5 100644 +--- a/thrift/compiler/codemod/package_generator.h ++++ b/thrift/compiler/codemod/package_generator.h +@@ -21,7 +21,6 @@ + #include + + #include +-#include + #include + #include + #include +diff --git a/thrift/compiler/codemod/relative_include.cc b/thrift/compiler/codemod/relative_include.cc +index 0c3dbc92ef..667abd0d1a 100644 +--- a/thrift/compiler/codemod/relative_include.cc ++++ b/thrift/compiler/codemod/relative_include.cc +@@ -18,7 +18,7 @@ + #include + #include + +-#include ++#include + #include + #include + #include +diff --git a/thrift/compiler/codemod/specify_implicit_field_id.cc b/thrift/compiler/codemod/specify_implicit_field_id.cc +index 023c54f401..3ef4d5354d 100644 +--- a/thrift/compiler/codemod/specify_implicit_field_id.cc ++++ b/thrift/compiler/codemod/specify_implicit_field_id.cc +@@ -14,7 +14,7 @@ + * limitations under the License. + */ + +-#include ++#include + + #include + #include +diff --git a/thrift/compiler/codemod/specify_implicit_func_param_id.cc b/thrift/compiler/codemod/specify_implicit_func_param_id.cc +index aed3849e49..55e4937891 100644 +--- a/thrift/compiler/codemod/specify_implicit_func_param_id.cc ++++ b/thrift/compiler/codemod/specify_implicit_func_param_id.cc +@@ -14,7 +14,7 @@ + * limitations under the License. + */ + +-#include ++#include + + #include + #include +diff --git a/thrift/compiler/codemod/structure_annotations.cc b/thrift/compiler/codemod/structure_annotations.cc +index 7432291c63..76bf268c9c 100644 +--- a/thrift/compiler/codemod/structure_annotations.cc ++++ b/thrift/compiler/codemod/structure_annotations.cc +@@ -16,7 +16,7 @@ + + #include + #include +-#include ++#include + #include + + #include +diff --git a/thrift/compiler/diagnostic.h b/thrift/compiler/diagnostic.h +index 162e570f5e..b63ce670fc 100644 +--- a/thrift/compiler/diagnostic.h ++++ b/thrift/compiler/diagnostic.h +@@ -27,7 +27,7 @@ + #include + #include + +-#include ++#include + #include + #include + #include +diff --git a/thrift/compiler/generate/cpp/orderable_type_utils.cc b/thrift/compiler/generate/cpp/orderable_type_utils.cc +index e4eb1feb4e..2923fca21d 100644 +--- a/thrift/compiler/generate/cpp/orderable_type_utils.cc ++++ b/thrift/compiler/generate/cpp/orderable_type_utils.cc +@@ -16,7 +16,7 @@ + + #include + +-#include ++#include + #include + #include + #include +diff --git a/thrift/compiler/generate/cpp/util.cc b/thrift/compiler/generate/cpp/util.cc +index 41ef05d502..404ea8ee91 100644 +--- a/thrift/compiler/generate/cpp/util.cc ++++ b/thrift/compiler/generate/cpp/util.cc +@@ -25,7 +25,7 @@ + #include + #include + +-#include ++#include + + #include + #include +diff --git a/thrift/compiler/generate/go/util.cc b/thrift/compiler/generate/go/util.cc +index 0384948940..8e1acb47f5 100644 +--- a/thrift/compiler/generate/go/util.cc ++++ b/thrift/compiler/generate/go/util.cc +@@ -17,7 +17,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + +diff --git a/thrift/compiler/generate/json.cc b/thrift/compiler/generate/json.cc +index 7973328282..8348ece7d4 100644 +--- a/thrift/compiler/generate/json.cc ++++ b/thrift/compiler/generate/json.cc +@@ -17,7 +17,7 @@ + #include + #include + +-#include ++#include + + #include + #include +diff --git a/thrift/compiler/generate/mstch_objects.cc b/thrift/compiler/generate/mstch_objects.cc +index 88c59264aa..7c6db37d56 100644 +--- a/thrift/compiler/generate/mstch_objects.cc ++++ b/thrift/compiler/generate/mstch_objects.cc +@@ -17,7 +17,7 @@ + #include + #include + +-#include ++#include + #include + + namespace apache::thrift::compiler { +diff --git a/thrift/compiler/generate/t_concat_generator.cc b/thrift/compiler/generate/t_concat_generator.cc +index d1501966f3..6c3033f64b 100644 +--- a/thrift/compiler/generate/t_concat_generator.cc ++++ b/thrift/compiler/generate/t_concat_generator.cc +@@ -18,6 +18,7 @@ + + #include + #include ++#include + #include + #include + +diff --git a/thrift/compiler/generate/t_generator.cc b/thrift/compiler/generate/t_generator.cc +index f0881900a7..1d04a2e0e9 100644 +--- a/thrift/compiler/generate/t_generator.cc ++++ b/thrift/compiler/generate/t_generator.cc +@@ -19,7 +19,7 @@ + #include + #include + +-#include ++#include + + namespace apache::thrift::compiler { + +diff --git a/thrift/compiler/generate/t_mstch_cpp2_generator.cc b/thrift/compiler/generate/t_mstch_cpp2_generator.cc +index d678847f94..4b553abd4b 100644 +--- a/thrift/compiler/generate/t_mstch_cpp2_generator.cc ++++ b/thrift/compiler/generate/t_mstch_cpp2_generator.cc +@@ -26,7 +26,7 @@ + + #include + #include +-#include ++#include + + #include + #include +diff --git a/thrift/compiler/parse/lexer.h b/thrift/compiler/parse/lexer.h +index 2f5b71bef2..775ca41108 100644 +--- a/thrift/compiler/parse/lexer.h ++++ b/thrift/compiler/parse/lexer.h +@@ -19,7 +19,7 @@ + #include + #include + +-#include ++#include + + #include + #include +diff --git a/thrift/compiler/parse/token.cc b/thrift/compiler/parse/token.cc +index cd5da73a81..55a236c7c1 100644 +--- a/thrift/compiler/parse/token.cc ++++ b/thrift/compiler/parse/token.cc +@@ -16,7 +16,7 @@ + + #include + +-#include ++#include + + #include + #include +diff --git a/thrift/compiler/sema/schematizer.cc b/thrift/compiler/sema/schematizer.cc +index e5d8189ecc..efa159ab73 100644 +--- a/thrift/compiler/sema/schematizer.cc ++++ b/thrift/compiler/sema/schematizer.cc +@@ -20,7 +20,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +diff --git a/thrift/compiler/source_location.cc b/thrift/compiler/source_location.cc +index 60c3cc9d31..1fa58e44d5 100644 +--- a/thrift/compiler/source_location.cc ++++ b/thrift/compiler/source_location.cc +@@ -17,7 +17,7 @@ + #include + #include + +-#include ++#include + #include + + #include +diff --git a/thrift/compiler/test/token_test.cc b/thrift/compiler/test/token_test.cc +index a9158c052d..162fe3097f 100644 +--- a/thrift/compiler/test/token_test.cc ++++ b/thrift/compiler/test/token_test.cc +@@ -17,7 +17,7 @@ + #include + #include + +-#include ++#include + + using namespace apache::thrift::compiler; // NOLINT + +diff --git a/thrift/compiler/whisker/ast.cc b/thrift/compiler/whisker/ast.cc +index ce858796fa..78f44923cb 100644 +--- a/thrift/compiler/whisker/ast.cc ++++ b/thrift/compiler/whisker/ast.cc +@@ -18,7 +18,7 @@ + #include + #include + +-#include ++#include + #include + + #include +diff --git a/thrift/compiler/whisker/dsl.h b/thrift/compiler/whisker/dsl.h +index 53d26ef0dc..c43d5ec747 100644 +--- a/thrift/compiler/whisker/dsl.h ++++ b/thrift/compiler/whisker/dsl.h +@@ -20,7 +20,7 @@ + #include + #include + +-#include ++#include + + #include + #include +diff --git a/thrift/compiler/whisker/eval_context.cc b/thrift/compiler/whisker/eval_context.cc +index 014654ee48..a1e5947e4a 100644 +--- a/thrift/compiler/whisker/eval_context.cc ++++ b/thrift/compiler/whisker/eval_context.cc +@@ -20,7 +20,7 @@ + #include + #include + +-#include ++#include + + namespace w = whisker::make; + +diff --git a/thrift/compiler/whisker/lexer.h b/thrift/compiler/whisker/lexer.h +index 961766bdc8..b689cfdd88 100644 +--- a/thrift/compiler/whisker/lexer.h ++++ b/thrift/compiler/whisker/lexer.h +@@ -27,7 +27,7 @@ + #include + #include + +-#include ++#include + + namespace whisker { + +diff --git a/thrift/compiler/whisker/mstch_compat.cc b/thrift/compiler/whisker/mstch_compat.cc +index c520dd2bc8..9b36042410 100644 +--- a/thrift/compiler/whisker/mstch_compat.cc ++++ b/thrift/compiler/whisker/mstch_compat.cc +@@ -25,7 +25,7 @@ + #include + #include + +-#include ++#include + + namespace apache::thrift::mstch { + node::node(std::size_t i) : base(static_cast(i)) { +diff --git a/thrift/compiler/whisker/object.cc b/thrift/compiler/whisker/object.cc +index 59063edc27..bc4261e5ea 100644 +--- a/thrift/compiler/whisker/object.cc ++++ b/thrift/compiler/whisker/object.cc +@@ -23,7 +23,7 @@ + #include + #include + +-#include ++#include + #include + + #include +diff --git a/thrift/compiler/whisker/object.h b/thrift/compiler/whisker/object.h +index 98e88859de..cf535306f5 100644 +--- a/thrift/compiler/whisker/object.h ++++ b/thrift/compiler/whisker/object.h +@@ -42,7 +42,7 @@ + #include + #include + +-#include ++#include + + #include + +diff --git a/thrift/compiler/whisker/parser.cc b/thrift/compiler/whisker/parser.cc +index cdcbffba22..60cbe5c8d6 100644 +--- a/thrift/compiler/whisker/parser.cc ++++ b/thrift/compiler/whisker/parser.cc +@@ -20,7 +20,7 @@ + #include + #include + +-#include ++#include + + #include + #include +diff --git a/thrift/compiler/whisker/print_ast.cc b/thrift/compiler/whisker/print_ast.cc +index dab589e9f6..480cc4705a 100644 +--- a/thrift/compiler/whisker/print_ast.cc ++++ b/thrift/compiler/whisker/print_ast.cc +@@ -22,7 +22,7 @@ + #include + #include + +-#include ++#include + + namespace whisker { + +diff --git a/thrift/compiler/whisker/render.cc b/thrift/compiler/whisker/render.cc +index 623a1e0204..bbb729f9bd 100644 +--- a/thrift/compiler/whisker/render.cc ++++ b/thrift/compiler/whisker/render.cc +@@ -31,7 +31,7 @@ + #include + #include + +-#include ++#include + #include + + namespace whisker { +diff --git a/thrift/compiler/whisker/standard_library.cc b/thrift/compiler/whisker/standard_library.cc +index 2346ca379b..3248767bb4 100644 +--- a/thrift/compiler/whisker/standard_library.cc ++++ b/thrift/compiler/whisker/standard_library.cc +@@ -18,7 +18,7 @@ + + #include + +-#include ++#include + + #include + +diff --git a/thrift/compiler/whisker/test/eval_context_test.cc b/thrift/compiler/whisker/test/eval_context_test.cc +index c9717d478c..b8ac267646 100644 +--- a/thrift/compiler/whisker/test/eval_context_test.cc ++++ b/thrift/compiler/whisker/test/eval_context_test.cc +@@ -19,7 +19,7 @@ + + #include + +-#include ++#include + + namespace w = whisker::make; + +diff --git a/thrift/compiler/whisker/test/lexer_test.cc b/thrift/compiler/whisker/test/lexer_test.cc +index 8e52515e54..5966283a6b 100644 +--- a/thrift/compiler/whisker/test/lexer_test.cc ++++ b/thrift/compiler/whisker/test/lexer_test.cc +@@ -27,7 +27,7 @@ + #include + #include + +-#include ++#include + + namespace whisker { + +diff --git a/thrift/compiler/whisker/test/parser_test.cc b/thrift/compiler/whisker/test/parser_test.cc +index 8c54a2d9b6..b91717e050 100644 +--- a/thrift/compiler/whisker/test/parser_test.cc ++++ b/thrift/compiler/whisker/test/parser_test.cc +@@ -28,7 +28,7 @@ + #include + #include + +-#include ++#include + + namespace whisker { + +diff --git a/thrift/compiler/whisker/test/render_test_helpers.h b/thrift/compiler/whisker/test/render_test_helpers.h +index 7b8c98aca8..d12955ad20 100644 +--- a/thrift/compiler/whisker/test/render_test_helpers.h ++++ b/thrift/compiler/whisker/test/render_test_helpers.h +@@ -34,7 +34,7 @@ + #include + #include + +-#include ++#include + #include + + namespace whisker { +diff --git a/thrift/compiler/whisker/token.cc b/thrift/compiler/whisker/token.cc +index df8289e97c..e43779828d 100644 +--- a/thrift/compiler/whisker/token.cc ++++ b/thrift/compiler/whisker/token.cc +@@ -24,7 +24,7 @@ + #include + #include + +-#include ++#include + #include + + // clang-format off +diff --git a/thrift/compiler/whisker/token.h b/thrift/compiler/whisker/token.h +index 95de6f1dae..417acef55e 100644 +--- a/thrift/compiler/whisker/token.h ++++ b/thrift/compiler/whisker/token.h +@@ -26,7 +26,7 @@ + #include + #include + +-#include ++#include + + namespace whisker { + +diff --git a/thrift/compiler/whisker/tools/ast-check.cc b/thrift/compiler/whisker/tools/ast-check.cc +index 5bc29b7a09..39e7092ca1 100644 +--- a/thrift/compiler/whisker/tools/ast-check.cc ++++ b/thrift/compiler/whisker/tools/ast-check.cc +@@ -24,7 +24,7 @@ + #include + #include + +-#include ++#include + + using namespace std::literals; + +diff --git a/thrift/compiler/whisker/tools/ast-dump.cc b/thrift/compiler/whisker/tools/ast-dump.cc +index bddbbd1e5e..7014263c4a 100644 +--- a/thrift/compiler/whisker/tools/ast-dump.cc ++++ b/thrift/compiler/whisker/tools/ast-dump.cc +@@ -28,7 +28,7 @@ + #include + #include + +-#include ++#include + + using namespace std::literals; + +diff --git a/thrift/conformance/cpp2/Testing.cpp b/thrift/conformance/cpp2/Testing.cpp +index 9b76a00a88..aa32d4cf9d 100644 +--- a/thrift/conformance/cpp2/Testing.cpp ++++ b/thrift/conformance/cpp2/Testing.cpp +@@ -16,7 +16,7 @@ + + #include + +-#include ++#include + #include + #include + #include +diff --git a/thrift/conformance/cpp2/internal/TestValue.h b/thrift/conformance/cpp2/internal/TestValue.h +index 1ac1040ee1..43514c76cf 100644 +--- a/thrift/conformance/cpp2/internal/TestValue.h ++++ b/thrift/conformance/cpp2/internal/TestValue.h +@@ -18,7 +18,7 @@ + + #include + +-#include ++#include + #include + #include + #include +diff --git a/thrift/conformance/data/CompatibilityGenerator.cpp b/thrift/conformance/data/CompatibilityGenerator.cpp +index 0923828ad8..26f7f04915 100644 +--- a/thrift/conformance/data/CompatibilityGenerator.cpp ++++ b/thrift/conformance/data/CompatibilityGenerator.cpp +@@ -24,7 +24,7 @@ + #include + + #include +-#include ++#include + #include + #include + #include +diff --git a/thrift/conformance/data/PatchGenerator.cpp b/thrift/conformance/data/PatchGenerator.cpp +index bb974e4446..710e641170 100644 +--- a/thrift/conformance/data/PatchGenerator.cpp ++++ b/thrift/conformance/data/PatchGenerator.cpp +@@ -21,7 +21,7 @@ + #include + #include + +-#include ++#include + + #include + #include +diff --git a/thrift/conformance/data/TestGenerator.cpp b/thrift/conformance/data/TestGenerator.cpp +index 35a9ac51b9..1aa6939e07 100644 +--- a/thrift/conformance/data/TestGenerator.cpp ++++ b/thrift/conformance/data/TestGenerator.cpp +@@ -16,7 +16,7 @@ + + #include + +-#include ++#include + + #include + #include +diff --git a/thrift/conformance/data/ToleranceGenerator.cpp b/thrift/conformance/data/ToleranceGenerator.cpp +index a6f8940705..ea46a76946 100644 +--- a/thrift/conformance/data/ToleranceGenerator.cpp ++++ b/thrift/conformance/data/ToleranceGenerator.cpp +@@ -17,7 +17,7 @@ + #include + + #include +-#include ++#include + #include + + #include +diff --git a/thrift/conformance/data/ValueGenerator.h b/thrift/conformance/data/ValueGenerator.h +index 1833678de2..a35d31847c 100644 +--- a/thrift/conformance/data/ValueGenerator.h ++++ b/thrift/conformance/data/ValueGenerator.h +@@ -23,7 +23,7 @@ + #include + #include + +-#include ++#include + #include + #include + #include +diff --git a/thrift/conformance/rpcclient/GTestHarnessRPCClient.cpp b/thrift/conformance/rpcclient/GTestHarnessRPCClient.cpp +index 73cf159ccb..405ee52742 100644 +--- a/thrift/conformance/rpcclient/GTestHarnessRPCClient.cpp ++++ b/thrift/conformance/rpcclient/GTestHarnessRPCClient.cpp +@@ -21,7 +21,7 @@ + #include + #include + +-#include ++#include + #include + #include + #include +diff --git a/thrift/conformance/stresstest/client/TestRunner.cpp b/thrift/conformance/stresstest/client/TestRunner.cpp +index 528b49b3b2..c293334c9f 100644 +--- a/thrift/conformance/stresstest/client/TestRunner.cpp ++++ b/thrift/conformance/stresstest/client/TestRunner.cpp +@@ -16,7 +16,7 @@ + + #include + +-#include ++#include + #include + + #include +diff --git a/thrift/conformance/stresstest/common/StressTestStats.cpp b/thrift/conformance/stresstest/common/StressTestStats.cpp +index 1b41fbe3c1..5dd770e6fc 100644 +--- a/thrift/conformance/stresstest/common/StressTestStats.cpp ++++ b/thrift/conformance/stresstest/common/StressTestStats.cpp +@@ -16,7 +16,7 @@ + + #include + +-#include ++#include + #include + + namespace apache::thrift::stress { +diff --git a/thrift/lib/cpp/protocol/TProtocolException.cpp b/thrift/lib/cpp/protocol/TProtocolException.cpp +index cd6791d48d..3514910e45 100644 +--- a/thrift/lib/cpp/protocol/TProtocolException.cpp ++++ b/thrift/lib/cpp/protocol/TProtocolException.cpp +@@ -16,7 +16,7 @@ + + #include + +-#include ++#include + + namespace apache::thrift::protocol { + +diff --git a/thrift/lib/cpp/protocol/TType.h b/thrift/lib/cpp/protocol/TType.h +index 902698d922..e53220e5e8 100644 +--- a/thrift/lib/cpp/protocol/TType.h ++++ b/thrift/lib/cpp/protocol/TType.h +@@ -18,7 +18,7 @@ + + #include + #include +-#include ++#include + + namespace apache::thrift::protocol { + +diff --git a/thrift/lib/cpp/server/test/TrackingTServerEventHandler.cpp b/thrift/lib/cpp/server/test/TrackingTServerEventHandler.cpp +index 36eab3bcd4..d2beec21e8 100644 +--- a/thrift/lib/cpp/server/test/TrackingTServerEventHandler.cpp ++++ b/thrift/lib/cpp/server/test/TrackingTServerEventHandler.cpp +@@ -16,7 +16,7 @@ + + #include + +-#include ++#include + #include + + namespace apache::thrift::server::test { +diff --git a/thrift/lib/cpp/transport/THeader.cpp b/thrift/lib/cpp/transport/THeader.cpp +index 0b4c19a231..a208627b55 100644 +--- a/thrift/lib/cpp/transport/THeader.cpp ++++ b/thrift/lib/cpp/transport/THeader.cpp +@@ -16,7 +16,7 @@ + + #include + +-#include ++#include + #include + #include + #include +diff --git a/thrift/lib/cpp/transport/TTransportException.cpp b/thrift/lib/cpp/transport/TTransportException.cpp +index f718d883d4..2f5467caac 100644 +--- a/thrift/lib/cpp/transport/TTransportException.cpp ++++ b/thrift/lib/cpp/transport/TTransportException.cpp +@@ -16,7 +16,7 @@ + + #include + +-#include ++#include + + #include + +diff --git a/thrift/lib/cpp/util/THttpParser.cpp b/thrift/lib/cpp/util/THttpParser.cpp +index 5216912150..41ee56d5a6 100644 +--- a/thrift/lib/cpp/util/THttpParser.cpp ++++ b/thrift/lib/cpp/util/THttpParser.cpp +@@ -18,7 +18,7 @@ + + #include + +-#include ++#include + #include + #include + #include +diff --git a/thrift/lib/cpp/util/test/THttpParserTest.cpp b/thrift/lib/cpp/util/test/THttpParserTest.cpp +index 59b9d965bb..993699bc04 100644 +--- a/thrift/lib/cpp/util/test/THttpParserTest.cpp ++++ b/thrift/lib/cpp/util/test/THttpParserTest.cpp +@@ -17,7 +17,7 @@ + #include + #include + +-#include ++#include + + #include + #include +diff --git a/thrift/lib/cpp2/FieldRef.cpp b/thrift/lib/cpp2/FieldRef.cpp +index fc08528051..d13d15ee07 100644 +--- a/thrift/lib/cpp2/FieldRef.cpp ++++ b/thrift/lib/cpp2/FieldRef.cpp +@@ -17,7 +17,7 @@ + #include + #include + +-#include ++#include + + [[noreturn]] void apache::thrift::detail::throw_on_bad_optional_field_access() { + throw bad_optional_field_access(); +diff --git a/thrift/lib/cpp2/GeneratedCodeHelper.h b/thrift/lib/cpp2/GeneratedCodeHelper.h +index 2064fcc797..b63f4c8921 100644 +--- a/thrift/lib/cpp2/GeneratedCodeHelper.h ++++ b/thrift/lib/cpp2/GeneratedCodeHelper.h +@@ -25,7 +25,7 @@ + #include + #include + +-#include ++#include + #include + #include + #include +diff --git a/thrift/lib/cpp2/async/AsyncProcessorFactory.cpp b/thrift/lib/cpp2/async/AsyncProcessorFactory.cpp +index 1dd782fe0a..79557d6079 100644 +--- a/thrift/lib/cpp2/async/AsyncProcessorFactory.cpp ++++ b/thrift/lib/cpp2/async/AsyncProcessorFactory.cpp +@@ -16,7 +16,6 @@ + + #include + +-#include + #include + + namespace apache::thrift { +diff --git a/thrift/lib/cpp2/async/AsyncProcessorHelper.cpp b/thrift/lib/cpp2/async/AsyncProcessorHelper.cpp +index 840325e2ff..e0be856187 100644 +--- a/thrift/lib/cpp2/async/AsyncProcessorHelper.cpp ++++ b/thrift/lib/cpp2/async/AsyncProcessorHelper.cpp +@@ -16,7 +16,7 @@ + + #include + +-#include ++#include + #include + + namespace apache::thrift { +diff --git a/thrift/lib/cpp2/async/ClientInterceptorBase.cpp b/thrift/lib/cpp2/async/ClientInterceptorBase.cpp +index b4a8d4293f..292ef31eaf 100644 +--- a/thrift/lib/cpp2/async/ClientInterceptorBase.cpp ++++ b/thrift/lib/cpp2/async/ClientInterceptorBase.cpp +@@ -18,7 +18,7 @@ + + #include + +-#include ++#include + + namespace apache::thrift { + +diff --git a/thrift/lib/cpp2/async/HTTPClientChannel.cpp b/thrift/lib/cpp2/async/HTTPClientChannel.cpp +index 636ff31853..1ab4ad05d5 100644 +--- a/thrift/lib/cpp2/async/HTTPClientChannel.cpp ++++ b/thrift/lib/cpp2/async/HTTPClientChannel.cpp +@@ -18,7 +18,7 @@ + + #include + +-#include ++#include + #include + #include + #include +diff --git a/thrift/lib/cpp2/async/RocketClientChannelBase.cpp b/thrift/lib/cpp2/async/RocketClientChannelBase.cpp +index d151c528ef..9063c57c3b 100644 +--- a/thrift/lib/cpp2/async/RocketClientChannelBase.cpp ++++ b/thrift/lib/cpp2/async/RocketClientChannelBase.cpp +@@ -19,7 +19,7 @@ + #include + #include + +-#include ++#include + #include + #include + #include +diff --git a/thrift/lib/cpp2/async/tests/ClientInterceptorTest.cpp b/thrift/lib/cpp2/async/tests/ClientInterceptorTest.cpp +index e329835b9f..c172919e28 100644 +--- a/thrift/lib/cpp2/async/tests/ClientInterceptorTest.cpp ++++ b/thrift/lib/cpp2/async/tests/ClientInterceptorTest.cpp +@@ -20,7 +20,7 @@ + + #include + +-#include ++#include + + #include + #include +diff --git a/thrift/lib/cpp2/dynamic/DynamicValue.cpp b/thrift/lib/cpp2/dynamic/DynamicValue.cpp +index d58ce962d5..0ff81ad145 100644 +--- a/thrift/lib/cpp2/dynamic/DynamicValue.cpp ++++ b/thrift/lib/cpp2/dynamic/DynamicValue.cpp +@@ -27,7 +27,7 @@ + #include + #include + +-#include ++#include + #include + + #include +diff --git a/thrift/lib/cpp2/dynamic/List.h b/thrift/lib/cpp2/dynamic/List.h +index beaf7f8b1d..c3cddcb689 100644 +--- a/thrift/lib/cpp2/dynamic/List.h ++++ b/thrift/lib/cpp2/dynamic/List.h +@@ -25,7 +25,7 @@ + #include + #include + +-#include ++#include + + #include + #include +diff --git a/thrift/lib/cpp2/dynamic/Path.h b/thrift/lib/cpp2/dynamic/Path.h +index 9368c883d1..aa1f279738 100644 +--- a/thrift/lib/cpp2/dynamic/Path.h ++++ b/thrift/lib/cpp2/dynamic/Path.h +@@ -20,7 +20,7 @@ + #include + #include + +-#include ++#include + #include + #include + +diff --git a/thrift/lib/cpp2/dynamic/SerializableRecord.cpp b/thrift/lib/cpp2/dynamic/SerializableRecord.cpp +index a9fd4daf2f..4aa2a67de6 100644 +--- a/thrift/lib/cpp2/dynamic/SerializableRecord.cpp ++++ b/thrift/lib/cpp2/dynamic/SerializableRecord.cpp +@@ -25,7 +25,7 @@ + #include + #include + +-#include ++#include + + #include + +diff --git a/thrift/lib/cpp2/dynamic/Struct.cpp b/thrift/lib/cpp2/dynamic/Struct.cpp +index 1a7d2765e4..b6a084dcb9 100644 +--- a/thrift/lib/cpp2/dynamic/Struct.cpp ++++ b/thrift/lib/cpp2/dynamic/Struct.cpp +@@ -19,7 +19,7 @@ + #include + #include + +-#include ++#include + + namespace apache::thrift::dynamic { + +diff --git a/thrift/lib/cpp2/dynamic/TypeId.cpp b/thrift/lib/cpp2/dynamic/TypeId.cpp +index a1082b3cb3..a4d3ba1b9f 100644 +--- a/thrift/lib/cpp2/dynamic/TypeId.cpp ++++ b/thrift/lib/cpp2/dynamic/TypeId.cpp +@@ -16,7 +16,7 @@ + + #include + +-#include ++#include + + #include + +diff --git a/thrift/lib/cpp2/dynamic/TypeSystem.cpp b/thrift/lib/cpp2/dynamic/TypeSystem.cpp +index b44642b693..4bd353320b 100644 +--- a/thrift/lib/cpp2/dynamic/TypeSystem.cpp ++++ b/thrift/lib/cpp2/dynamic/TypeSystem.cpp +@@ -19,7 +19,7 @@ + + #include + +-#include ++#include + + #include + #include +diff --git a/thrift/lib/cpp2/dynamic/TypeSystem.h b/thrift/lib/cpp2/dynamic/TypeSystem.h +index 4e5fa95532..a7c6cb60a8 100644 +--- a/thrift/lib/cpp2/dynamic/TypeSystem.h ++++ b/thrift/lib/cpp2/dynamic/TypeSystem.h +@@ -33,7 +33,7 @@ + #include + #include + +-#include ++#include + + #include + #include +diff --git a/thrift/lib/cpp2/dynamic/Union.cpp b/thrift/lib/cpp2/dynamic/Union.cpp +index 18e311a91c..2ba09a7192 100644 +--- a/thrift/lib/cpp2/dynamic/Union.cpp ++++ b/thrift/lib/cpp2/dynamic/Union.cpp +@@ -19,7 +19,7 @@ + #include + #include + +-#include ++#include + + namespace apache::thrift::dynamic { + +diff --git a/thrift/lib/cpp2/dynamic/Union.h b/thrift/lib/cpp2/dynamic/Union.h +index 9160b4ef1d..b091ee1e8b 100644 +--- a/thrift/lib/cpp2/dynamic/Union.h ++++ b/thrift/lib/cpp2/dynamic/Union.h +@@ -21,7 +21,7 @@ + #include + #include + +-#include ++#include + + #include + #include +diff --git a/thrift/lib/cpp2/dynamic/detail/Datum.cpp b/thrift/lib/cpp2/dynamic/detail/Datum.cpp +index a280654ec5..f064f67338 100644 +--- a/thrift/lib/cpp2/dynamic/detail/Datum.cpp ++++ b/thrift/lib/cpp2/dynamic/detail/Datum.cpp +@@ -18,7 +18,7 @@ + #include + #include + +-#include ++#include + + namespace apache::thrift::dynamic::detail { + +diff --git a/thrift/lib/cpp2/dynamic/detail/Datum.h b/thrift/lib/cpp2/dynamic/detail/Datum.h +index 10a43ab41d..5089e9c2ea 100644 +--- a/thrift/lib/cpp2/dynamic/detail/Datum.h ++++ b/thrift/lib/cpp2/dynamic/detail/Datum.h +@@ -31,7 +31,7 @@ + #include + #include + +-#include ++#include + #include + #include + #include +diff --git a/thrift/lib/cpp2/frozen/test/CompatibilityTest.cpp b/thrift/lib/cpp2/frozen/test/CompatibilityTest.cpp +index 4186adc577..62a68fb445 100644 +--- a/thrift/lib/cpp2/frozen/test/CompatibilityTest.cpp ++++ b/thrift/lib/cpp2/frozen/test/CompatibilityTest.cpp +@@ -16,7 +16,7 @@ + + #include + +-#include ++#include + #include + + #include +diff --git a/thrift/lib/cpp2/op/Patch.h b/thrift/lib/cpp2/op/Patch.h +index c9e7994b4d..f56b0524ea 100644 +--- a/thrift/lib/cpp2/op/Patch.h ++++ b/thrift/lib/cpp2/op/Patch.h +@@ -16,7 +16,7 @@ + + #pragma once + +-#include ++#include + #include + #include + #include +diff --git a/thrift/lib/cpp2/protocol/DebugProtocol.h b/thrift/lib/cpp2/protocol/DebugProtocol.h +index 52425c921a..35e2efde8b 100644 +--- a/thrift/lib/cpp2/protocol/DebugProtocol.h ++++ b/thrift/lib/cpp2/protocol/DebugProtocol.h +@@ -17,7 +17,7 @@ + #ifndef CPP2_PROTOCOL_DEBUGPROTOCOL_H_ + #define CPP2_PROTOCOL_DEBUGPROTOCOL_H_ + +-#include ++#include + #include + #include + #include +diff --git a/thrift/lib/cpp2/protocol/JSONProtocolCommon.cpp b/thrift/lib/cpp2/protocol/JSONProtocolCommon.cpp +index ec6a626433..57e14b17f0 100644 +--- a/thrift/lib/cpp2/protocol/JSONProtocolCommon.cpp ++++ b/thrift/lib/cpp2/protocol/JSONProtocolCommon.cpp +@@ -18,7 +18,7 @@ + + #include + +-#include ++#include + + #include + #include +diff --git a/thrift/lib/cpp2/protocol/Patch.cpp b/thrift/lib/cpp2/protocol/Patch.cpp +index 4ad9ef2cbe..84c3d57b0a 100644 +--- a/thrift/lib/cpp2/protocol/Patch.cpp ++++ b/thrift/lib/cpp2/protocol/Patch.cpp +@@ -20,7 +20,7 @@ + #include + #include + +-#include ++#include + #include + #include + #include +diff --git a/thrift/lib/cpp2/schema/SyntaxGraph.cpp b/thrift/lib/cpp2/schema/SyntaxGraph.cpp +index 67706d76d6..ccaa58eabc 100644 +--- a/thrift/lib/cpp2/schema/SyntaxGraph.cpp ++++ b/thrift/lib/cpp2/schema/SyntaxGraph.cpp +@@ -24,7 +24,7 @@ + #include + #include + +-#include ++#include + + #include + #include +diff --git a/thrift/lib/cpp2/schema/test/SyntaxGraphTest.cpp b/thrift/lib/cpp2/schema/test/SyntaxGraphTest.cpp +index d2c3ce9158..f6fc63ef1a 100644 +--- a/thrift/lib/cpp2/schema/test/SyntaxGraphTest.cpp ++++ b/thrift/lib/cpp2/schema/test/SyntaxGraphTest.cpp +@@ -32,7 +32,7 @@ + #include + #include + +-#include ++#include + + #include + +diff --git a/thrift/lib/cpp2/server/CPUConcurrencyController.cpp b/thrift/lib/cpp2/server/CPUConcurrencyController.cpp +index d683917b11..ecdb6129d6 100644 +--- a/thrift/lib/cpp2/server/CPUConcurrencyController.cpp ++++ b/thrift/lib/cpp2/server/CPUConcurrencyController.cpp +@@ -19,7 +19,7 @@ + + #include + #include +-#include ++#include + #include + #include + +diff --git a/thrift/lib/cpp2/server/LazyDynamicArguments.cpp b/thrift/lib/cpp2/server/LazyDynamicArguments.cpp +index ac10923755..179dc02296 100644 +--- a/thrift/lib/cpp2/server/LazyDynamicArguments.cpp ++++ b/thrift/lib/cpp2/server/LazyDynamicArguments.cpp +@@ -18,7 +18,7 @@ + + #include + +-#include ++#include + + #include + +diff --git a/thrift/lib/cpp2/server/RequestsRegistry.h b/thrift/lib/cpp2/server/RequestsRegistry.h +index bd1a048a09..dadd039ed8 100644 +--- a/thrift/lib/cpp2/server/RequestsRegistry.h ++++ b/thrift/lib/cpp2/server/RequestsRegistry.h +@@ -18,7 +18,7 @@ + + #include + #include +-#include ++#include + #include + #include + #include +diff --git a/thrift/lib/cpp2/server/ThriftServer.h b/thrift/lib/cpp2/server/ThriftServer.h +index 4b5a5a314e..5a226d270a 100644 +--- a/thrift/lib/cpp2/server/ThriftServer.h ++++ b/thrift/lib/cpp2/server/ThriftServer.h +@@ -52,7 +52,7 @@ + #include + #include + +-#include ++#include + + #include + #include +diff --git a/thrift/lib/cpp2/server/test/ResourcePoolSetTest.cpp b/thrift/lib/cpp2/server/test/ResourcePoolSetTest.cpp +index c3a49730cf..6dbddf00a5 100644 +--- a/thrift/lib/cpp2/server/test/ResourcePoolSetTest.cpp ++++ b/thrift/lib/cpp2/server/test/ResourcePoolSetTest.cpp +@@ -19,7 +19,7 @@ + #include + #include + +-#include ++#include + #include + #include + #include +diff --git a/thrift/lib/cpp2/test/CompactProtocolBench.cpp b/thrift/lib/cpp2/test/CompactProtocolBench.cpp +index 9435dd6f46..a0254ca186 100644 +--- a/thrift/lib/cpp2/test/CompactProtocolBench.cpp ++++ b/thrift/lib/cpp2/test/CompactProtocolBench.cpp +@@ -21,7 +21,7 @@ + #include + #include + +-#include ++#include + #include + #include + #include +diff --git a/thrift/lib/cpp2/test/SerializationTest.cpp b/thrift/lib/cpp2/test/SerializationTest.cpp +index a87dd109dc..9fdda601a1 100644 +--- a/thrift/lib/cpp2/test/SerializationTest.cpp ++++ b/thrift/lib/cpp2/test/SerializationTest.cpp +@@ -18,7 +18,7 @@ + + #include + +-#include ++#include + #include + #include + +diff --git a/thrift/lib/cpp2/test/ThriftServerExceptionTest.cpp b/thrift/lib/cpp2/test/ThriftServerExceptionTest.cpp +index 1c130682da..489a156846 100644 +--- a/thrift/lib/cpp2/test/ThriftServerExceptionTest.cpp ++++ b/thrift/lib/cpp2/test/ThriftServerExceptionTest.cpp +@@ -18,7 +18,7 @@ + #include + #include + +-#include ++#include + #include + #include + +diff --git a/thrift/lib/cpp2/test/server/ThriftServerTest.cpp b/thrift/lib/cpp2/test/server/ThriftServerTest.cpp +index 94770e2709..17c87f93df 100644 +--- a/thrift/lib/cpp2/test/server/ThriftServerTest.cpp ++++ b/thrift/lib/cpp2/test/server/ThriftServerTest.cpp +@@ -22,7 +22,7 @@ + #include + + #include +-#include ++#include + + #include + #include +diff --git a/thrift/lib/cpp2/test/util/TestHandler.cpp b/thrift/lib/cpp2/test/util/TestHandler.cpp +index dd1c87571a..568a494e0b 100644 +--- a/thrift/lib/cpp2/test/util/TestHandler.cpp ++++ b/thrift/lib/cpp2/test/util/TestHandler.cpp +@@ -16,7 +16,7 @@ + + #include + +-#include ++#include + #include + + const std::string kEchoSuffix(45, 'c'); +diff --git a/thrift/lib/cpp2/transport/rocket/client/RequestContext.cpp b/thrift/lib/cpp2/transport/rocket/client/RequestContext.cpp +index 840e4d6928..a32ea42076 100644 +--- a/thrift/lib/cpp2/transport/rocket/client/RequestContext.cpp ++++ b/thrift/lib/cpp2/transport/rocket/client/RequestContext.cpp +@@ -18,7 +18,7 @@ + + #include + +-#include ++#include + #include + #include + #include +diff --git a/thrift/lib/cpp2/transport/rocket/client/RocketClient.cpp b/thrift/lib/cpp2/transport/rocket/client/RocketClient.cpp +index c2fc04bc43..e59b765397 100644 +--- a/thrift/lib/cpp2/transport/rocket/client/RocketClient.cpp ++++ b/thrift/lib/cpp2/transport/rocket/client/RocketClient.cpp +@@ -21,7 +21,7 @@ + #include + #include + +-#include ++#include + #include + #include + #include +diff --git a/thrift/lib/cpp2/transport/rocket/framing/Flags.h b/thrift/lib/cpp2/transport/rocket/framing/Flags.h +index 114d65eef7..be4edb2b6f 100644 +--- a/thrift/lib/cpp2/transport/rocket/framing/Flags.h ++++ b/thrift/lib/cpp2/transport/rocket/framing/Flags.h +@@ -18,7 +18,7 @@ + + #include + +-#include ++#include + #include + + namespace apache::thrift::rocket { +diff --git a/thrift/lib/cpp2/transport/rocket/framing/Frames.cpp b/thrift/lib/cpp2/transport/rocket/framing/Frames.cpp +index 0948a3f5be..17d9dbfeb8 100644 +--- a/thrift/lib/cpp2/transport/rocket/framing/Frames.cpp ++++ b/thrift/lib/cpp2/transport/rocket/framing/Frames.cpp +@@ -22,7 +22,7 @@ + + #include + +-#include ++#include + #include + #include + #include +diff --git a/thrift/lib/cpp2/transport/rocket/server/RefactoredRocketServerConnection.cpp b/thrift/lib/cpp2/transport/rocket/server/RefactoredRocketServerConnection.cpp +index 641d2c41ab..af343cebfb 100644 +--- a/thrift/lib/cpp2/transport/rocket/server/RefactoredRocketServerConnection.cpp ++++ b/thrift/lib/cpp2/transport/rocket/server/RefactoredRocketServerConnection.cpp +@@ -22,7 +22,7 @@ + // Ensure RocketServerHandler is fully defined before template instantiation + #include + +-#include ++#include + #include + #include + #include +diff --git a/thrift/lib/cpp2/transport/rocket/server/RefactoredThriftRocketServerHandler.cpp b/thrift/lib/cpp2/transport/rocket/server/RefactoredThriftRocketServerHandler.cpp +index df102db631..6781c345d3 100644 +--- a/thrift/lib/cpp2/transport/rocket/server/RefactoredThriftRocketServerHandler.cpp ++++ b/thrift/lib/cpp2/transport/rocket/server/RefactoredThriftRocketServerHandler.cpp +@@ -22,7 +22,7 @@ + #include + #include + +-#include ++#include + #include + #include + #include +diff --git a/thrift/lib/cpp2/transport/rocket/server/RocketServerConnection.cpp b/thrift/lib/cpp2/transport/rocket/server/RocketServerConnection.cpp +index 42cece3768..0bdf04ec33 100644 +--- a/thrift/lib/cpp2/transport/rocket/server/RocketServerConnection.cpp ++++ b/thrift/lib/cpp2/transport/rocket/server/RocketServerConnection.cpp +@@ -19,7 +19,7 @@ + #include + #include + +-#include ++#include + #include + #include + #include +diff --git a/thrift/lib/cpp2/transport/rocket/server/RocketStreamClientCallback.cpp b/thrift/lib/cpp2/transport/rocket/server/RocketStreamClientCallback.cpp +index 74763da35e..02067b91d4 100644 +--- a/thrift/lib/cpp2/transport/rocket/server/RocketStreamClientCallback.cpp ++++ b/thrift/lib/cpp2/transport/rocket/server/RocketStreamClientCallback.cpp +@@ -16,7 +16,7 @@ + + #include + +-#include ++#include + + THRIFT_FLAG_DEFINE_bool(rocket_server_disable_send_callback, false); + +diff --git a/thrift/lib/cpp2/transport/rocket/server/ThriftRocketServerHandler.cpp b/thrift/lib/cpp2/transport/rocket/server/ThriftRocketServerHandler.cpp +index d94d21b1b3..f340dca010 100644 +--- a/thrift/lib/cpp2/transport/rocket/server/ThriftRocketServerHandler.cpp ++++ b/thrift/lib/cpp2/transport/rocket/server/ThriftRocketServerHandler.cpp +@@ -19,7 +19,7 @@ + #include + #include + +-#include ++#include + #include + #include + #include +diff --git a/thrift/lib/cpp2/transport/rocket/server/detail/ExistingStreamFrameHandler.h b/thrift/lib/cpp2/transport/rocket/server/detail/ExistingStreamFrameHandler.h +index 88e6843af3..729c656097 100644 +--- a/thrift/lib/cpp2/transport/rocket/server/detail/ExistingStreamFrameHandler.h ++++ b/thrift/lib/cpp2/transport/rocket/server/detail/ExistingStreamFrameHandler.h +@@ -16,7 +16,7 @@ + + #pragma once + +-#include ++#include + #include + #include + #include +diff --git a/thrift/lib/cpp2/transport/rocket/server/detail/IncomingFrameHandler.h b/thrift/lib/cpp2/transport/rocket/server/detail/IncomingFrameHandler.h +index 792f3357e8..46e8e47b1e 100644 +--- a/thrift/lib/cpp2/transport/rocket/server/detail/IncomingFrameHandler.h ++++ b/thrift/lib/cpp2/transport/rocket/server/detail/IncomingFrameHandler.h +@@ -16,7 +16,7 @@ + + #pragma once + +-#include ++#include + #include + #include + #include +diff --git a/thrift/lib/cpp2/transport/rocket/server/detail/RocketRequestOrchestrator.h b/thrift/lib/cpp2/transport/rocket/server/detail/RocketRequestOrchestrator.h +index 482e60a009..1d3b8adfbb 100644 +--- a/thrift/lib/cpp2/transport/rocket/server/detail/RocketRequestOrchestrator.h ++++ b/thrift/lib/cpp2/transport/rocket/server/detail/RocketRequestOrchestrator.h +@@ -19,7 +19,7 @@ + #include + #include + +-#include ++#include + + #include + #include +diff --git a/thrift/lib/cpp2/transport/rocket/server/detail/RocketSetupProcessor.cpp b/thrift/lib/cpp2/transport/rocket/server/detail/RocketSetupProcessor.cpp +index bc46d54cff..0ef37d30dd 100644 +--- a/thrift/lib/cpp2/transport/rocket/server/detail/RocketSetupProcessor.cpp ++++ b/thrift/lib/cpp2/transport/rocket/server/detail/RocketSetupProcessor.cpp +@@ -19,7 +19,7 @@ + #include + #include + +-#include ++#include + #include + #include + #include +diff --git a/thrift/lib/cpp2/type/AlignedPtr.h b/thrift/lib/cpp2/type/AlignedPtr.h +index 29be40b8a8..1a78b7bcb4 100644 +--- a/thrift/lib/cpp2/type/AlignedPtr.h ++++ b/thrift/lib/cpp2/type/AlignedPtr.h +@@ -18,7 +18,7 @@ + + #include + #include +-#include ++#include + #include + #include + #include +diff --git a/thrift/lib/cpp2/type/Id.h b/thrift/lib/cpp2/type/Id.h +index 7621caeaa3..764e3534aa 100644 +--- a/thrift/lib/cpp2/type/Id.h ++++ b/thrift/lib/cpp2/type/Id.h +@@ -27,7 +27,7 @@ + #include + #include + +-#include ++#include + #include + #include + #include +diff --git a/thrift/lib/cpp2/type/UniversalName.cpp b/thrift/lib/cpp2/type/UniversalName.cpp +index 451fcde357..45a393b73a 100644 +--- a/thrift/lib/cpp2/type/UniversalName.cpp ++++ b/thrift/lib/cpp2/type/UniversalName.cpp +@@ -21,7 +21,7 @@ + + #include + +-#include ++#include + #include + #include + #include +diff --git a/thrift/lib/cpp2/type/UniversalNameTest.cpp b/thrift/lib/cpp2/type/UniversalNameTest.cpp +index 8e46869adf..5aa16b5bf9 100644 +--- a/thrift/lib/cpp2/type/UniversalNameTest.cpp ++++ b/thrift/lib/cpp2/type/UniversalNameTest.cpp +@@ -20,7 +20,7 @@ + + #include + +-#include ++#include + #include + #include + #include +diff --git a/thrift/lib/cpp2/type/detail/Name.h b/thrift/lib/cpp2/type/detail/Name.h +index b0298c0318..2347485bcd 100644 +--- a/thrift/lib/cpp2/type/detail/Name.h ++++ b/thrift/lib/cpp2/type/detail/Name.h +@@ -16,7 +16,7 @@ + + #pragma once + +-#include ++#include + #include + #include + #include +diff --git a/thrift/lib/cpp2/util/DebugString.cpp b/thrift/lib/cpp2/util/DebugString.cpp +index 2027122f9d..bed9cc9939 100644 +--- a/thrift/lib/cpp2/util/DebugString.cpp ++++ b/thrift/lib/cpp2/util/DebugString.cpp +@@ -17,7 +17,7 @@ + #include + + #include +-#include ++#include + #include + #include + #include +diff --git a/thrift/lib/thrift/detail/TypeIdAdapter.cpp b/thrift/lib/thrift/detail/TypeIdAdapter.cpp +index 785c0d0eba..d57399b59c 100644 +--- a/thrift/lib/thrift/detail/TypeIdAdapter.cpp ++++ b/thrift/lib/thrift/detail/TypeIdAdapter.cpp +@@ -18,7 +18,7 @@ + + #include + +-#include ++#include + + namespace apache::thrift::type_system::detail { + +diff --git a/thrift/lib/thrift/detail/TypeIdAdapter.h b/thrift/lib/thrift/detail/TypeIdAdapter.h +index d0186d1d06..82053a6531 100644 +--- a/thrift/lib/thrift/detail/TypeIdAdapter.h ++++ b/thrift/lib/thrift/detail/TypeIdAdapter.h +@@ -25,7 +25,7 @@ + #include + #include + +-#include ++#include + + #include + #include +diff --git a/thrift/lib/thrift/detail/TypeSystemAdapter.cpp b/thrift/lib/thrift/detail/TypeSystemAdapter.cpp +index fe1566dc92..18ac7280b5 100644 +--- a/thrift/lib/thrift/detail/TypeSystemAdapter.cpp ++++ b/thrift/lib/thrift/detail/TypeSystemAdapter.cpp +@@ -20,7 +20,7 @@ + + #include + +-#include ++#include + + using apache::thrift::type_system::FieldId; + using apache::thrift::type_system::FieldIdentity; +diff --git a/thrift/lib/thrift/detail/TypeSystemAdapter.h b/thrift/lib/thrift/detail/TypeSystemAdapter.h +index d0672fda36..fe25cbaa8c 100644 +--- a/thrift/lib/thrift/detail/TypeSystemAdapter.h ++++ b/thrift/lib/thrift/detail/TypeSystemAdapter.h +@@ -23,7 +23,7 @@ + + #include + +-#include ++#include + + #include + #include +diff --git a/thrift/test/python_capi/adapter.h b/thrift/test/python_capi/adapter.h +index 9f398ae023..206923e54a 100644 +--- a/thrift/test/python_capi/adapter.h ++++ b/thrift/test/python_capi/adapter.h +@@ -18,7 +18,7 @@ + + #include + +-#include ++#include + #include + + namespace thrift::test::lib { diff --git a/ports/fbthrift/portfile.cmake b/ports/fbthrift/portfile.cmake index 2acd06a86d265a..9bf0e9a6a7b72a 100644 --- a/ports/fbthrift/portfile.cmake +++ b/ports/fbthrift/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( fix-deps.patch folly-has-liburing.diff fix-fmt-include.patch + fix-fmt-header.patch ) file(REMOVE "${SOURCE_PATH}/thrift/cmake/FindGMock.cmake") diff --git a/ports/fbthrift/vcpkg.json b/ports/fbthrift/vcpkg.json index b9d08323f2751a..f44dfd70bb2369 100644 --- a/ports/fbthrift/vcpkg.json +++ b/ports/fbthrift/vcpkg.json @@ -1,6 +1,7 @@ { "name": "fbthrift", "version-string": "2026.02.23.00", + "port-version": 1, "description": "Facebook's branch of Apache Thrift, including a new C++ server.", "homepage": "https://github.com/facebook/fbthrift", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index ee5fd4d00b51f7..54705701871d03 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3014,7 +3014,7 @@ }, "fbthrift": { "baseline": "2026.02.23.00", - "port-version": 0 + "port-version": 1 }, "fcl": { "baseline": "0.7.0", diff --git a/versions/f-/fbthrift.json b/versions/f-/fbthrift.json index 938a315a46eaa3..231d2909d29f93 100644 --- a/versions/f-/fbthrift.json +++ b/versions/f-/fbthrift.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0829ab7055011233d8effe197c2f35db56c54d52", + "version-string": "2026.02.23.00", + "port-version": 1 + }, { "git-tree": "62cd8c41f669b938eb078d7b255ffd0160f53917", "version-string": "2026.02.23.00", From b9124c2c3f758eadc9a731ce58150e0f9577d0a6 Mon Sep 17 00:00:00 2001 From: xiaozhuai <798047000@qq.com> Date: Thu, 18 Jun 2026 13:54:03 +0800 Subject: [PATCH 15/15] Fix baseline --- scripts/ci.feature.baseline.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index 1ccb76b5603f07..72e00749e8a787 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -1412,11 +1412,13 @@ vst3sdk:arm64-linux=fail vtk:arm64-linux=cascade vtk[all]:arm64-linux=cascade vtk[all]:x64-linux=feature-fails # Wait for fix: https://github.com/microsoft/vcpkg/pull/29260 +vtk[all]:x64-windows-static-md=feature-fails # LINK : fatal error LNK1140: limit exceeded for program database vtk[all]:x64-windows-static=cascade # hdf5[parallel] only supports !staticcrt vtk[all](android)=cascade vtk[all](arm64 & windows)=cascade # vtk-m[core] only supports !x86 & !(arm & windows) vtk[all,cuda,mpi,vtkm]:x86-windows=cascade vtk[core,all,atlmfc,cgns,cuda,debugleaks,fontconfig,gdal,geojson,libharu,libtheora,mpi,netcdf,opengl,openmp,openvr,paraview,proj,python,qt,seacas,sql,tbb,utf8,vtkm]:x64-windows-static-md=combination-fails +vtk[core,atlmfc,cgns,cuda,debugleaks,fontconfig,gdal,geojson,libharu,libtheora,mpi,netcdf,opengl,openmp,openvr,paraview,proj,python,qt,seacas,sql,tbb,utf8,vtkm]:x64-windows-static-md=combination-fails vtk[core,python,paraview]:arm64-linux=options # paraview's transitive gfortran linkage breaks python vtk[core,python,paraview]:x64-linux=options # paraview's transitive gfortran linkage breaks python vtk[cuda]:arm64-osx=cascade