[arch-commits] Commit in grilo-plugins/repos/extra-x86_64 (3 files)

[Jan Steffens]

    Date: Sunday, April 4, 2021 @ 18:40:47
  Author: heftig
Revision: 411498

archrelease: copy trunk to extra-x86_64

Added:
  grilo-plugins/repos/extra-x86_64/0001-grl-lua-factory-Remove-a-bad-pop.patch
    (from rev 411497, grilo-plugins/trunk/0001-grl-lua-factory-Remove-a-bad-pop.patch)
  grilo-plugins/repos/extra-x86_64/PKGBUILD
    (from rev 411497, grilo-plugins/trunk/PKGBUILD)
Deleted:
  grilo-plugins/repos/extra-x86_64/PKGBUILD

---------------------------------------------+
 0001-grl-lua-factory-Remove-a-bad-pop.patch |   23 ++++++
 PKGBUILD                                    |   91 +++++++++++++-------------
 2 files changed, 71 insertions(+), 43 deletions(-)

Copied: grilo-plugins/repos/extra-x86_64/0001-grl-lua-factory-Remove-a-bad-pop.patch (from rev 411497, grilo-plugins/trunk/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:47 UTC (rev 411498)
@@ -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;

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-04-04 18:40:37 UTC (rev 411497)
+++ PKGBUILD	2021-04-04 18:40:47 UTC (rev 411498)
@@ -1,43 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
-
-pkgname=grilo-plugins
-pkgver=0.3.13
-pkgrel=1
-epoch=1
-pkgdesc="A collection of plugins for the Grilo framework"
-url="https://gitlab.gnome.org/GNOME/grilo-plugins"
-arch=(x86_64)
-license=(LGPL)
-depends=(grilo lua libmediaart libgdata tracker3 gom libdmapsharing chromaprint
-         gst-plugins-bad gmime3)
-makedepends=(git meson gperf yelp-tools)
-checkdepends=(gst-plugins-good gst-plugins-base python-gobject tracker3-miners)
-optdepends=('dleyna-server: DLNA plugin'
-            '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')
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/^grilo-plugins-//;s/-/+/g'
-}
-
-prepare() {
-  cd $pkgname
-}
-
-build() {
-  arch-meson $pkgname build -D enable-tracker=no
-  meson compile -C build
-}
-
-check() {
-  dbus-run-session meson test -C build --print-errorlogs
-}
-
-package() {
-  depends+=(libgr{ilo,lnet,lpls}-0.3.so)
-  DESTDIR="$pkgdir" meson install -C build
-}

Copied: grilo-plugins/repos/extra-x86_64/PKGBUILD (from rev 411497, grilo-plugins/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-04-04 18:40:47 UTC (rev 411498)
@@ -0,0 +1,48 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+
+pkgname=grilo-plugins
+pkgver=0.3.13
+pkgrel=2
+epoch=1
+pkgdesc="A collection of plugins for the Grilo framework"
+url="https://gitlab.gnome.org/GNOME/grilo-plugins"
+arch=(x86_64)
+license=(LGPL)
+depends=(grilo lua libmediaart libgdata tracker3 gom libdmapsharing chromaprint
+         gst-plugins-bad gmime3)
+makedepends=(git meson gperf yelp-tools)
+checkdepends=(gst-plugins-good gst-plugins-base python-gobject tracker3-miners)
+optdepends=('dleyna-server: DLNA plugin'
+            '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"
+        0001-grl-lua-factory-Remove-a-bad-pop.patch)
+sha256sums=('SKIP'
+            '0ee8e2e0810f7e6b5b2c858a98b432e98c4a43e5d1134afb31a17be7f42a3612')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/^grilo-plugins-//;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() {
+  arch-meson $pkgname build -D enable-tracker=no
+  meson compile -C build
+}
+
+check() {
+  dbus-run-session meson test -C build --print-errorlogs
+}
+
+package() {
+  depends+=(libgr{ilo,lnet,lpls}-0.3.so)
+  DESTDIR="$pkgdir" meson install -C build
+}