diff --git a/.gitignore b/.gitignore index d2cb30c..91572d9 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /8.1.0.tar.gz /8.1.1.tar.gz /9.0.0.tar.gz +/9.1.0.tar.gz diff --git a/fmt-float-fixes-on-32-bit-arches.patch b/fmt-float-fixes-on-32-bit-arches.patch deleted file mode 100644 index 6131476..0000000 --- a/fmt-float-fixes-on-32-bit-arches.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 2a1b3ac629bfec51ce70d3c0ebaf28e706754e19 Mon Sep 17 00:00:00 2001 -From: Victor Zverovich -Date: Sun, 10 Jul 2022 08:14:18 -0700 -Subject: [PATCH] Fix large shift in uint128_fallback - ---- - include/fmt/format.h | 2 ++ - test/format-test.cc | 4 +++- - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/include/fmt/format.h b/include/fmt/format.h -index 0bd2fdb182..6516975e2f 100644 ---- a/include/fmt/format.h -+++ b/include/fmt/format.h -@@ -366,10 +366,12 @@ class uint128_fallback { - } - FMT_CONSTEXPR auto operator>>(int shift) const -> uint128_fallback { - if (shift == 64) return {0, hi_}; -+ if (shift > 64) return uint128_fallback(0, hi_) >> (shift - 64); - return {hi_ >> shift, (hi_ << (64 - shift)) | (lo_ >> shift)}; - } - FMT_CONSTEXPR auto operator<<(int shift) const -> uint128_fallback { - if (shift == 64) return {lo_, 0}; -+ if (shift > 64) return uint128_fallback(lo_, 0) << (shift - 64); - return {hi_ << shift | (lo_ >> (64 - shift)), (lo_ << shift)}; - } - FMT_CONSTEXPR auto operator>>=(int shift) -> uint128_fallback& { -diff --git a/test/format-test.cc b/test/format-test.cc -index 45a92624fb..8c1c305f78 100644 ---- a/test/format-test.cc -+++ b/test/format-test.cc -@@ -59,6 +59,8 @@ TEST(uint128_test, shift) { - EXPECT_EQ(static_cast(n), 0x8000000000000000); - n = n >> 62; - EXPECT_EQ(static_cast(n), 42); -+ EXPECT_EQ(uint128_fallback(1) << 112, uint128_fallback(0x1000000000000, 0)); -+ EXPECT_EQ(uint128_fallback(0x1000000000000, 0) >> 112, uint128_fallback(1)); - } - - TEST(uint128_test, minus) { -@@ -234,7 +236,7 @@ TEST(util_test, format_system_error) { - throws_on_alloc = true; - } - if (!throws_on_alloc) { -- fmt::print("warning: std::allocator allocates {} chars", max_size); -+ fmt::print("warning: std::allocator allocates {} chars\n", max_size); - return; - } - } diff --git a/fmt-use-float128-definition.patch b/fmt-use-float128-definition.patch deleted file mode 100644 index 5fa8307..0000000 --- a/fmt-use-float128-definition.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 05be7a0764f8fbfbdf9c9750ec54d49fe3d2419f Mon Sep 17 00:00:00 2001 -From: Victor Zverovich -Date: Sun, 10 Jul 2022 08:47:16 -0700 -Subject: [PATCH] Use FMT_USE_FLOAT128 instead of __SIZEOF_FLOAT128__ - ---- - test/format-test.cc | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/test/format-test.cc b/test/format-test.cc -index 8c1c305f78..4ec7c838b7 100644 ---- a/test/format-test.cc -+++ b/test/format-test.cc -@@ -101,7 +101,7 @@ template void check_isfinite() { - - TEST(float_test, isfinite) { - check_isfinite(); --#ifdef __SIZEOF_FLOAT128__ -+#if FMT_USE_FLOAT128 - check_isfinite(); - #endif - } -@@ -122,7 +122,7 @@ template void check_isnan() { - - TEST(float_test, isnan) { - check_isnan(); --#ifdef __SIZEOF_FLOAT128__ -+#if FMT_USE_FLOAT128 - check_isnan(); - #endif - } diff --git a/fmt.spec b/fmt.spec index 092308f..7726933 100644 --- a/fmt.spec +++ b/fmt.spec @@ -1,17 +1,12 @@ Name: fmt -Version: 9.0.0 -Release: 2%{?dist} +Version: 9.1.0 +Release: 1%{?dist} License: BSD Summary: Small, safe and fast formatting library for C++ URL: https://github.com/fmtlib/%{name} Source0: %{url}/archive/%{version}.tar.gz -# https://github.com/fmtlib/fmt/commit/2a1b3ac629bfec51ce70d3c0ebaf28e706754e19 -Patch100: %{name}-float-fixes-on-32-bit-arches.patch -# https://github.com/fmtlib/fmt/commit/05be7a0764f8fbfbdf9c9750ec54d49fe3d2419f -Patch101: %{name}-use-float128-definition.patch - BuildRequires: cmake BuildRequires: gcc BuildRequires: gcc-c++ @@ -65,6 +60,9 @@ This package contains the header file for using %{name}. %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sun Aug 28 2022 Vitaly Zaitsev - 9.1.0-1 +- Updated to version 9.1.0. + * Thu Jul 21 2022 Fedora Release Engineering - 9.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index b9191e7..75592a1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (9.0.0.tar.gz) = f9612a53c93654753572ac038e52c683f3485691493750d5c2fdb48f3a769e181bfeab8035041cae02bf14cd67df30ec3c5614d7db913f85699cd9da8072bdf8 +SHA512 (9.1.0.tar.gz) = a18442042722dd48e20714ec034a12fcc0576c9af7be5188586970e2edf47529825bdc99af366b1d5891630c8dbf6f63bfa9f012e77ab3d3ed80d1a118e3b2be