From b22b9862618e39aba129b7b22082d1e4bc53bf45 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Mon, 6 Apr 2015 20:16:46 +0000
Subject: main/lua-microlight: fix lua 5.3

---
 main/lua-microlight/APKBUILD          | 21 +++++++++++++--------
 main/lua-microlight/fix-lua-5.3.patch | 31 +++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 8 deletions(-)
 create mode 100644 main/lua-microlight/fix-lua-5.3.patch

(limited to 'main/lua-microlight')

diff --git a/main/lua-microlight/APKBUILD b/main/lua-microlight/APKBUILD
index 4ff23f391c..b84e374edd 100644
--- a/main/lua-microlight/APKBUILD
+++ b/main/lua-microlight/APKBUILD
@@ -1,14 +1,14 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-_luaversions="5.1 5.2"
+_luaversions="5.1 5.2 5.3"
 pkgname=lua-microlight
 pkgver=1.1.1
-pkgrel=0
+pkgrel=2
 pkgdesc="a really compact set of general Lua functions"
 url="http://stevedonovan.github.com/microlight/"
 arch="noarch"
 license="MIT"
-depends="lua5.1-microlight"
+depends=""
 install=""
 makedepends=""
 subpackages=""
@@ -16,7 +16,9 @@ for _i in $_luaversions; do
 	makedepends="$makedepends lua$_i-dev"
 	subpackages="$subpackages lua$_i-microlight:split_${_i/./_}"
 done
-source="lua-microlight-$pkgver.tar.gz::https://github.com/stevedonovan/Microlight/archive/$pkgver.tar.gz"
+source="lua-microlight-$pkgver.tar.gz::https://github.com/stevedonovan/Microlight/archive/$pkgver.tar.gz
+	fix-lua-5.3.patch
+	"
 
 _builddir="$srcdir"/Microlight-$pkgver
 
@@ -45,7 +47,7 @@ package() {
 _split() {
 	local d= _ver=$1
 	pkgdesc="a really compact set of general functions for Lua $_ver"
-	replaces="$pkgname"
+	install_if="lua$_ver $pkgname=$pkgver-r$pkgrel"
 	depends=
 	for d in usr/lib/lua usr/share/lua; do
 		if [ -d "$pkgdir"/$d/$_ver ]; then
@@ -59,6 +61,9 @@ for _i in $_luaversions; do
 	eval "split_${_i/./_}() { _split $_i; }"
 done
 
-md5sums="cb6eacf4a8a0856548d4d6849fdb96f5  lua-microlight-1.1.1.tar.gz"
-sha256sums="c713689c9d477971b494307308c4ea4a877b2994078b7603ba5767c8a4843113  lua-microlight-1.1.1.tar.gz"
-sha512sums="debffab0c599754cb70852e82b2cb76af16dcefa7c1c4c54be1a0949d3f24312a72c9e9accd512a2f7d230259b7b7d18bc5919dbaff5458953236f9752582a45  lua-microlight-1.1.1.tar.gz"
+md5sums="cb6eacf4a8a0856548d4d6849fdb96f5  lua-microlight-1.1.1.tar.gz
+0ad85709eb0ca8491cce5083486f23f1  fix-lua-5.3.patch"
+sha256sums="c713689c9d477971b494307308c4ea4a877b2994078b7603ba5767c8a4843113  lua-microlight-1.1.1.tar.gz
+a64f81563b9fee7b3080c8b2dd6d35d2e56ac1715ce7090f718483e5a5f8af07  fix-lua-5.3.patch"
+sha512sums="debffab0c599754cb70852e82b2cb76af16dcefa7c1c4c54be1a0949d3f24312a72c9e9accd512a2f7d230259b7b7d18bc5919dbaff5458953236f9752582a45  lua-microlight-1.1.1.tar.gz
+c32722c5900e3851e542fbd4e0628dff160cd0de260e94287843c6155eee17a9c217ca52e7fffd375a6d2f66440f871fafa86ec4cb65f51f5c2d569d51139b0e  fix-lua-5.3.patch"
diff --git a/main/lua-microlight/fix-lua-5.3.patch b/main/lua-microlight/fix-lua-5.3.patch
new file mode 100644
index 0000000000..8ec4203f1d
--- /dev/null
+++ b/main/lua-microlight/fix-lua-5.3.patch
@@ -0,0 +1,31 @@
+From f28d838c92de332764882055035dac72c3a143bf Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Mon, 6 Apr 2015 20:11:35 +0000
+Subject: [PATCH] Issue #7: fix for Lua 5.3
+
+---
+ ml.lua | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/ml.lua b/ml.lua
+index 6915195..3dbec40 100644
+--- a/ml.lua
++++ b/ml.lua
+@@ -8,6 +8,8 @@ local ml = {}
+ local select,pairs = select,pairs
+ local function_arg
+ 
++table.unpack = table.unpack or unpack
++
+ ---------------------------------------------------
+ -- String utilties.
+ -- @section string
+@@ -585,7 +587,7 @@ function ml.import(t,...)
+             libs[i] = lib
+         end
+     end
+-    return ml.update(t,unpack(libs))
++    return ml.update(t,table.unpack(libs))
+ end
+ 
+ --- add the key/value pairs of arrays to the first array.
-- 
cgit v1.2.3