Update to first release

3 files changed, 30 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 02fe624c92d0..39a9da8518e4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = lua54
 	pkgdesc = Powerful lightweight programming language designed for extending applications
-	pkgver = 5.4.0.rc2
+	pkgver = 5.4.0
 	pkgrel = 1
 	url = https://www.lua.org/
 	arch = x86_64
@@ -8,12 +8,12 @@ pkgbase = lua54
 	depends = readline
 	options = !emptydirs
 	options = !strip
-	source = https://www.lua.org/work/lua-5.4.0-rc2.tar.gz
+	source = https://www.lua.org/ftp/lua-5.4.0.tar.gz
 	source = liblua.so.patch
 	source = lua.pc
 	source = LICENSE
-	sha512sums = 1823e953adc3ad34a479a6cc67bdcf4dbb85d483aab2a51f71db70ad6e6a34576f2db986d7540b529eef92a43bfa9c16587e2e2426e66b12650c26e2a1ac5c21
-	sha512sums = b53d289255cedde25608bcfe0ab21838744af08f99210543b1c56bbc70ba5fb1e1816581717b56fc173aa2b5f6f8ffc7a31408287d1d0fc7ef2f61a72c11591d
+	sha512sums = 22aa0f9fcf953fc49c97bf50a4cee708b458e8a95447f881037b2c6ddd60e40368a807f2575671c6cd7497cedc2cf5716a8959c196445bf9a359fe7ebcd65465
+	sha512sums = 45ac0e43f200b2dc10d4bebf2d92c920f9082a3cb9d96ad4d6171fc8f0c625dbb9cf650d596042630246b1f9103bf2d912caae4161c1c0f032e10bcb017b31a3
 	sha512sums = a3ae5f5c63a27956a2c69464cf966512be7404aef72d49b0b3b17e35999ceed04ec7be12ef19269f4cac908141b98dd5d16df9c238823fe0c1e068212914657a
 	sha512sums = bef221ae96e72d11785ec608ce96fa688ce4e12fecaaadc8c3e38d7d153922f4fdd2cf06a47e9f8840a165d42d9aa31f44c322f5c6c8402e8e31475de4e5893b
 
diff --git a/PKGBUILD b/PKGBUILD
index 429c962de48b..8113de9a4006 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,5 @@
 pkgname=lua54
