Compare commits

..

1 Commits
epel9 ... i10ce

Author SHA1 Message Date
Arkady L. Shane cb09d4ed01
import fmt-10.2.1-5.el10
2 months ago

@ -0,0 +1 @@
d223964b782d2562d6722ffe67027204c6035453 SOURCES/10.2.1.tar.gz

18
.gitignore vendored

@ -1,17 +1 @@
/fmt-3.0.0.zip
/fmt-3.0.1.zip
/fmt-3.0.1.tar.gz
/fmt-3.0.2.tar.gz
/5.2.1.tar.gz
/5.3.0.tar.gz
/6.1.2.tar.gz
/6.2.0.tar.gz
/6.2.1.tar.gz
/7.0.1.tar.gz
/7.0.2.tar.gz
/7.0.3.tar.gz
/7.1.2.tar.gz
/7.1.3.tar.gz
/8.0.1.tar.gz
/8.1.0.tar.gz
/8.1.1.tar.gz
SOURCES/10.2.1.tar.gz

@ -1,17 +1,12 @@
%undefine __cmake_in_source_build
Name: fmt
Version: 8.1.1
Version: 10.2.1
Release: 5%{?dist}
License: BSD
License: MIT
Summary: Small, safe and fast formatting library for C++
URL: https://github.com/fmtlib/%{name}
Source0: %{url}/archive/%{version}.tar.gz
# fix for https://github.com/fmtlib/fmt/issues/2717
Patch100: %{name}-fix_implicit_ptr_conv.patch
BuildRequires: cmake
BuildRequires: gcc
BuildRequires: gcc-c++
@ -28,6 +23,8 @@ safe alternative to printf or as a fast alternative to IOStreams.
%package devel
Summary: Development files for %{name}
Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
# for usage with -DFMT_HEADER_ONLY
Provides: %{name}-static = %{?epoch:%{epoch}:}%{version}-%{release}
# This package replaces the old name of cppformat
Provides: cppformat-devel = %{?epoch:%{epoch}:}%{version}-%{release}
@ -54,9 +51,9 @@ This package contains the header file for using %{name}.
%ctest
%files
%license LICENSE.rst
%doc ChangeLog.rst README.rst
%{_libdir}/lib%{name}.so.8*
%license LICENSE
%doc ChangeLog.md README.md
%{_libdir}/lib%{name}.so.10*
%files devel
%{_includedir}/%{name}
@ -65,6 +62,52 @@ This package contains the header file for using %{name}.
%{_libdir}/pkgconfig/%{name}.pc
%changelog
* Sat Dec 14 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 10.2.1-5
- Rebuilt for MSVSphere 10
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 10.2.1-5
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 10.2.1-4
- Bump release for June 2024 mass rebuild
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 10.2.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 10.2.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Jan 17 2024 Kefu Chai <tchaikov@gmail.com> - 10.2.1-1
- Updated to version 10.2.1.
* Wed Nov 15 2023 Kefu Chai <tchaikov@gmail.com> - 10.1.1-1
- Updated to version 10.1.1.
* Thu Aug 03 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 10.0.0-4
- Add Provides: fmt-static to fmt-devel
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 10.0.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Wed Jun 28 2023 Vitaly Zaitsev <vitaly@easycoding.org> - 10.0.0-2
- Added upstream patch with time_point fixes.
* Wed May 10 2023 Vitaly Zaitsev <vitaly@easycoding.org> - 10.0.0-1
- Updated to version 10.0.0.
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 9.1.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sun Aug 28 2022 Vitaly Zaitsev <vitaly@easycoding.org> - 9.1.0-1
- Updated to version 9.1.0.
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Wed Jul 06 2022 Vitaly Zaitsev <vitaly@easycoding.org> - 9.0.0-1
- Updated to version 9.0.0.
* Wed Mar 02 2022 Vitaly Zaitsev <vitaly@easycoding.org> - 8.1.1-5
- Removed obsolete macros.

@ -1,72 +0,0 @@
From 8f8a1a02d5c5cb967d240feee3ffac00d66f22a2 Mon Sep 17 00:00:00 2001
From: Victor Zverovich <viz@fb.com>
Date: Fri, 14 Jan 2022 13:08:14 -0800
Subject: [PATCH] Fix handling of formattable types implicitly convertible to
pointers
---
include/fmt/core.h | 5 +++--
test/core-test.cc | 21 ++++++++++++++++++++-
2 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/include/fmt/core.h b/include/fmt/core.h
index f2d21e5c5a..12571ce0da 100644
--- a/include/fmt/core.h
+++ b/include/fmt/core.h
@@ -1398,10 +1398,11 @@ template <typename Context> struct arg_mapper {
template <
typename T,
FMT_ENABLE_IF(
- std::is_member_pointer<T>::value ||
+ std::is_pointer<T>::value || std::is_member_pointer<T>::value ||
std::is_function<typename std::remove_pointer<T>::type>::value ||
(std::is_convertible<const T&, const void*>::value &&
- !std::is_convertible<const T&, const char_type*>::value))>
+ !std::is_convertible<const T&, const char_type*>::value &&
+ !has_formatter<T, Context>::value))>
FMT_CONSTEXPR auto map(const T&) -> unformattable_pointer {
return {};
}
diff --git a/test/core-test.cc b/test/core-test.cc
index b2f2097ea1..c9eea8ffd8 100644
--- a/test/core-test.cc
+++ b/test/core-test.cc
@@ -737,6 +737,24 @@ struct convertible_to_pointer {
operator const int*() const { return nullptr; }
};
+struct convertible_to_pointer_formattable {
+ operator const int*() const { return nullptr; }
+};
+
+FMT_BEGIN_NAMESPACE
+template <> struct formatter<convertible_to_pointer_formattable> {
+ auto parse(format_parse_context& ctx) -> decltype(ctx.begin()) {
+ return ctx.begin();
+ }
+
+ auto format(convertible_to_pointer_formattable, format_context& ctx) const
+ -> decltype(ctx.out()) {
+ auto test = string_view("test");
+ return std::copy_n(test.data(), test.size(), ctx.out());
+ }
+};
+FMT_END_NAMESPACE
+
enum class test_scoped_enum {};
TEST(core_test, is_formattable) {
@@ -770,11 +788,12 @@ TEST(core_test, is_formattable) {
#endif
static_assert(!fmt::is_formattable<convertible_to_pointer>::value, "");
+ const auto f = convertible_to_pointer_formattable();
+ EXPECT_EQ(fmt::format("{}", f), "test");
static_assert(!fmt::is_formattable<void (*)()>::value, "");
struct s;
-
static_assert(!fmt::is_formattable<int(s::*)>::value, "");
static_assert(!fmt::is_formattable<int (s::*)()>::value, "");
static_assert(!fmt::is_formattable<test_scoped_enum>::value, "");

@ -1 +0,0 @@
SHA512 (8.1.1.tar.gz) = 794a47d7cb352a2a9f2c050a60a46b002e4157e5ad23e15a5afc668e852b1e1847aeee3cda79e266c789ff79310d792060c94976ceef6352e322d60b94e23189
Loading…
Cancel
Save