From 2f15a2b67b5aa29e299d3ea7c6d5a5369892e212 Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Fri, 29 Dec 2017 00:32:58 +0100
Subject: main/lua5.3: add /usr/share/lua/common to default LUA_PATH

---
 main/lua5.3/APKBUILD                   | 4 ++--
 main/lua5.3/lua-5.3-module_paths.patch | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'main/lua5.3')

diff --git a/main/lua5.3/APKBUILD b/main/lua5.3/APKBUILD
index 5afe8e832a..861c3788f2 100644
--- a/main/lua5.3/APKBUILD
+++ b/main/lua5.3/APKBUILD
@@ -3,7 +3,7 @@ pkgname=lua5.3
 _pkgname=lua
 pkgver=5.3.4
 _luaver=${pkgname#lua}
-pkgrel=2
+pkgrel=3
 pkgdesc="Powerful light-weight programming language"
 url="https://www.lua.org/"
 arch="all"
@@ -131,5 +131,5 @@ libs() {
 
 sha512sums="739e31f82e6a60fa99910c2005e991b3a1e21339af52847f653cb190b30842054d189ca116ffcfdf9b36e07888c9ce5642b1dd2988cc7eff9f8789f9a2e34997  lua-5.3.4.tar.gz
 1bc6c623024c1738155b30ff9c0edcce0f336edc25aa20c3a1400c859421ea2015d75175cce8d515e055ac3e96028426b74812e04022af18a0ed4c4601556027  lua-5.3-make.patch
-313ff823ed871f380a2cb0ba1f0afbba5cfa9b98da40e6e5e8f3c7a2e5993b13c2577efbe7147b79e3903ff27d5a814fa782c1c925092b08510cb4ce02abf464  lua-5.3-module_paths.patch
+bc68772390dc8d8940176af0b9fbacc0af61891b5d27de5f1466a4e7f9b3291a1c08ba5add829bc96b789a53fa5ec2dadaa096ca6eabe54ec27724fa2810940f  lua-5.3-module_paths.patch
 49880d1131b7bd2a3169a26f401769a91d9a6a62cefe68aa5a89097139289588b7ef753535a2d0ba7f45c0369c760554940fd810716b7b1353deace32432fcfe  linenoise.patch"
diff --git a/main/lua5.3/lua-5.3-module_paths.patch b/main/lua5.3/lua-5.3-module_paths.patch
index 4015fcfa28..313d9c609f 100644
--- a/main/lua5.3/lua-5.3-module_paths.patch
+++ b/main/lua5.3/lua-5.3-module_paths.patch
@@ -2,13 +2,16 @@ diff --git a/src/luaconf.h b/src/luaconf.h
 index fd28d21..4c65295 100644
 --- a/src/luaconf.h
 +++ b/src/luaconf.h
-@@ -178,12 +178,21 @@
+@@ -203,12 +201,25 @@
  #define LUA_ROOT	"/usr/local/"
  #define LUA_LDIR	LUA_ROOT "share/lua/" LUA_VDIR "/"
  #define LUA_CDIR	LUA_ROOT "lib/lua/" LUA_VDIR "/"
 +
 +#define LUA_VENDOR_ROOT	"/usr/"
++/* Path for version-specific Lua modules. */
 +#define LUA_VENDOR_LDIR	LUA_VENDOR_ROOT "share/lua/" LUA_VDIR "/"
++/* Path for Lua modules that are compatible with Lua 5.1 and newer. */
++#define LUA_VENDOR_COMMON_LDIR LUA_VENDOR_ROOT "share/lua/common/"
 +#define LUA_VENDOR_CDIR	LUA_VENDOR_ROOT "lib/lua/" LUA_VDIR "/"
 +
  #define LUA_PATH_DEFAULT  \
@@ -16,6 +19,7 @@ index fd28d21..4c65295 100644
  		LUA_CDIR"?.lua;"  LUA_CDIR"?/init.lua;" \
 +		LUA_VENDOR_LDIR"?.lua;"  LUA_VENDOR_LDIR"?/init.lua;" \
 +		LUA_VENDOR_CDIR"?.lua;"  LUA_VENDOR_CDIR"?/init.lua;" \
++		LUA_VENDOR_COMMON_LDIR"?.lua;"  LUA_VENDOR_COMMON_LDIR"?/init.lua;" \
  		"./?.lua;" "./?/init.lua"
  #define LUA_CPATH_DEFAULT \
 -		LUA_CDIR"?.so;" LUA_CDIR"loadall.so;" "./?.so"
-- 
cgit v1.2.3