Fix the build with totem-pl-parser 3.26.4

This commit is contained in:
Kalev Lember 2019-11-28 12:42:13 +01:00
parent 324ee54699
commit 8010433458
2 changed files with 43 additions and 1 deletions

View File

@ -0,0 +1,36 @@
From 60d135ef64f16671bb0ab4079ecbc59bdc32cbc7 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
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 <totem-pl-parser.h>
#include <totem-pl-parser-mini.h>
+#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

View File

@ -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 <klember@redhat.com> - 0.3.10-2
- Fix the build with totem-pl-parser 3.26.4
* Thu Sep 12 2019 Victor Toso <victortoso@redhat.com> - 0.3.10-1
- Update to 0.3.10