diff --git a/ports/fmt/fix-format-conflict.patch b/ports/fmt/fix-format-conflict.patch index 3d97c5c9ef..0a2ac6a57a 100644 --- a/ports/fmt/fix-format-conflict.patch +++ b/ports/fmt/fix-format-conflict.patch @@ -1,8 +1,8 @@ diff --git a/include/fmt/format-inl.h b/include/fmt/format-inl.h -index 2c51c50..fb3eba0 100644 +index f44df01c..59cc4559 100644 --- a/include/fmt/format-inl.h +++ b/include/fmt/format-inl.h -@@ -75,8 +75,8 @@ FMT_FUNC void format_error_code(detail::buffer& out, int error_code, +@@ -62,8 +62,8 @@ FMT_FUNC void format_error_code(detail::buffer& out, int error_code, error_code_size += detail::to_unsigned(detail::count_digits(abs_value)); auto it = buffer_appender(out); if (message.size() <= inline_buffer_size - error_code_size) @@ -13,16 +13,3 @@ index 2c51c50..fb3eba0 100644 FMT_ASSERT(out.size() <= inline_buffer_size, ""); } -diff --git a/src/os.cc b/src/os.cc -index 04b4dc5..fe2c7e4 100644 ---- a/src/os.cc -+++ b/src/os.cc -@@ -167,7 +167,7 @@ void detail::format_windows_error(detail::buffer& out, int error_code, - if (msg) { - utf16_to_utf8 utf8_message; - if (utf8_message.convert(msg) == ERROR_SUCCESS) { -- format_to(buffer_appender(out), "{}: {}", message, utf8_message); -+ fmt::format_to(buffer_appender(out), "{}: {}", message, utf8_message); - return; - } - } diff --git a/ports/fmt/fix-invalid-command.patch b/ports/fmt/fix-invalid-command.patch deleted file mode 100644 index c554188bdd..0000000000 --- a/ports/fmt/fix-invalid-command.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/include/fmt/locale.h b/include/fmt/locale.h -index 7571b52..0a34eb4 100644 ---- a/include/fmt/locale.h -+++ b/include/fmt/locale.h -@@ -1,2 +1,6 @@ - #include "xchar.h" -+#ifdef _WIN32 -+#pragma message ("fmt/locale.h is deprecated, include fmt/format.h or fmt/xchar.h instead") -+#else - #warning fmt/locale.h is deprecated, include fmt/format.h or fmt/xchar.h instead -+#endif diff --git a/ports/fmt/portfile.cmake b/ports/fmt/portfile.cmake index db01678275..33558c894d 100644 --- a/ports/fmt/portfile.cmake +++ b/ports/fmt/portfile.cmake @@ -1,12 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fmtlib/fmt - REF 8.1.1 - SHA512 794a47d7cb352a2a9f2c050a60a46b002e4157e5ad23e15a5afc668e852b1e1847aeee3cda79e266c789ff79310d792060c94976ceef6352e322d60b94e23189 + REF 9.0.0 + SHA512 f9612a53c93654753572ac038e52c683f3485691493750d5c2fdb48f3a769e181bfeab8035041cae02bf14cd67df30ec3c5614d7db913f85699cd9da8072bdf8 HEAD_REF master PATCHES fix-write-batch.patch - fix-invalid-command.patch fix-format-conflict.patch ) diff --git a/ports/fmt/vcpkg.json b/ports/fmt/vcpkg.json index 28a1f11a38..a98bb9a53f 100644 --- a/ports/fmt/vcpkg.json +++ b/ports/fmt/vcpkg.json @@ -1,7 +1,6 @@ { "name": "fmt", - "version": "8.1.1", - "port-version": 2, + "version": "9.0.0", "description": "Formatting library for C++. It can be used as a safe alternative to printf or as a fast alternative to IOStreams.", "homepage": "https://github.com/fmtlib/fmt", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 7f2a86c5bf..6e96a585e1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2325,8 +2325,8 @@ "port-version": 4 }, "fmt": { - "baseline": "8.1.1", - "port-version": 2 + "baseline": "9.0.0", + "port-version": 0 }, "folly": { "baseline": "2022.07.11.00", diff --git a/versions/f-/fmt.json b/versions/f-/fmt.json index 1b05965f08..c03fc52dde 100644 --- a/versions/f-/fmt.json +++ b/versions/f-/fmt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9268e89cdadcbb0a54357f47b343004200970a02", + "version": "9.0.0", + "port-version": 0 + }, { "git-tree": "1f0a5cf3aa202e9833dcc5d3fa36688ecf295ca4", "version": "8.1.1",