[arch-commits] Commit in grilo-plugins/trunk (2 files)

[Jan Steffens]

    Date: Sunday, April 4, 2021 @ 18:40:37
  Author: heftig
Revision: 411497

0.3.13-2: fix lua

Added:
  grilo-plugins/trunk/0001-grl-lua-factory-Remove-a-bad-pop.patch
Modified:
  grilo-plugins/trunk/PKGBUILD

---------------------------------------------+
 0001-grl-lua-factory-Remove-a-bad-pop.patch |   23 +++++++++++++++++++++++
 PKGBUILD                                    |   11 ++++++++---
 2 files changed, 31 insertions(+), 3 deletions(-)

Added: 0001-grl-lua-factory-Remove-a-bad-pop.patch
===================================================================
--- 0001-grl-lua-factory-Remove-a-bad-pop.patch	                        (rev 0)
+++ 0001-grl-lua-factory-Remove-a-bad-pop.patch	2021-04-04 18:40:37 UTC (rev 411497)
@@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Sun, 4 Apr 2021 18:30:57 +0000
+Subject: [PATCH] grl-lua-factory: Remove a bad pop
+
+This was exposed by Lua 5.4.3, causing a crash.
+---
+ src/lua-factory/grl-lua-factory.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/lua-factory/grl-lua-factory.c b/src/lua-factory/grl-lua-factory.c
+index 4f379841..3a3b8248 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;

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-04-04 18:14:33 UTC (rev 411496)
+++ PKGBUILD	2021-04-04 18:40:37 UTC (rev 411497)
@@ -2,7 +2,7 @@
 
 pkgname=grilo-plugins
 pkgver=0.3.13
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="A collection of plugins for the Grilo framework"
 url="https://gitlab.gnome.org/GNOME/grilo-plugins"
@@ -16,8 +16,10 @@
             'tracker3-miners: Tracker plugin')
 groups=(gnome)
 _commit=660041b7b6460bbe4becef1b675f4f96189cba2b  # tags/grilo-plugins-0.3.13^0
-source=("git+https://gitlab.gnome.org/GNOME/grilo-plugins.git#commit=$_commit")
-sha256sums=('SKIP')
+source=("git+https://gitlab.gnome.org/GNOME/grilo-plugins.git#commit=$_commit"
+        0001-grl-lua-factory-Remove-a-bad-pop.patch)
+sha256sums=('SKIP'
+            '0ee8e2e0810f7e6b5b2c858a98b432e98c4a43e5d1134afb31a17be7f42a3612')
 
 pkgver() {
   cd $pkgname
@@ -26,6 +28,9 @@
 
 prepare() {
   cd $pkgname
+
+  # Fix bug exposed by Lua 5.4.3
+  git apply -3 ../0001-grl-lua-factory-Remove-a-bad-pop.patch
 }
 
 build() {