diff --git a/ports/fmt/fix-format-conflict.patch b/ports/fmt/fix-format-conflict.patch deleted file mode 100644 index 0a2ac6a57a24da..00000000000000 --- a/ports/fmt/fix-format-conflict.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/include/fmt/format-inl.h b/include/fmt/format-inl.h -index f44df01c..59cc4559 100644 ---- a/include/fmt/format-inl.h -+++ b/include/fmt/format-inl.h -@@ -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) -- format_to(it, FMT_STRING("{}{}"), message, SEP); -- format_to(it, FMT_STRING("{}{}"), ERROR_STR, error_code); -+ fmt::format_to(it, FMT_STRING("{}{}"), message, SEP); -+ fmt::format_to(it, FMT_STRING("{}{}"), ERROR_STR, error_code); - FMT_ASSERT(out.size() <= inline_buffer_size, ""); - } - diff --git a/ports/fmt/portfile.cmake b/ports/fmt/portfile.cmake index db7a08bd14ad2e..2675715cce36d6 100644 --- a/ports/fmt/portfile.cmake +++ b/ports/fmt/portfile.cmake @@ -2,11 +2,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fmtlib/fmt REF "${VERSION}" - SHA512 288c349baac5f96f527d5b1bed0fa5f031aa509b4526560c684281388e91909a280c3262a2474d963b5d1bf7064b1c9930c6677fe54a0d8f86982d063296a54c + SHA512 b90f8ab1692fcae9146f8cad5c5c26a2b5ceb6a0460003e01cabe8a75c0aa2fea1c3760dc3214eddaf08984a1695747ea8b1f3124c40c54cbadfd45458fa4b2d HEAD_REF master PATCHES fix-write-batch.patch - fix-format-conflict.patch ) vcpkg_cmake_configure( @@ -35,4 +34,4 @@ file(REMOVE_RECURSE ) file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.rst") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/fmt/vcpkg.json b/ports/fmt/vcpkg.json index acf9fd0885e22c..34d29aa44f3a0e 100644 --- a/ports/fmt/vcpkg.json +++ b/ports/fmt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fmt", - "version": "10.1.1", + "version": "10.2.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": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 6ee3e4b2712f13..e70b38cc34589a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2713,7 +2713,7 @@ "port-version": 2 }, "fmt": { - "baseline": "10.1.1", + "baseline": "10.2.0", "port-version": 0 }, "folly": { diff --git a/versions/f-/fmt.json b/versions/f-/fmt.json index 009a8810507334..f7bf20d6779cbd 100644 --- a/versions/f-/fmt.json +++ b/versions/f-/fmt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f91bb86075f45f6fad0c35ab9e87d8ea43c9d389", + "version": "10.2.0", + "port-version": 0 + }, { "git-tree": "dfe9aa860f5a8317f341a21d317be1cf44e89f18", "version": "10.1.1",