Hello community, here is the log from the commit of package grilo for openSUSE:Factory checked in at 2019-11-24 00:02:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grilo (Old) and /work/SRC/openSUSE:Factory/.grilo.new.26869 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grilo" Sun Nov 24 00:02:14 2019 rev:39 rq:749276 version:0.3.10 Changes: -------- --- /work/SRC/openSUSE:Factory/grilo/grilo.changes 2019-10-17 13:01:40.684942125 +0200 +++ /work/SRC/openSUSE:Factory/.grilo.new.26869/grilo.changes 2019-11-24 00:02:15.555053305 +0100 @@ -1,0 +2,6 @@ +Tue Nov 12 20:02:46 UTC 2019 - Bjørn Lie <[email protected]> + +- Add grilo-fix-build-totem-pl-parser.patch: Fix build with + totem-pl-parser 3.26.4. + +------------------------------------------------------------------- New: ---- grilo-fix-build-totem-pl-parser.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grilo.spec ++++++ --- /var/tmp/diff_new_pack.O55DIQ/_old 2019-11-24 00:02:16.247053377 +0100 +++ /var/tmp/diff_new_pack.O55DIQ/_new 2019-11-24 00:02:16.259053378 +0100 @@ -24,6 +24,8 @@ Group: Productivity/Multimedia/Other URL: https://live.gnome.org/Grilo Source0: https://download.gnome.org/sources/grilo/0.3/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM grilo-fix-build-totem-pl-parser.patch -- Fix build with totem-pl-parser 3.26.4 +Patch0: grilo-fix-build-totem-pl-parser.patch BuildRequires: fdupes BuildRequires: gtk-doc @@ -136,7 +138,7 @@ %lang_package %prep -%autosetup +%autosetup -p1 %build %meson \ ++++++ grilo-fix-build-totem-pl-parser.patch ++++++ >From 60d135ef64f16671bb0ab4079ecbc59bdc32cbc7 Mon Sep 17 00:00:00 2001 From: Bastien Nocera <[email protected]> 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.22.0
