Build for Lua 5.4 and remove packaged tests.

3 files changed, 36 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 26532872c2fd..d936c20137ad 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Tue Nov 14 19:54:10 UTC 2017
 pkgbase = lua-cjson
 	pkgdesc = A fast JSON parsing and encoding support for Lua.
 	pkgver = 2.1.0
-	pkgrel = 3
+	pkgrel = 4
 	url = https://www.kyne.com.au/~mark/software/lua-cjson.php
 	arch = i686
 	arch = x86_64
@@ -11,7 +9,9 @@ pkgbase = lua-cjson
 	depends = lua
 	optdepends = perl: UTF8 implementation test
 	source = https://www.kyne.com.au/~mark/software/download/lua-cjson-2.1.0.tar.gz
+	source = no-tests.patch
 	md5sums = 24f270663e9f6ca8ba2a02cef19f7963
+	md5sums = 39475544badeb963f0bf95acd69dce71
 
 pkgname = lua-cjson
 
diff --git a/PKGBUILD b/PKGBUILD
index 5502fb987891..546096cc492e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,26 @@
 # Maintainer: zopieux <web+oss at zopieux dot com>
 
-_lua_version=5.3
+_lua_version=5.4
 
 pkgname=lua-cjson
 pkgver=2.1.0
-pkgrel=3
+pkgrel=4
 pkgdesc="A fast JSON parsing and encoding support for Lua."
 arch=(i686 x86_64)
 url="https://www.kyne.com.au/~mark/software/lua-cjson.php"
 license=('custom:MIT')
 depends=("lua")
 optdepends=('perl: UTF8 implementation test')
-source=("https://www.kyne.com.au/~mark/software/download/$pkgname-$pkgver.tar.gz")
-md5sums=('24f270663e9f6ca8ba2a02cef19f7963')
+source=(
+  "https://www.kyne.com.au/~mark/software/download/$pkgname-$pkgver.tar.gz"
+  "no-tests.patch")
+md5sums=('24f270663e9f6ca8ba2a02cef19f7963'
+         '39475544badeb963f0bf95acd69dce71')
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+  patch --forward --strip=1 --input="${srcdir}/no-tests.patch"
+}
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/no-tests.patch b/no-tests.patch
new file mode 100644
index 000000000000..7512275c7ad3
--- /dev/null
+++ b/no-tests.patch
@@ -0,0 +1,21 @@
+diff --unified --recursive --text lua-cjson-2.1.0.old/Makefile lua-cjson-2.1.0.new/Makefile
+--- lua-cjson-2.1.0.old/Makefile	2012-03-01 13:22:50.000000000 +0100
++++ lua-cjson-2.1.0.new/Makefile	2020-09-25 01:41:33.188384712 +0200
+@@ -104,16 +104,13 @@
+ 	chmod $(EXECPERM) $(DESTDIR)/$(LUA_CMODULE_DIR)/$(TARGET)
+ 
+ install-extra:
+-	mkdir -p $(DESTDIR)/$(LUA_MODULE_DIR)/cjson/tests \
+-		$(DESTDIR)/$(LUA_BIN_DIR)
++	mkdir -p $(DESTDIR)/$(LUA_MODULE_DIR)/cjson $(DESTDIR)/$(LUA_BIN_DIR)
+ 	cp lua/cjson/util.lua $(DESTDIR)/$(LUA_MODULE_DIR)/cjson
+ 	chmod $(DATAPERM) $(DESTDIR)/$(LUA_MODULE_DIR)/cjson/util.lua
+ 	cp lua/lua2json.lua $(DESTDIR)/$(LUA_BIN_DIR)/lua2json$(LUA_BIN_SUFFIX)
+ 	chmod $(EXECPERM) $(DESTDIR)/$(LUA_BIN_DIR)/lua2json$(LUA_BIN_SUFFIX)
+ 	cp lua/json2lua.lua $(DESTDIR)/$(LUA_BIN_DIR)/json2lua$(LUA_BIN_SUFFIX)
+ 	chmod $(EXECPERM) $(DESTDIR)/$(LUA_BIN_DIR)/json2lua$(LUA_BIN_SUFFIX)
+-	cd tests; cp $(TEST_FILES) $(DESTDIR)/$(LUA_MODULE_DIR)/cjson/tests
+-	cd tests; chmod $(DATAPERM) $(TEST_FILES); chmod $(EXECPERM) *.lua *.pl
+ 
+ clean:
+ 	rm -f *.o $(TARGET)