From b7f06b5688884636bb7eb0c05e08162c6bcf4a37 Mon Sep 17 00:00:00 2001 From: Othmar Truniger Date: Mon, 8 Jul 2024 21:43:53 +0200 Subject: [PATCH] libfmt: bump to new release 11.0.1 Signed-off-by: Othmar Truniger --- libs/libfmt/Makefile | 6 +++--- libs/libfmt/patches/010-static.patch | 32 ---------------------------- 2 files changed, 3 insertions(+), 35 deletions(-) delete mode 100644 libs/libfmt/patches/010-static.patch diff --git a/libs/libfmt/Makefile b/libs/libfmt/Makefile index 73d3c43296..11fac5a54b 100644 --- a/libs/libfmt/Makefile +++ b/libs/libfmt/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libfmt -PKG_VERSION:=10.2.1 -PKG_RELEASE:=2 +PKG_VERSION:=11.0.1 +PKG_RELEASE:=1 PKG_SOURCE_NAME:=fmt PKG_SOURCE:=$(PKG_SOURCE_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/fmtlib/$(PKG_SOURCE_NAME)/tar.gz/$(PKG_VERSION)? -PKG_HASH:=1250e4cc58bf06ee631567523f48848dc4596133e163f02615c97f78bab6c811 +PKG_HASH:=7d009f7f89ac84c0a83f79ed602463d092fbf66763766a907c97fd02b100f5e9 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_NAME)-$(PKG_VERSION) PKG_MAINTAINER:=Othmar Truniger diff --git a/libs/libfmt/patches/010-static.patch b/libs/libfmt/patches/010-static.patch deleted file mode 100644 index 27bfda2a4f..0000000000 --- a/libs/libfmt/patches/010-static.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 44c3fe1ebb466ab5c296e1a1a6991c7c7b51b72e Mon Sep 17 00:00:00 2001 -From: Victor Zverovich -Date: Fri, 9 Feb 2024 15:58:56 -0800 -Subject: [PATCH] Fix handling of static separator - ---- - include/fmt/format-inl.h | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - ---- a/include/fmt/format-inl.h -+++ b/include/fmt/format-inl.h -@@ -114,7 +114,11 @@ template FMT_FUNC Char d - - FMT_FUNC auto write_loc(appender out, loc_value value, - const format_specs<>& specs, locale_ref loc) -> bool { --#ifndef FMT_STATIC_THOUSANDS_SEPARATOR -+#ifdef FMT_STATIC_THOUSANDS_SEPARATOR -+ value.visit(loc_writer<>{ -+ out, specs, std::string(1, FMT_STATIC_THOUSANDS_SEPARATOR), "\3", "."}); -+ return true; -+#else - auto locale = loc.get(); - // We cannot use the num_put facet because it may produce output in - // a wrong encoding. -@@ -123,7 +127,6 @@ FMT_FUNC auto write_loc(appender out, lo - return std::use_facet(locale).put(out, value, specs); - return facet(locale).put(out, value, specs); - #endif -- return false; - } - } // namespace detail -