Patch for Lua >= 5.4

2 files changed, 37 insertions, 4 deletions

diff --git a/PKGBUILD b/PKGBUILD
index c70226a44eaf..7cc45ed7930c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,21 +6,39 @@ _git_rev=d8c93345d87a96135739017566d98b02774f558a
 
 pkgname=lua-${_lua_name}
 pkgver=2.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Programmatically create PDF files using Lua.'
 arch=('any')
 url='http://luahpdf.colloquiki.com/'
 license=('MIT')
 depends=('lua' 'libharu')
-source=(${pkgname}-${_git_rev}.tar.gz::"https://github.com/jung-kurt/luahpdf/archive/${_git_rev}.tar.gz")
-sha256sums=('6eb8c6392bcc76d85d851004d702f3cbf00f485661706ad64ec7d91d5519a925')
+source=(
+	${pkgname}-${_git_rev}.tar.gz::"https://github.com/jung-kurt/luahpdf/archive/${_git_rev}.tar.gz"
+	'lua54.patch'
+)
+sha256sums=(
+	'6eb8c6392bcc76d85d851004d702f3cbf00f485661706ad64ec7d91d5519a925'
+	'8b830ef6c397f8f83294989e2dd9bdd748e0c95580a85c22a09b8b8b228add44'
+)
+
+prepare() {
+	cd "${srcdir}/lua${_lua_name}-${_git_rev}"
+	patch -p1 -i ../lua54.patch
+}
 
 build() {
 	cd "${srcdir}/lua${_lua_name}-${_git_rev}"
 	LUALIB="-llua" LUAINC="" make
 }
 
+_extract_string_define() {
+	sed -n "s/#define[ 	]\\+${1}[j	]\\+\"\\(.*\\)\"/\\1/p" "${2}"
+}
+
 package() {
 	cd "${srcdir}/lua${_lua_name}-${_git_rev}"
-	PREFIX="/usr" DESTDIR="${pkgdir}" MODDIR="/usr/lib/lua/5.3" make install
+	MAJOR="$(_extract_string_define LUA_VERSION_MAJOR /usr/include/lua.h)"
+	MINOR="$(_extract_string_define LUA_VERSION_MINOR /usr/include/lua.h)"
+	[ "${MAJOR}" -a "${MINOR}" ] || exit 1
+	PREFIX="/usr" DESTDIR="${pkgdir}" MODDIR="/usr/lib/lua/${MAJOR}.${MINOR}" make install
 }
diff --git a/lua54.patch b/lua54.patch
new file mode 100644
index 000000000000..6486b9535080
--- /dev/null
+++ b/lua54.patch
@@ -0,0 +1,15 @@
+diff --git a/hpdf.c b/hpdf.c
+index 2f10caf..6ec69ec 100644
+--- a/hpdf.c
++++ b/hpdf.c
+@@ -43,6 +43,10 @@ static void luaL_setfuncs (
+ }
+ #endif
+ 
++#ifndef LUA_QS
++#define LUA_QS "'%s'"
++#endif
++
+ typedef enum LclHndCatEnum {
+   CnHndAnnotation,
+   CnHndDestination,