!11 sync from master

From: @weijin-deng 
Reviewed-by: @dwl301 
Signed-off-by: @dwl301
This commit is contained in:
openeuler-ci-bot 2022-02-28 03:15:28 +00:00 committed by Gitee
commit 4f4a5bf728
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 27 additions and 3 deletions

View File

@ -0,0 +1,16 @@
https://gitlab.gnome.org/GNOME/gnome-music/-/issues/473
https://gitlab.gnome.org/GNOME/grilo-plugins/-/merge_requests/108
diff --git a/src/lua-factory/grl-lua-factory.c b/src/lua-factory/grl-lua-factory.c
index 4f37984..3a3b824 100644
--- a/src/lua-factory/grl-lua-factory.c
+++ b/src/lua-factory/grl-lua-factory.c
@@ -1255,8 +1255,6 @@ table_to_tags (lua_State *L)
lua_pop (L, 1);
}
- lua_pop (L, 1);
-
if (array->len == 0) {
g_ptr_array_free (array, TRUE);
return NULL;

View File

@ -1,16 +1,17 @@
Name: grilo-plugins
Version: 0.3.13
Release: 1
Release: 3
Summary: Plugins for the Grilo framework
License: LGPLv2+
URL: https://gitlab.gnome.org/GNOME/grilo-plugins
Source0: https://download.gnome.org/sources/grilo-plugins/0.3/grilo-plugins-%{version}.tar.xz
Patch0001: 0001-solve_an_error_of-Lua_API_attempt_to_call_a_nil_value.patch
BuildRequires: gcc meson avahi-gobject-devel avahi-gobject glib2-devel grilo-devel >= 0.3.8
BuildRequires: gom-devel gperf intltool gnome-online-accounts-devel >= 3.17.91 gettext
BuildRequires: libgcrypt-devel libxml2-devel itstool libarchive-devel libmediaart-devel
BuildRequires: libsoup-devel lua-devel rest-devel sqlite-devel libgdata-devel
BuildRequires: totem-pl-parser-devel tracker3-devel libdmapsharing-devel json-glib-devel git cmake liboauth-devel
BuildRequires: totem-pl-parser-devel tracker3-devel libdmapsharing-devel json-glib-devel cmake liboauth-devel
Requires: dleyna-server gnome-online-accounts%{_isa} >= 3.17.91 grilo%{_isa} >= 0.3.8
%description
@ -21,7 +22,7 @@ iTunes Music Sharing,Jamendo,Last.fm,Local metadata,Metadata Store,Pocket,Podcas
Radio France,Shoutcast,The Guardian Videos,Tracker,Vimeo,Youtube
%prep
%autosetup -n grilo-plugins-%{version} -p1 -S git
%autosetup -n grilo-plugins-%{version} -p1
%build
%meson -Denable-static=no -Denable-shoutcast=no -Denable-bookmarks=yes \
@ -48,6 +49,13 @@ Radio France,Shoutcast,The Guardian Videos,Tracker,Vimeo,Youtube
%exclude %{_bindir}/*
%changelog
* Fri Feb 25 2022 weijin deng <weijin.deng@turbolinux.com.cn> - 0.3.13-3
- Solve bug of "PANIC: unprotected error in call to Lua API
(attempt to call a nil value) Aborted"
* Fri Jul 30 2021 chenyanpanHW <chenyanpan@huawei.com> - 0.3.13-2
- DESC: delete -S git from %autosetup, and delete BuildRequires git
* Thu Jun 17 2021 weijin deng <weijin.deng@turbolinux.com.cn> - 0.3.13-1
- Upgrade to 0.3.13
- Change meson configurations