-_pkgver=5.4.0
-_pkgaver=$_pkgver-rc2
-pkgver=${_pkgaver//\-/.}
+pkgver=5.4.0
 pkgrel=1
 pkgdesc='Powerful lightweight programming language designed for extending applications'
 arch=('x86_64')
@@ -9,35 +7,35 @@ url='https://www.lua.org/'
 depends=('readline')
 license=('MIT')
 options=('!emptydirs' '!strip')
-source=(https://www.lua.org/work/lua-$_pkgaver.tar.gz
+source=(https://www.lua.org/ftp/lua-$pkgver.tar.gz
         liblua.so.patch
         lua.pc
         LICENSE)
-sha512sums=('1823e953adc3ad34a479a6cc67bdcf4dbb85d483aab2a51f71db70ad6e6a34576f2db986d7540b529eef92a43bfa9c16587e2e2426e66b12650c26e2a1ac5c21'
-            'b53d289255cedde25608bcfe0ab21838744af08f99210543b1c56bbc70ba5fb1e1816581717b56fc173aa2b5f6f8ffc7a31408287d1d0fc7ef2f61a72c11591d'
+sha512sums=('22aa0f9fcf953fc49c97bf50a4cee708b458e8a95447f881037b2c6ddd60e40368a807f2575671c6cd7497cedc2cf5716a8959c196445bf9a359fe7ebcd65465'
+            '45ac0e43f200b2dc10d4bebf2d92c920f9082a3cb9d96ad4d6171fc8f0c625dbb9cf650d596042630246b1f9103bf2d912caae4161c1c0f032e10bcb017b31a3'
             'a3ae5f5c63a27956a2c69464cf966512be7404aef72d49b0b3b17e35999ceed04ec7be12ef19269f4cac908141b98dd5d16df9c238823fe0c1e068212914657a'
             'bef221ae96e72d11785ec608ce96fa688ce4e12fecaaadc8c3e38d7d153922f4fdd2cf06a47e9f8840a165d42d9aa31f44c322f5c6c8402e8e31475de4e5893b')
 prepare() {
-  cd lua-$_pkgver
+  cd lua-$pkgver
   patch -p1 -i ../liblua.so.patch
 
-  sed "s/%VER%/${_pkgver%.*}/g;s/%REL%/$_pkgver/g" ../lua.pc > lua.pc
+  sed "s/%VER%/${pkgver%.*}/g;s/%REL%/$pkgver/g" ../lua.pc > lua.pc
   sed -e 's:llua:llua5.4:' -e 's:/include:/include/lua5.4:' -i lua.pc
   sed -r -e '/^LUA_(SO|A|T)=/ s/lua/lua5.4/' -e '/^LUAC_T=/ s/luac/luac5.4/' -i src/Makefile
 }
 
 build() {
-  cd lua-$_pkgver
+  cd lua-$pkgver
 
   make MYCFLAGS="$CFLAGS -fPIC -DLUA_COMPAT_5_1 -DLUA_COMPAT_5_2 -g" MYLDFLAGS="$LDFLAGS" linux
 }
 
 package() {
-  cd lua-$_pkgver
+  cd lua-$pkgver
 
   make \
     TO_BIN='lua5.4 luac5.4' \
-    TO_LIB="liblua5.4.a liblua5.4.so liblua5.4.so.5.4 liblua5.4.so.$_pkgver" \
+    TO_LIB="liblua5.4.a liblua5.4.so liblua5.4.so.5.4 liblua5.4.so.$pkgver" \
     INSTALL_DATA='cp -d' \
     INSTALL_TOP="$pkgdir"/usr \
     INSTALL_INC="$pkgdir"/usr/include/lua5.4 \
@@ -51,7 +49,7 @@ package() {
   install -Dm644 ../LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 
   ln -s liblua5.4.so "$pkgdir"/usr/lib/liblua.so.5.4
-  ln -s liblua5.4.so "$pkgdir"/usr/lib/liblua.so.$_pkgver
+  ln -s liblua5.4.so "$pkgdir"/usr/lib/liblua.so.$pkgver
  
   cd "$pkgdir"/usr/share/man/man1
   mv lua.1 lua5.4.1
diff --git a/liblua.so.patch b/liblua.so.patch
index 19d6310b2a46..503bddb203b0 100644
--- a/liblua.so.patch
+++ b/liblua.so.patch
@@ -1,6 +1,6 @@
 diff -ruN a/Makefile b/Makefile
---- a/Makefile	2020-04-15 09:55:07.000000000 -0300
-+++ b/Makefile	2020-04-18 10:31:59.424670791 -0300
+--- a/Makefile	2020-06-30 09:50:04.478042566 -0300
++++ b/Makefile	2020-06-30 09:50:57.596484557 -0300
 @@ -52,7 +52,7 @@
  all:	$(PLAT)
  
@@ -10,9 +10,21 @@ diff -ruN a/Makefile b/Makefile
  
  install: dummy
  	cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD)
+diff -ruN a/src/luaconf.h b/src/luaconf.h
+--- a/src/luaconf.h	2020-06-30 09:50:04.480042583 -0300
++++ b/src/luaconf.h	2020-06-30 09:51:20.970680775 -0300
+@@ -227,7 +227,7 @@
+ 
+ #else			/* }{ */
+ 
+-#define LUA_ROOT	"/usr/local/"
++#define LUA_ROOT	"/usr/"
+ #define LUA_LDIR	LUA_ROOT "share/lua/" LUA_VDIR "/"
+ #define LUA_CDIR	LUA_ROOT "lib/lua/" LUA_VDIR "/"
+ 
 diff -ruN a/src/Makefile b/src/Makefile
---- a/src/Makefile	2020-04-15 10:00:29.000000000 -0300
-+++ b/src/Makefile	2020-04-18 10:33:15.608253222 -0300
+--- a/src/Makefile	2020-06-30 09:50:04.480042583 -0300
++++ b/src/Makefile	2020-06-30 09:50:57.597484566 -0300
 @@ -33,6 +33,7 @@
  PLATS= guess aix bsd c89 freebsd generic linux linux-readline macosx mingw posix solaris