From 22a5b58b8fa1b91d2f0f7929de93b20c5ffa3833 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Mon, 6 Jan 2025 00:02:12 -0800 Subject: 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 Signed-off-by: Richard Purdie --- .../fmt/fmt/0001-Get-rid-of-std-copy.patch | 52 ---------------------- meta/recipes-devtools/fmt/fmt_11.0.2.bb | 18 -------- meta/recipes-devtools/fmt/fmt_11.1.1.bb | 16 +++++++ 3 files changed, 16 insertions(+), 70 deletions(-) delete mode 100644 meta/recipes-devtools/fmt/fmt/0001-Get-rid-of-std-copy.patch delete mode 100644 meta/recipes-devtools/fmt/fmt_11.0.2.bb create mode 100644 meta/recipes-devtools/fmt/fmt_11.1.1.bb 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 @@ -From 6e462b89aa22fd5f737ed162d0150e145ccb1914 Mon Sep 17 00:00:00 2001 -From: Victor Zverovich -Date: Mon, 29 Jul 2024 15:58:05 -0700 -Subject: [PATCH] Get rid of std::copy - -Signed-off-by: Khem Raj -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, Char> : formatter { - auto format(const detail::styled_arg& 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(ts.get_emphasis()); -- out = std::copy(emphasis.begin(), emphasis.end(), out); -+ out = detail::copy(emphasis.begin(), emphasis.end(), out); - } - if (ts.has_foreground()) { - has_style = true; - auto foreground = - detail::make_foreground_color(ts.get_foreground()); -- out = std::copy(foreground.begin(), foreground.end(), out); -+ out = detail::copy(foreground.begin(), foreground.end(), out); - } - if (ts.has_background()) { - has_style = true; - auto background = - detail::make_background_color(ts.get_background()); -- out = std::copy(background.begin(), background.end(), out); -+ out = detail::copy(background.begin(), background.end(), out); - } -- out = formatter::format(value, ctx); -+ out = formatter::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(reset_color.begin(), reset_color.end(), out); - } - return out; - } diff --git a/meta/recipes-devtools/fmt/fmt_11.0.2.bb b/meta/recipes-devtools/fmt/fmt_11.0.2.bb deleted file mode 100644 index 5c60921efa..0000000000 --- a/meta/recipes-devtools/fmt/fmt_11.0.2.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "open-source formatting library for C++" -DESCRIPTION = "{fmt} is an open-source formatting library for C++. It can be used as a safe and fast alternative to (s)printf and iostreams." -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" - -S = "${WORKDIR}/git" - -inherit cmake - -EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-devtools/fmt/fmt_11.1.1.bb b/meta/recipes-devtools/fmt/fmt_11.1.1.bb new file mode 100644 index 0000000000..a99a377ad4 --- /dev/null +++ b/meta/recipes-devtools/fmt/fmt_11.1.1.bb @@ -0,0 +1,16 @@ +SUMMARY = "open-source formatting library for C++" +DESCRIPTION = "{fmt} is an open-source formatting library for C++. It can be used as a safe and fast alternative to (s)printf and iostreams." +HOMEPAGE = "https://fmt.dev" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b9257785fc4f3803a4b71b76c1412729" + +SRC_URI = "git://github.com/fmtlib/fmt;branch=master;protocol=https" +SRCREV = "e3ddede6c4ee818825c4e5a6dfa1d384860c27d9" + +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf