From 801043345826f370c6a24693c1c05945f14ea225 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 28 Nov 2019 12:42:13 +0100 Subject: [PATCH] Fix the build with totem-pl-parser 3.26.4 --- 0001-pls-Support-totem-pl-parser-3.26.4.patch | 36 +++++++++++++++++++ grilo.spec | 8 ++++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 0001-pls-Support-totem-pl-parser-3.26.4.patch diff --git a/0001-pls-Support-totem-pl-parser-3.26.4.patch b/0001-pls-Support-totem-pl-parser-3.26.4.patch new file mode 100644 index 0000000..8f2d19b --- /dev/null +++ b/0001-pls-Support-totem-pl-parser-3.26.4.patch @@ -0,0 +1,36 @@ +From 60d135ef64f16671bb0ab4079ecbc59bdc32cbc7 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Tue, 12 Nov 2019 19:44:04 +0100 +Subject: [PATCH] pls: Support totem-pl-parser 3.26.4 + +--- + libs/pls/grl-pls.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/libs/pls/grl-pls.c b/libs/pls/grl-pls.c +index 62c578b..f6121cc 100644 +--- a/libs/pls/grl-pls.c ++++ b/libs/pls/grl-pls.c +@@ -47,6 +47,10 @@ + #include + #include + ++#ifndef TOTEM_PL_IS_PARSER(x) ++#define TOTEM_PL_IS_PARSER(x) TOTEM_IS_PL_PARSER(x) ++#endif /* TOTEM_PL_IS_PARSER */ ++ + /* --------- Constants -------- */ + + #define GRL_DATA_PRIV_PLS_IS_PLAYLIST "priv:pls:is_playlist" +@@ -465,7 +469,7 @@ grl_pls_playlist_entry_parsed_cb (TotemPlParser *parser, + GRL_DEBUG ("%s (parser=%p, uri=\"%s\", metadata=%p, user_data=%p)", + __FUNCTION__, parser, uri, metadata, user_data); + +- g_return_if_fail (TOTEM_IS_PL_PARSER (parser)); ++ g_return_if_fail (TOTEM_PL_IS_PARSER (parser)); + g_return_if_fail (uri); + g_return_if_fail (metadata); + g_return_if_fail (user_data); +-- +2.23.0 + diff --git a/grilo.spec b/grilo.spec index 59391f0..f55a063 100644 --- a/grilo.spec +++ b/grilo.spec @@ -3,13 +3,16 @@ Name: grilo Version: 0.3.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Content discovery framework License: LGPLv2+ URL: https://wiki.gnome.org/Projects/Grilo Source0: https://download.gnome.org/sources/grilo/%{release_version}/grilo-%{version}.tar.xz +# Backported from upstream +Patch0: 0001-pls-Support-totem-pl-parser-3.26.4.patch + BuildRequires: meson BuildRequires: chrpath BuildRequires: gettext @@ -80,6 +83,9 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/grilo-%{release_version}/plugins/ %{_datadir}/vala/ %changelog +* Thu Nov 28 2019 Kalev Lember - 0.3.10-2 +- Fix the build with totem-pl-parser 3.26.4 + * Thu Sep 12 2019 Victor Toso - 0.3.10-1 - Update to 0.3.10