Accepting request 1237052 from devel:libraries:c_c++

- Add 0001-Restore-ABI-compatibility.patch [boo#1235078]

OBS-URL: https://build.opensuse.org/request/show/1237052
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fmt?expand=0&rev=28

0001-Restore-ABI-compatibility.patch

@@ -0,0 +1,218 @@
+From 21aa0956d43297667762cf79347e4cda76ea3521 Mon Sep 17 00:00:00 2001
+From: Victor Zverovich <viz@meta.com>
+Date: Fri, 10 Jan 2025 17:19:20 -0800
+Subject: [PATCH] Restore ABI compatibility
+References: https://github.com/fmtlib/fmt/issues/4292
+
+---
+ doc/api.md               |  6 +++---
+ include/fmt/base.h       |  4 +---
+ include/fmt/format-inl.h |  2 +-
+ include/fmt/format.h     | 43 ++++++++++++++++++++++++++--------------
+ include/fmt/xchar.h      | 27 +++++++++++++++----------
+ 5 files changed, 49 insertions(+), 33 deletions(-)
+
+diff --git a/doc/api.md b/doc/api.md
+index e86f0b06..80296ea4 100644
+--- a/doc/api.md
++++ b/doc/api.md
+@@ -413,11 +413,11 @@ locale:
+ that take `std::locale` as a parameter. The locale type is a template
+ parameter to avoid the expensive `<locale>` include.
+ 
+-::: format(detail::locale_ref, format_string<T...>, T&&...)
++::: format(const Locale&, format_string<T...>, T&&...)
+ 
+-::: format_to(OutputIt, detail::locale_ref, format_string<T...>, T&&...)
++::: format_to(OutputIt, const Locale&, format_string<T...>, T&&...)
+ 
+-::: formatted_size(detail::locale_ref, format_string<T...>, T&&...)
++::: formatted_size(const Locale&, format_string<T...>, T&&...)
+ 
+ <a id="legacy-checks"></a>
+ ### Legacy Compile-Time Checks
+diff --git a/include/fmt/base.h b/include/fmt/base.h
+index a6948d40..e5773c87 100644
+--- a/include/fmt/base.h
++++ b/include/fmt/base.h
+@@ -2276,9 +2276,7 @@ struct locale_ref {
+ 
+  public:
+   constexpr locale_ref() : locale_(nullptr) {}
+-
+-  template <typename Locale, FMT_ENABLE_IF(sizeof(Locale::collate) != 0)>
+-  locale_ref(const Locale& loc);
++  template <typename Locale> locale_ref(const Locale& loc);
+ 
+   inline explicit operator bool() const noexcept { return locale_ != nullptr; }
+ #endif  // FMT_USE_LOCALE
+diff --git a/include/fmt/format-inl.h b/include/fmt/format-inl.h
+index 14c65a09..a5b79dbe 100644
+--- a/include/fmt/format-inl.h
++++ b/include/fmt/format-inl.h
+@@ -84,7 +84,7 @@ using std::locale;
+ using std::numpunct;
+ using std::use_facet;
+ 
+-template <typename Locale, enable_if_t<(sizeof(Locale::collate) != 0), int>>
++template <typename Locale>
+ locale_ref::locale_ref(const Locale& loc) : locale_(&loc) {
+   static_assert(std::is_same<Locale, locale>::value, "");
+ }
+diff --git a/include/fmt/format.h b/include/fmt/format.h
+index c9a6054d..95b5bad0 100644
+--- a/include/fmt/format.h
++++ b/include/fmt/format.h
+@@ -1839,7 +1839,9 @@ template <typename Char> class digit_grouping {
+   }
+ 
+  public:
+-  explicit digit_grouping(locale_ref loc, bool localized = true) {
++  template <typename Locale,
++            FMT_ENABLE_IF(std::is_same<Locale, locale_ref>::value)>
++  explicit digit_grouping(Locale loc, bool localized = true) {
+     if (!localized) return;
+     auto sep = thousands_sep<Char>(loc);
+     grouping_ = sep.grouping;
+@@ -3639,6 +3641,12 @@ FMT_CONSTEXPR auto native_formatter<T, Char, TYPE>::format(
+   return write<Char>(ctx.out(), val, specs, ctx.locale());
+ }
+ 
++// DEPRECATED! https://github.com/fmtlib/fmt/issues/4292.
++template <typename T, typename Enable = void>
++struct is_locale : std::false_type {};
++template <typename T>
++struct is_locale<T, void_t<decltype(T::classic())>> : std::true_type {};
++
+ // DEPRECATED!
+ template <typename Char = char> struct vformat_args {
+   using type = basic_format_args<buffered_context<Char>>;
+@@ -4120,41 +4128,46 @@ FMT_API void format_system_error(detail::buffer<char>& out, int error_code,
+ // Can be used to report errors from destructors.
+ FMT_API void report_system_error(int error_code, const char* message) noexcept;
+ 
+-inline auto vformat(detail::locale_ref loc, string_view fmt, format_args args)
++template <typename Locale, FMT_ENABLE_IF(detail::is_locale<Locale>::value)>
++inline auto vformat(const Locale& loc, string_view fmt, format_args args)
+     -> std::string {
+   auto buf = memory_buffer();
+-  detail::vformat_to(buf, fmt, args, loc);
++  detail::vformat_to(buf, fmt, args, detail::locale_ref(loc));
+   return {buf.data(), buf.size()};
+ }
+ 
+-template <typename... T>
+-FMT_INLINE auto format(detail::locale_ref loc, format_string<T...> fmt,
+-                       T&&... args) -> std::string {
++template <typename Locale, typename... T,
++          FMT_ENABLE_IF(detail::is_locale<Locale>::value)>
++FMT_INLINE auto format(const Locale& loc, format_string<T...> fmt, T&&... args)
++    -> std::string {
+   return vformat(loc, fmt.str, vargs<T...>{{args...}});
+ }
+ 
+-template <typename OutputIt,
++template <typename OutputIt, typename Locale,
+           FMT_ENABLE_IF(detail::is_output_iterator<OutputIt, char>::value)>
+-auto vformat_to(OutputIt out, detail::locale_ref loc, string_view fmt,
++auto vformat_to(OutputIt out, const Locale& loc, string_view fmt,
+                 format_args args) -> OutputIt {
+   auto&& buf = detail::get_buffer<char>(out);
+-  detail::vformat_to(buf, fmt, args, loc);
++  detail::vformat_to(buf, fmt, args, detail::locale_ref(loc));
+   return detail::get_iterator(buf, out);
+ }
+ 
+-template <typename OutputIt, typename... T,
+-          FMT_ENABLE_IF(detail::is_output_iterator<OutputIt, char>::value)>
+-FMT_INLINE auto format_to(OutputIt out, detail::locale_ref loc,
++template <typename OutputIt, typename Locale, typename... T,
++          FMT_ENABLE_IF(detail::is_output_iterator<OutputIt, char>::value&&
++                            detail::is_locale<Locale>::value)>
++FMT_INLINE auto format_to(OutputIt out, const Locale& loc,
+                           format_string<T...> fmt, T&&... args) -> OutputIt {
+   return fmt::vformat_to(out, loc, fmt.str, vargs<T...>{{args...}});
+ }
+ 
+-template <typename... T>
+-FMT_NODISCARD FMT_INLINE auto formatted_size(detail::locale_ref loc,
++template <typename Locale, typename... T,
++          FMT_ENABLE_IF(detail::is_locale<Locale>::value)>
++FMT_NODISCARD FMT_INLINE auto formatted_size(const Locale& loc,
+                                              format_string<T...> fmt,
+                                              T&&... args) -> size_t {
+   auto buf = detail::counting_buffer<>();
+-  detail::vformat_to(buf, fmt.str, vargs<T...>{{args...}}, loc);
++  detail::vformat_to(buf, fmt.str, vargs<T...>{{args...}},
++                     detail::locale_ref(loc));
+   return buf.count();
+ }
+ 
+diff --git a/include/fmt/xchar.h b/include/fmt/xchar.h
+index 4cbda542..9f7f889d 100644
+--- a/include/fmt/xchar.h
++++ b/include/fmt/xchar.h
+@@ -191,9 +191,11 @@ auto format(const S& fmt, T&&... args) -> std::basic_string<Char> {
+                  fmt::make_format_args<buffered_context<Char>>(args...));
+ }
+ 
+-template <typename S, typename Char = detail::format_string_char_t<S>,
+-          FMT_ENABLE_IF(detail::is_exotic_char<Char>::value)>
+-inline auto vformat(detail::locale_ref loc, const S& fmt,
++template <typename Locale, typename S,
++          typename Char = detail::format_string_char_t<S>,
++          FMT_ENABLE_IF(detail::is_locale<Locale>::value&&
++                            detail::is_exotic_char<Char>::value)>
++inline auto vformat(const Locale& loc, const S& fmt,
+                     typename detail::vformat_args<Char>::type args)
+     -> std::basic_string<Char> {
+   auto buf = basic_memory_buffer<Char>();
+@@ -202,10 +204,11 @@ inline auto vformat(detail::locale_ref loc, const S& fmt,
+   return {buf.data(), buf.size()};
+ }
+ 
+-template <typename S, typename... T,
++template <typename Locale, typename S, typename... T,
+           typename Char = detail::format_string_char_t<S>,
+-          FMT_ENABLE_IF(detail::is_exotic_char<Char>::value)>
+-inline auto format(detail::locale_ref loc, const S& fmt, T&&... args)
++          FMT_ENABLE_IF(detail::is_locale<Locale>::value&&
++                            detail::is_exotic_char<Char>::value)>
++inline auto format(const Locale& loc, const S& fmt, T&&... args)
+     -> std::basic_string<Char> {
+   return vformat(loc, detail::to_string_view(fmt),
+                  fmt::make_format_args<buffered_context<Char>>(args...));
+@@ -232,11 +235,12 @@ inline auto format_to(OutputIt out, const S& fmt, T&&... args) -> OutputIt {
+                     fmt::make_format_args<buffered_context<Char>>(args...));
+ }
+ 
+-template <typename S, typename OutputIt, typename... Args,
++template <typename Locale, typename S, typename OutputIt, typename... Args,
+           typename Char = detail::format_string_char_t<S>,
+           FMT_ENABLE_IF(detail::is_output_iterator<OutputIt, Char>::value&&
+-                            detail::is_exotic_char<Char>::value)>
+-inline auto vformat_to(OutputIt out, detail::locale_ref loc, const S& fmt,
++                            detail::is_locale<Locale>::value&&
++                                detail::is_exotic_char<Char>::value)>
++inline auto vformat_to(OutputIt out, const Locale& loc, const S& fmt,
+                        typename detail::vformat_args<Char>::type args)
+     -> OutputIt {
+   auto&& buf = detail::get_buffer<Char>(out);
+@@ -244,11 +248,12 @@ inline auto vformat_to(OutputIt out, detail::locale_ref loc, const S& fmt,
+   return detail::get_iterator(buf, out);
+ }
+ 
+-template <typename OutputIt, typename S, typename... T,
++template <typename Locale, typename OutputIt, typename S, typename... T,
+           typename Char = detail::format_string_char_t<S>,
+           bool enable = detail::is_output_iterator<OutputIt, Char>::value &&
++                        detail::is_locale<Locale>::value &&
+                         detail::is_exotic_char<Char>::value>
+-inline auto format_to(OutputIt out, detail::locale_ref loc, const S& fmt,
++inline auto format_to(OutputIt out, const Locale& loc, const S& fmt,
+                       T&&... args) ->
+     typename std::enable_if<enable, OutputIt>::type {
+   return vformat_to(out, loc, detail::to_string_view(fmt),
+-- 
+2.47.1
+

10.2.1.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1250e4cc58bf06ee631567523f48848dc4596133e163f02615c97f78bab6c811
-size 854665

_scmsync.obsinfo

@@ -0,0 +1,4 @@
+mtime: 1736607005
+commit: 33385faca92f003e5f6a7220fdc2424c9a957d6a65813515d0a05109dc79697d
+url: https://src.opensuse.org/jengelh/fmt
+revision: master

baselibs.conf

@@ -1 +1 @@
-libfmt10
+libfmt11

build.specials.obscpio

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c6e2babcee00866f70bc21c904040ed70c411baa2b073a84bc52a54a23e3c9c9
+size 256

fmt.changes

@@ -1,3 +1,58 @@
+-------------------------------------------------------------------
+Sat Jan 11 14:49:36 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
+
+- Add 0001-Restore-ABI-compatibility.patch [boo#1235078]
+
+-------------------------------------------------------------------
+Sat Dec 28 03:00:29 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 11.1.1
+  * Restore ABI compat with 11.0.2
+
+-------------------------------------------------------------------
+Wed Dec 25 19:15:40 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 11.1
+  * Reduced debug (unoptimized) binary code size and the number of
+    template instantiations when passing formatting arguments
+  * Added an experimental fmt::writer API that can be used for
+    writing to different destinations such as files or strings
+  * Made std::expected<void, E> formattable
+  * Made fmt::is_formattable<void> SFINAE-friendly
+  * Added the n specifier for tuples and pairs
+  * Added support for tuple-like types to ``fmt::join``
+  * Added a formatter for ``std::reference_wrapper``
+  * Added experimental padding support (glibc ``strftime``
+    extension) to ``%m``, ``%j`` and ``%Y``
+  * Made ``fmt::appender`` satisfy the ``std::output_iterator`` concept
+  * Added support for UTF-32 code units greater than 0xFFFF in fill
+
+-------------------------------------------------------------------
+Sat Jul 20 14:51:13 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 11.0.2
+  * Fixed performance regressions when using
+    ``std::back_insert_iterator`` with`` fmt::format_to``.
+  * Made ``formatter<std::string_view>::parse`` work with types
+    convertible to ``std::string_view``.
+  * Made ``volatile void *`` formattable.
+  * Made ``fmt::context`` iterator compatible with STL algorithms
+    that rely on the iterator category.
+
+-------------------------------------------------------------------
+Wed Jul 10 18:07:21 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 11.0.1
+  * Added fmt/base.h which provides a subset of the API with
+    minimal include dependencies and enough functionality to
+    replace all uses of the printf family of functions.
+  * Improved integration with stdio in fmt::print, enabling
+    direct writes into a C stream buffer in common cases.
+  * fmt::format_to no longer exceeds buffers, instead it will
+    truncate.
+  * Added formatters for std::{expected,complex,type_info},
+    std::chrono::{day,month,year,year_month_day}.
+
 -------------------------------------------------------------------
 Thu Jan  4 13:55:11 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
 

fmt.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package fmt
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,15 +16,16 @@
 #
 
 
-%define sover   10
+%define sover   11
 Name:           fmt
-Version:        10.2.1
+Version:        11.1.1
 Release:        0
 Summary:        A formatting library for C++
 License:        MIT
 URL:            http://fmtlib.net/
 Source:         https://github.com/fmtlib/fmt/archive/%version.tar.gz
 Source1:        baselibs.conf
+Patch1:         0001-Restore-ABI-compatibility.patch
 BuildRequires:  c++_compiler
 BuildRequires:  cmake
 BuildRequires:  pkg-config
@@ -64,8 +65,7 @@ export CXXFLAGS="$CFLAGS"
 export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:%buildroot/%_libdir"
 %ctest
 
-%post   -n libfmt%sover -p /sbin/ldconfig
+%ldconfig_scriptlets -n libfmt%sover
-%postun -n libfmt%sover -p /sbin/ldconfig
 
 %files -n libfmt%sover
 %license LICENSE