deepcrayon
/
buildroot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

package/gerbera: fix build with fmt >= 9.0.0 

Fix the following build failure with fmt >= 9.0.0 raised since commit
5c83dc5451fb59ffa5cd40d30c4c532dd25e8333:

/tmp/instance-5/output-1/build/gerbera-1.10.0/src/database/sql_database.cc:1688:26:   required from here
/tmp/instance-5/output-1/host/x86_64-buildroot-linux-gnu/sysroot/usr/include/fmt/format.h:3973:36: error: passing 'const fmt::v9::formatter<fmt::v9::join_view<__gnu_cxx::__normal_iterator<const ColumnUpdate*, std::vector<ColumnUpdate> >, __gnu_cxx::__normal_iterator<const ColumnUpdate*, std::vector<ColumnUpdate> >, char>, char, void>::formatter_type' {aka 'const fmt::v9::formatter<ColumnUpdate>'} as 'this' argument discards qualifiers [-fpermissive]
 3973 |       out = value_formatter_.format(map(*it), ctx);
      |             ~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~

Fixes:
 - http://autobuild.buildroot.org/results/56c46fa7e922360d2c4b4093f8a030cc83726799

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 9b911c8e8f)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2022.11.x
Fabrice Fontaine 2023-02-23 15:17:45 +01:00 committed by Peter Korsgaard
parent b4b32468cb
commit 3f28ad6e0b
1 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
package/gerbera/0001-Fix-build-with-fmt-9-0.patch 100644
View File

@ -0,0 +1,36 @@
From d7b8fafbc94405c20753fed569abd8878cccde89 Mon Sep 17 00:00:00 2001
From: Felix Yan <felixonmars@archlinux.org>
Date: Fri, 19 Aug 2022 15:22:10 +0300
Subject: [PATCH] Fix build with fmt 9.0
Fixes #2681
[Retrieved from:
https://github.com/gerbera/gerbera/commit/d7b8fafbc94405c20753fed569abd8878cccde89]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
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<SQLIdentifier> : formatter<std::string_view> {
template <typename FormatContext>
- 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<ColumnUpdate> : formatter<std::string_view> {
template <typename FormatContext>
- 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);
}