Date: Thursday, September 29, 2016 @ 12:53:09 Author: anthraxx Revision: 190856
upgpkg: lua-penlight 1.4.1-1 - adding patch for regression in tablex Added: penlight/trunk/fix-tablex.patch Modified: penlight/trunk/PKGBUILD ------------------+ PKGBUILD | 42 +++++++++++++++++++++++------------------- fix-tablex.patch | 23 +++++++++++++++++++++++ 2 files changed, 46 insertions(+), 19 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-09-29 12:53:06 UTC (rev 190855) +++ PKGBUILD 2016-09-29 12:53:09 UTC (rev 190856) @@ -1,5 +1,5 @@ -# $Id$ -# Maintainer: Sébastien Luttringer +# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> +# Contributor: Sébastien Luttringer # Contributor: SpepS <dreamspepser at yahoo dot it> # Contributor: Laszlo Papp <djszapi at archlinux us> # Contributor: Donald Ephraim Curtis <dcur...@gmail.com> @@ -6,34 +6,38 @@ pkgbase=penlight pkgname=('lua-penlight') -pkgver=1.3.2 -pkgrel=2 +pkgver=1.4.1 +pkgrel=1 pkgdesc='Lua libraries focusing on input data handling' +url='https://github.com/stevedonovan/penlight' arch=('any') -url='https://github.com/stevedonovan/penlight' license=('custom') depends=('lua' 'lua-filesystem') -source=("$pkgname-$pkgver.tar.gz::https://github.com/stevedonovan/penlight/archive/$pkgver.tar.gz") -md5sums=('0315a39834bb6fab07741ec04ede1bf4') +source=(${pkgname}-${pkgver}.tar.gz::https://github.com/stevedonovan/penlight/archive/${pkgver}.tar.gz + fix-tablex.patch) +sha512sums=('ed34c119a43bb9b8baf0cf570ace3d175bd0beeacb250a5d5ee3efe5782864b79a8f5b7e92bd1e676a369ec32def29a1c5b0a7d77b1c665a22c1e69a4904abd4' + 'e3384422aee4a20db7fd4cbd86ed7acafe61a397c51293d3285be94c950bbf06e746ed8d4db121a53ef52fe0d19c9a7b09f7d02acfcd722118b2ae19971d3c41') +prepare() { + cd Penlight-${pkgver} + patch -p1 < "${srcdir}/fix-tablex.patch" +} + check() { - cd Penlight-$pkgver - export LUA_PATH="$PWD/lua/?/init.lua;$PWD/lua/?.lua;$(lua -e 'print(package.path)')" + cd Penlight-${pkgver} + export LUA_PATH="${PWD}/lua/?/init.lua;${PWD}/lua/?.lua;$(lua -e 'print(package.path)')" lua run.lua } package_lua-penlight() { - - cd Penlight-$pkgver - install -dm755 "$pkgdir/usr/share/lua/5.3/pl" - install -m644 lua/pl/* "$pkgdir/usr/share/lua/5.3/pl" + cd Penlight-${pkgver} + install -Dm 644 lua/pl/* -t "${pkgdir}/usr/share/lua/5.3/pl" # copy docs - install -dm755 "$pkgdir/usr/share/doc/$pkgname/"{,manual,examples} - install -m644 CONTRIBUTING.md CHANGES.md README.md "$pkgdir/usr/share/doc/$pkgname" - install -m644 doc/manual/* "$pkgdir/usr/share/doc/$pkgname/manual" - install -m644 examples/* "$pkgdir/usr/share/doc/$pkgname/examples" + install -Dm 644 CONTRIBUTING.md CHANGES.md README.md -t "${pkgdir}/usr/share/doc/${pkgname}" + install -Dm 644 doc/manual/* -t "${pkgdir}/usr/share/doc/${pkgname}/manual" + install -Dm 644 examples/* -t "${pkgdir}/usr/share/doc/${pkgname}/examples" # copy license - install -Dm644 LICENSE.md "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm 644 LICENSE.md "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } -# vim:set ts=2 sw=2 et: +# vim: ts=2 sw=2 et: Added: fix-tablex.patch =================================================================== --- fix-tablex.patch (rev 0) +++ fix-tablex.patch 2016-09-29 12:53:09 UTC (rev 190856) @@ -0,0 +1,23 @@ +From 9cbdf99d98f19f1e0bfc5f1c6b76dfaff47455fa Mon Sep 17 00:00:00 2001 +From: Peter Melnichenko <mpeter...@gmail.com> +Date: Mon, 22 Aug 2016 19:13:12 +0300 +Subject: [PATCH] Fix error in tablex.count_map + +Regression introduced in @6123f9e. +--- + lua/pl/tablex.lua | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lua/pl/tablex.lua b/lua/pl/tablex.lua +index fa3b5b0..c513231 100644 +--- a/lua/pl/tablex.lua ++++ b/lua/pl/tablex.lua +@@ -640,7 +640,7 @@ function tablex.count_map (t,cmp) + end + end + end +- return setmetatable(res,'Map') ++ return makemap(res) + end + + --- filter an array's values using a predicate function