From a3f2ea0f3443180a6d93a1bcd679f90dfea0ae48 Mon Sep 17 00:00:00 2001 From: toge Date: Mon, 22 Sep 2025 20:58:48 +0900 Subject: [PATCH] [fmt] update to 12.0.0 (#47408) --- ports/fmt/portfile.cmake | 2 +- ports/fmt/vcpkg.json | 2 +- ports/seacas/portfile.cmake | 1 + ports/seacas/use-std-localtime.patch | 32 +++++++++++++++++++++++++ ports/seacas/vcpkg.json | 2 +- ports/simpleble/portfile.cmake | 2 ++ ports/simpleble/use-std-localtime.patch | 16 +++++++++++++ ports/simpleble/vcpkg.json | 2 +- versions/baseline.json | 6 ++--- versions/f-/fmt.json | 5 ++++ versions/s-/seacas.json | 5 ++++ versions/s-/simpleble.json | 5 ++++ 12 files changed, 73 insertions(+), 7 deletions(-) create mode 100644 ports/seacas/use-std-localtime.patch create mode 100644 ports/simpleble/use-std-localtime.patch diff --git a/ports/fmt/portfile.cmake b/ports/fmt/portfile.cmake index 81fd4ff405..b5a837456e 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 46974efd36e613477351aa357c451cee434da797c2a505f9f86d73e394dcb35dc2dc0cda66abb98c023e8f24deac9d8e3ee6f9f6c0971cc4c00e37c34aa7f15f + SHA512 c4ab814c20fbad7e3f0ae169125a4988a2795631194703251481dc36b18da65c886c4faa9acd046b0a295005217b3689eb0126108a9ba5aac2ca909aae263c2f HEAD_REF master ) diff --git a/ports/fmt/vcpkg.json b/ports/fmt/vcpkg.json index 13dc66de9f..9ee1d82cf3 100644 --- a/ports/fmt/vcpkg.json +++ b/ports/fmt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fmt", - "version": "11.2.0", + "version": "12.0.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/ports/seacas/portfile.cmake b/ports/seacas/portfile.cmake index 93d37b604a..2d42c1bc99 100644 --- a/ports/seacas/portfile.cmake +++ b/ports/seacas/portfile.cmake @@ -12,6 +12,7 @@ vcpkg_from_github( fix-fmt-10.patch fix-build-error-with-fmt11.patch netcdf-c.diff + use-std-localtime.patch ) file(REMOVE "${SOURCE_PATH}/cmake/tribits/common_tpls/find_modules/FindHDF5.cmake") diff --git a/ports/seacas/use-std-localtime.patch b/ports/seacas/use-std-localtime.patch new file mode 100644 index 0000000000..9e17333bf8 --- /dev/null +++ b/ports/seacas/use-std-localtime.patch @@ -0,0 +1,32 @@ +diff --git a/packages/seacas/libraries/ioss/src/Ioss_Utils.C b/packages/seacas/libraries/ioss/src/Ioss_Utils.C +index 241ff80..2d3df83 100644 +--- a/packages/seacas/libraries/ioss/src/Ioss_Utils.C ++++ b/packages/seacas/libraries/ioss/src/Ioss_Utils.C +@@ -163,14 +163,27 @@ std::ostream &Ioss::Utils::get_debug_stream() { return *m_debugStream; } + void Ioss::Utils::time_and_date(char *time_string, char *date_string, size_t length) + { + std::time_t t = std::time(nullptr); ++#if FMT_VERSION < 120000 + std::string time = fmt::format("{:%H:%M:%S}", fmt::localtime(t)); ++#else ++ std::string time = fmt::format("{:%H:%M:%S}", *std::localtime(&t)); ++#endif + std::string date; ++#if FMT_VERSION < 120000 + if (length >= 10) { + date = fmt::format("{:%Y/%m/%d}", fmt::localtime(t)); + } + else { + date = fmt::format("{:%y/%m/%d}", fmt::localtime(t)); + } ++#else ++ if (length >= 10) { ++ date = fmt::format("{:%Y/%m/%d}", *std::localtime(&t)); ++ } ++ else { ++ date = fmt::format("{:%y/%m/%d}", *std::localtime(&t)); ++ } ++#endif + copy_string(time_string, time, 9); + copy_string(date_string, date, length + 1); + } diff --git a/ports/seacas/vcpkg.json b/ports/seacas/vcpkg.json index 812a40e3e0..db67b8c7a3 100644 --- a/ports/seacas/vcpkg.json +++ b/ports/seacas/vcpkg.json @@ -1,7 +1,7 @@ { "name": "seacas", "version-date": "2022-11-22", - "port-version": 9, + "port-version": 10, "description": "The Sandia Engineering Analysis Code Access System (SEACAS) is a suite of preprocessing, postprocessing, translation, and utility applications supporting finite element analysis software using the Exodus database file format.", "homepage": "https://github.com/sandialabs/seacas", "license": null, diff --git a/ports/simpleble/portfile.cmake b/ports/simpleble/portfile.cmake index 26ee719df3..6606b1567a 100644 --- a/ports/simpleble/portfile.cmake +++ b/ports/simpleble/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( HEAD_REF main REF a07397dbdd7f8149b7b235b5b21b88b60e8cfbed SHA512 19b61093f529c37f6309c51b53499d86c45a7c3e2e6e8c619c191e40dac713ec1dafdf2a21f81bb9cb9ba6254ab226bd331ee7582facb84ef7756824ffa3eaa8 + PATCHES + use-std-localtime.patch ) vcpkg_cmake_configure( diff --git a/ports/simpleble/use-std-localtime.patch b/ports/simpleble/use-std-localtime.patch new file mode 100644 index 0000000000..a4e75783d2 --- /dev/null +++ b/ports/simpleble/use-std-localtime.patch @@ -0,0 +1,16 @@ +diff --git a/simpleble/src/Logging.cpp b/simpleble/src/Logging.cpp +index 781b658..6b05e44 100644 +--- a/simpleble/src/Logging.cpp ++++ b/simpleble/src/Logging.cpp +@@ -90,7 +90,11 @@ void Logger::log_default_stdout() { + + void Logger::log_default_file() { + std::time_t t = std::time(nullptr); ++#if FMT_VERSION < 120000 + std::string date_time_str = fmt::format("{:%Y-%m-%d_%H-%M-%S}", fmt::localtime(t)); ++#else ++ std::string date_time_str = fmt::format("{:%Y-%m-%d_%H-%M-%S}", *std::localtime(&t)); ++#endif + std::string filename = fmt::format("simpleble_{}", date_time_str); + log_default_file(filename); + } diff --git a/ports/simpleble/vcpkg.json b/ports/simpleble/vcpkg.json index 49450c536a..447fd7b64e 100644 --- a/ports/simpleble/vcpkg.json +++ b/ports/simpleble/vcpkg.json @@ -1,7 +1,7 @@ { "name": "simpleble", "version-date": "2023-07-29", - "port-version": 1, + "port-version": 2, "description": "The ultimate fully-fledged cross-platform library and bindings for Bluetooth Low Energy (BLE).", "homepage": "https://github.com/OpenBluetoothToolbox/SimpleBLE", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index eabfb1aa79..c6aaf10470 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3009,7 +3009,7 @@ "port-version": 2 }, "fmt": { - "baseline": "11.2.0", + "baseline": "12.0.0", "port-version": 0 }, "folly": { @@ -8742,7 +8742,7 @@ }, "seacas": { "baseline": "2022-11-22", - "port-version": 9 + "port-version": 10 }, "seal": { "baseline": "4.1.2", @@ -8914,7 +8914,7 @@ }, "simpleble": { "baseline": "2023-07-29", - "port-version": 1 + "port-version": 2 }, "simpleini": { "baseline": "4.22", diff --git a/versions/f-/fmt.json b/versions/f-/fmt.json index 20ed2e0e4f..9d0906d47e 100644 --- a/versions/f-/fmt.json +++ b/versions/f-/fmt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c5dcb90bc1da6e7ba3d6e62e62a0b7df3192f51c", + "version": "12.0.0", + "port-version": 0 + }, { "git-tree": "ca5dee1adce3bf5b2f190e77927992bacb6d4d48", "version": "11.2.0", diff --git a/versions/s-/seacas.json b/versions/s-/seacas.json index 6d161f5db8..939e12c84d 100644 --- a/versions/s-/seacas.json +++ b/versions/s-/seacas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "86c3232b378d2d2eac4fc8cc009993c6c0960685", + "version-date": "2022-11-22", + "port-version": 10 + }, { "git-tree": "3dbaf07cc4fc861f7df33e5ec63e6045ce5e782f", "version-date": "2022-11-22", diff --git a/versions/s-/simpleble.json b/versions/s-/simpleble.json index ea47c4eac2..09dd5f0ec0 100644 --- a/versions/s-/simpleble.json +++ b/versions/s-/simpleble.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eace68173b736769b5ba2ca8be06a2926c4dcc4d", + "version-date": "2023-07-29", + "port-version": 2 + }, { "git-tree": "f09680916652ad54c2b0483d86617130aaeed005", "version-date": "2023-07-29",