mirror of
https://git.yoctoproject.org/poky
synced 2026-04-19 15:32:13 +02:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
35f4253a10
commit
22a5b58b8f
@@ -1,52 +0,0 @@
|
||||
From 6e462b89aa22fd5f737ed162d0150e145ccb1914 Mon Sep 17 00:00:00 2001
|
||||
From: Victor Zverovich <viz@meta.com>
|
||||
Date: Mon, 29 Jul 2024 15:58:05 -0700
|
||||
Subject: [PATCH] Get rid of std::copy
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
Upstream-Status: Backport [https://github.com/fmtlib/fmt/commit/6e462b89aa22fd5f737ed162d0150e145ccb1914]
|
||||
---
|
||||
include/fmt/color.h | 11 +++++------
|
||||
1 file changed, 5 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/include/fmt/color.h b/include/fmt/color.h
|
||||
index f0e9dd94..231d93c8 100644
|
||||
--- a/include/fmt/color.h
|
||||
+++ b/include/fmt/color.h
|
||||
@@ -560,31 +560,30 @@ struct formatter<detail::styled_arg<T>, Char> : formatter<T, Char> {
|
||||
auto format(const detail::styled_arg<T>& arg, FormatContext& ctx) const
|
||||
-> decltype(ctx.out()) {
|
||||
const auto& ts = arg.style;
|
||||
- const auto& value = arg.value;
|
||||
auto out = ctx.out();
|
||||
|
||||
bool has_style = false;
|
||||
if (ts.has_emphasis()) {
|
||||
has_style = true;
|
||||
auto emphasis = detail::make_emphasis<Char>(ts.get_emphasis());
|
||||
- out = std::copy(emphasis.begin(), emphasis.end(), out);
|
||||
+ out = detail::copy<Char>(emphasis.begin(), emphasis.end(), out);
|
||||
}
|
||||
if (ts.has_foreground()) {
|
||||
has_style = true;
|
||||
auto foreground =
|
||||
detail::make_foreground_color<Char>(ts.get_foreground());
|
||||
- out = std::copy(foreground.begin(), foreground.end(), out);
|
||||
+ out = detail::copy<Char>(foreground.begin(), foreground.end(), out);
|
||||
}
|
||||
if (ts.has_background()) {
|
||||
has_style = true;
|
||||
auto background =
|
||||
detail::make_background_color<Char>(ts.get_background());
|
||||
- out = std::copy(background.begin(), background.end(), out);
|
||||
+ out = detail::copy<Char>(background.begin(), background.end(), out);
|
||||
}
|
||||
- out = formatter<T, Char>::format(value, ctx);
|
||||
+ out = formatter<T, Char>::format(arg.value, ctx);
|
||||
if (has_style) {
|
||||
auto reset_color = string_view("\x1b[0m");
|
||||
- out = std::copy(reset_color.begin(), reset_color.end(), out);
|
||||
+ out = detail::copy<Char>(reset_color.begin(), reset_color.end(), out);
|
||||
}
|
||||
return out;
|
||||
}
|
||||
@@ -4,10 +4,8 @@ HOMEPAGE = "https://fmt.dev"
|
||||
LICENSE = "MIT"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=b9257785fc4f3803a4b71b76c1412729"
|
||||
|
||||
SRC_URI = "git://github.com/fmtlib/fmt;branch=master;protocol=https \
|
||||
file://0001-Get-rid-of-std-copy.patch \
|
||||
"
|
||||
SRCREV = "0c9fce2ffefecfdce794e1859584e25877b7b592"
|
||||
SRC_URI = "git://github.com/fmtlib/fmt;branch=master;protocol=https"
|
||||
SRCREV = "e3ddede6c4ee818825c4e5a6dfa1d384860c27d9"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
Reference in New Issue
Block a user