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

[Jan Steffens]

    Date: Wednesday, August 17, 2022 @ 19:27:50
  Author: heftig
Revision: 453060

0.3.15-1

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

---------------------------------------------+
 0001-grl-lua-factory-Remove-a-bad-pop.patch |   23 -----------------------
 PKGBUILD                                    |   16 ++++++----------
 2 files changed, 6 insertions(+), 33 deletions(-)

Deleted: 0001-grl-lua-factory-Remove-a-bad-pop.patch
===================================================================
--- 0001-grl-lua-factory-Remove-a-bad-pop.patch	2022-08-17 19:24:12 UTC (rev 453059)
+++ 0001-grl-lua-factory-Remove-a-bad-pop.patch	2022-08-17 19:27:50 UTC (rev 453060)
@@ -1,23 +0,0 @@
-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	2022-08-17 19:24:12 UTC (rev 453059)
+++ PKGBUILD	2022-08-17 19:27:50 UTC (rev 453060)
@@ -1,7 +1,7 @@
 # Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
 
 pkgname=grilo-plugins
-pkgver=0.3.14
+pkgver=0.3.15
 pkgrel=1
 epoch=1
 pkgdesc="A collection of plugins for the Grilo framework"
@@ -15,22 +15,18 @@
 optdepends=('dleyna-server: DLNA plugin'
             'tracker3-miners: Tracker plugin')
 groups=(gnome)
-_commit=9d2afa38e13ff0ea5ddbc32a32900a3f2f496dc5  # tags/grilo-plugins-0.3.14^0
-source=("git+https://gitlab.gnome.org/GNOME/grilo-plugins.git#commit=$_commit"
-        0001-grl-lua-factory-Remove-a-bad-pop.patch)
-sha256sums=('SKIP'
-            '0ee8e2e0810f7e6b5b2c858a98b432e98c4a43e5d1134afb31a17be7f42a3612')
+options=(debug)
+_commit=98cbc65e258209c92a260a7641e4b9df2c9e58fa  # tags/grilo-plugins-0.3.15^0
+source=("git+https://gitlab.gnome.org/GNOME/grilo-plugins.git#commit=$_commit")
+sha256sums=('SKIP')
 
 pkgver() {
   cd $pkgname
-  git describe --tags | sed 's/^grilo-plugins-//;s/-/+/g'
+  git describe --tags | sed 's/^grilo-plugins-//;s/[^-]*-g/r&/;s/-/+/g'
 }
 
 prepare() {
   cd $pkgname
-
-  # Fix bug exposed by Lua 5.4.3
-  git apply -3 ../0001-grl-lua-factory-Remove-a-bad-pop.patch
 }
 
 build() {