up to 1.12.0

diff --git a/gerbera.spec b/gerbera.spec
index bc98de1adf20e91fb012d73e6a0db7c61eb79f21..7cc3e2a4572e9a5636ac27ff36014c4e058f9e84 100644 (file)
--- a/gerbera.spec
+++ b/gerbera.spec
@@ -4,13 +4,12 @@
 
 Summary:       UPnP Media Server
 Name:          gerbera
-Version:       1.11.0
-Release:       2
+Version:       1.12.0
+Release:       1
 License:       GPL v2
 Group:         Applications
 Source0:       https://github.com/gerbera/gerbera/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: dcf3ae7bc506920e95d88f31129238ee
-Patch0:                libfmt9.patch
+# Source0-md5: d3a6c7ced15583ff236b61487f2cc5c2
 URL:           https://gerbera.io
 BuildRequires: cmake >= 3.18
 BuildRequires: curl-devel
@@ -51,7 +50,6 @@ compatible devices.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 install -d build

diff --git a/libfmt9.patch b/libfmt9.patch
deleted file mode 100644 (file)
index 02e5080..0000000
--- a/libfmt9.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 2f69158875215c3db3da2993617251dfefdf9497 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
----
- 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);
-     }