summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2025-01-06 00:02:12 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-01-08 13:25:11 +0000
commit22a5b58b8fa1b91d2f0f7929de93b20c5ffa3833 (patch)
tree2c3cd993af3340919580f29b4c2aaac8085844e7
parent35f4253a10eb9e77f10236134892d7d347e52540 (diff)
downloadpoky-22a5b58b8fa1b91d2f0f7929de93b20c5ffa3833.tar.gz
fmt: 11.0.2 -> 11.1.1
Remove backported patch 0001-Get-rid-of-std-copy.patch. (From OE-Core rev: 659d71114c3f2f12e4e3012d66580866486e14c0) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/fmt/fmt/0001-Get-rid-of-std-copy.patch52
-rw-r--r--meta/recipes-devtools/fmt/fmt_11.1.1.bb (renamed from meta/recipes-devtools/fmt/fmt_11.0.2.bb)6
2 files changed, 2 insertions, 56 deletions
diff --git a/meta/recipes-devtools/fmt/fmt/0001-Get-rid-of-std-copy.patch b/meta/recipes-devtools/fmt/fmt/0001-Get-rid-of-std-copy.patch
deleted file mode 100644
index 1b495ea075..0000000000
--- a/meta/recipes-devtools/fmt/fmt/0001-Get-rid-of-std-copy.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1From 6e462b89aa22fd5f737ed162d0150e145ccb1914 Mon Sep 17 00:00:00 2001
2From: Victor Zverovich <viz@meta.com>
3Date: Mon, 29 Jul 2024 15:58:05 -0700
4Subject: [PATCH] Get rid of std::copy
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7Upstream-Status: Backport [https://github.com/fmtlib/fmt/commit/6e462b89aa22fd5f737ed162d0150e145ccb1914]
8---
9 include/fmt/color.h | 11 +++++------
10 1 file changed, 5 insertions(+), 6 deletions(-)
11
12diff --git a/include/fmt/color.h b/include/fmt/color.h
13index f0e9dd94..231d93c8 100644
14--- a/include/fmt/color.h
15+++ b/include/fmt/color.h
16@@ -560,31 +560,30 @@ struct formatter<detail::styled_arg<T>, Char> : formatter<T, Char> {
17 auto format(const detail::styled_arg<T>& arg, FormatContext& ctx) const
18 -> decltype(ctx.out()) {
19 const auto& ts = arg.style;
20- const auto& value = arg.value;
21 auto out = ctx.out();
22
23 bool has_style = false;
24 if (ts.has_emphasis()) {
25 has_style = true;
26 auto emphasis = detail::make_emphasis<Char>(ts.get_emphasis());
27- out = std::copy(emphasis.begin(), emphasis.end(), out);
28+ out = detail::copy<Char>(emphasis.begin(), emphasis.end(), out);
29 }
30 if (ts.has_foreground()) {
31 has_style = true;
32 auto foreground =
33 detail::make_foreground_color<Char>(ts.get_foreground());
34- out = std::copy(foreground.begin(), foreground.end(), out);
35+ out = detail::copy<Char>(foreground.begin(), foreground.end(), out);
36 }
37 if (ts.has_background()) {
38 has_style = true;
39 auto background =
40 detail::make_background_color<Char>(ts.get_background());
41- out = std::copy(background.begin(), background.end(), out);
42+ out = detail::copy<Char>(background.begin(), background.end(), out);
43 }
44- out = formatter<T, Char>::format(value, ctx);
45+ out = formatter<T, Char>::format(arg.value, ctx);
46 if (has_style) {
47 auto reset_color = string_view("\x1b[0m");
48- out = std::copy(reset_color.begin(), reset_color.end(), out);
49+ out = detail::copy<Char>(reset_color.begin(), reset_color.end(), out);
50 }
51 return out;
52 }
diff --git a/meta/recipes-devtools/fmt/fmt_11.0.2.bb b/meta/recipes-devtools/fmt/fmt_11.1.1.bb
index 5c60921efa..a99a377ad4 100644
--- a/meta/recipes-devtools/fmt/fmt_11.0.2.bb
+++ b/meta/recipes-devtools/fmt/fmt_11.1.1.bb
@@ -4,10 +4,8 @@ HOMEPAGE = "https://fmt.dev"
4LICENSE = "MIT" 4LICENSE = "MIT"
5LIC_FILES_CHKSUM = "file://LICENSE;md5=b9257785fc4f3803a4b71b76c1412729" 5LIC_FILES_CHKSUM = "file://LICENSE;md5=b9257785fc4f3803a4b71b76c1412729"
6 6
7SRC_URI = "git://github.com/fmtlib/fmt;branch=master;protocol=https \ 7SRC_URI = "git://github.com/fmtlib/fmt;branch=master;protocol=https"
8 file://0001-Get-rid-of-std-copy.patch \ 8SRCREV = "e3ddede6c4ee818825c4e5a6dfa1d384860c27d9"
9 "
10SRCREV = "0c9fce2ffefecfdce794e1859584e25877b7b592"
11 9
12S = "${WORKDIR}/git" 10S = "${WORKDIR}/git"
13 11