I know this patch is applied but I still want to bring it to attention
Many packages in other layers depend on fmt. fmt's APIs are not or
not used in a very backward compatible way
some packages provide an option to use vendored version of fmt so in
case of system fmt being not compatible is not
a huge issue other than duplication, but some packages e.g. gerbera
rely on system provided fmt and it still has not moved to
11.1
I have tried to fix some of this fall out in meta-openembedded layers
but this kind of stuff comes unplanned, so please build/test
fmt upgrades with more than oe-core, oe-core has 1 recipe ( ccache )
which depends on fmt but meta-openembedded has more complex use cases
of fmt.
On Mon, Jan 6, 2025 at 12:02 AM Robert Yang via lists.openembedded.org
<liezhi.yang=windriver....@lists.openembedded.org> wrote:
>
> From: Robert Yang <liezhi.y...@windriver.com>
>
> Remove backported patch 0001-Get-rid-of-std-copy.patch.
>
> Signed-off-by: Robert Yang <liezhi.y...@windriver.com>
> ---
> .../fmt/fmt/0001-Get-rid-of-std-copy.patch | 52 -------------------
> .../fmt/{fmt_11.0.2.bb => fmt_11.1.1.bb} | 6 +--
> 2 files changed, 2 insertions(+), 56 deletions(-)
> delete mode 100644
> meta/recipes-devtools/fmt/fmt/0001-Get-rid-of-std-copy.patch
> rename meta/recipes-devtools/fmt/{fmt_11.0.2.bb => fmt_11.1.1.bb} (80%)
>
> 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 <v...@meta.com>
> -Date: Mon, 29 Jul 2024 15:58:05 -0700
> -Subject: [PATCH] Get rid of std::copy
> -
> -Signed-off-by: Khem Raj <raj.k...@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;
> - }
> diff --git a/meta/recipes-devtools/fmt/fmt_11.0.2.bb
> b/meta/recipes-devtools/fmt/fmt_11.1.1.bb
> similarity index 80%
> rename from meta/recipes-devtools/fmt/fmt_11.0.2.bb
> rename to 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";
> 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"
>
> --
> 2.44.1
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#209632):
https://lists.openembedded.org/g/openembedded-core/message/209632
Mute This Topic: https://lists.openembedded.org/mt/110453434/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
