Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[fmt] Update to 9.0.0 #25658

Merged
merged 4 commits into from
Aug 4, 2022
Merged

[fmt] Update to 9.0.0 #25658

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
986dc08
[fmt] Update to 9.0.0
spnda Jul 9, 2022
847f6af
Merge branch 'master' of https://github.com/microsoft/vcpkg into fmt_…
FrankXie05 Aug 4, 2022
d31ecee
update version
FrankXie05 Aug 4, 2022
a37cc12
write version
FrankXie05 Aug 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 2 additions & 15 deletions ports/fmt/fix-format-conflict.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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<char>& out, int error_code,
@@ -62,8 +62,8 @@ FMT_FUNC void format_error_code(detail::buffer<char>& out, int error_code,
error_code_size += detail::to_unsigned(detail::count_digits(abs_value));
auto it = buffer_appender<char>(out);
if (message.size() <= inline_buffer_size - error_code_size)
Expand All @@ -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<char>& out, int error_code,
if (msg) {
utf16_to_utf8 utf8_message;
if (utf8_message.convert(msg) == ERROR_SUCCESS) {
- format_to(buffer_appender<char>(out), "{}: {}", message, utf8_message);
+ fmt::format_to(buffer_appender<char>(out), "{}: {}", message, utf8_message);
return;
}
}
11 changes: 0 additions & 11 deletions ports/fmt/fix-invalid-command.patch
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions ports/fmt/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
)

Expand Down
2 changes: 1 addition & 1 deletion ports/fmt/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "fmt",
"version": "8.1.1",
"version": "9.0.0",
"port-version": 2,
FrankXie05 marked this conversation as resolved.
Show resolved Hide resolved
"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",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2325,7 +2325,7 @@
"port-version": 4
},
"fmt": {
"baseline": "8.1.1",
"baseline": "9.0.0",
"port-version": 2
},
"folly": {
Expand Down
5 changes: 5 additions & 0 deletions versions/f-/fmt.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9c3c7bc7c4098e18fa1403c9596fd64d442403c0",
"version": "9.0.0",
"port-version": 2
},
{
"git-tree": "1f0a5cf3aa202e9833dcc5d3fa36688ecf295ca4",
"version": "8.1.1",
Expand Down