From: Jan Palus Date: Thu, 1 Sep 2022 16:15:12 +0000 (+0200) Subject: upstream fix for libfmt 9 X-Git-Tag: auto/th/gerbera-1.11.0-2~1 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=6e53a4bd404afad13e9afa5643776c7b730195f0;p=packages%2Fgerbera.git upstream fix for libfmt 9 --- diff --git a/gerbera.spec b/gerbera.spec index 209410c..2229075 100644 --- a/gerbera.spec +++ b/gerbera.spec @@ -10,6 +10,7 @@ License: GPL v2 Group: Applications Source0: https://github.com/gerbera/gerbera/archive/v%{version}/%{name}-%{version}.tar.gz # Source0-md5: dcf3ae7bc506920e95d88f31129238ee +Patch0: libfmt9.patch URL: https://gerbera.io BuildRequires: cmake >= 3.18 BuildRequires: curl-devel @@ -50,6 +51,7 @@ compatible devices. %prep %setup -q +%patch0 -p1 %build install -d build diff --git a/libfmt9.patch b/libfmt9.patch new file mode 100644 index 0000000..02e5080 --- /dev/null +++ b/libfmt9.patch @@ -0,0 +1,32 @@ +From 2f69158875215c3db3da2993617251dfefdf9497 Mon Sep 17 00:00:00 2001 +From: Felix Yan +Date: Fri, 19 Aug 2022 15:22:10 +0300 +Subject: [PATCH] Fix build with fmt 9.0 + +Fixes #2681 +--- + src/database/sql_format.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/database/sql_format.h b/src/database/sql_format.h +index 32dc00efa..e4e1909a8 100644 +--- a/src/database/sql_format.h ++++ b/src/database/sql_format.h +@@ -42,7 +42,7 @@ struct SQLIdentifier { + template <> + struct fmt::formatter : formatter { + template +- auto format(const SQLIdentifier& tn, FormatContext& ctx) -> decltype(ctx.out()) ++ auto format(const SQLIdentifier& tn, FormatContext& ctx) const -> decltype(ctx.out()) + { + return format_to(ctx.out(), "{}{}{}", tn.quote_begin, tn.name, tn.quote_end); + } +@@ -61,7 +61,7 @@ struct ColumnUpdate { + template <> + struct fmt::formatter : formatter { + template +- auto format(const ColumnUpdate& a, FormatContext& ctx) -> decltype(ctx.out()) ++ auto format(const ColumnUpdate& a, FormatContext& ctx) const -> decltype(ctx.out()) + { + return format_to(ctx.out(), "{} = {}", a.column, a.value); + }