From 3c43ac9eb5d02d8fa4005984d12ae3506e29dd05 Mon Sep 17 00:00:00 2001
From: Tim Schumacher <timschumi@gmx.de>
Date: Fri, 24 Jun 2022 21:50:06 +0200
Subject: [PATCH] Ports/lua: Update to Lua 5.4

---
 Ports/AvailablePorts.md                       |  2 +-
 Ports/lua/package.sh                          | 21 +++++++++----
 ...dd-a-serenity-target-to-the-makefile.patch | 30 +++++++------------
 3 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md
index 23eb0ef6bc..d29c435a1b 100644
--- a/Ports/AvailablePorts.md
+++ b/Ports/AvailablePorts.md
@@ -130,7 +130,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n
 | [`libzip`](libzip/)                                 | libzip                                                          | 1.8.0                    | https://libzip.org/                                                            |
 | [`links`](links/)                                   | Links web browser                                               | 2.26                     | http://links.twibright.com/                                                    |
 | [`llvm`](llvm/)                                     | LLVM                                                            | 14.0.1                   | https://llvm.org/                                                              |
-| [`lua`](lua/)                                       | Lua                                                             | 5.3.6                    | https://www.lua.org/                                                           |
+| [`lua`](lua/)                                       | Lua                                                             | 5.4.4                    | https://www.lua.org/                                                           |
 | [`luajit`](luajit/)                                 | LuaJIT                                                          | 2.1.0-beta3              | https://luajit.org/luajit.html                                                 |
 | [`luarocks`](luarocks/)                             | LuaRocks                                                        | 3.8.0                    | https://luarocks.org/                                                          |
 | [`lure`](lure/)                                     | Lure of the Temptress                                           | 1.1                      | https://www.scummvm.org/games/#games-lure                                      |
diff --git a/Ports/lua/package.sh b/Ports/lua/package.sh
index 3dc3eed5c9..2a04bb3286 100755
--- a/Ports/lua/package.sh
+++ b/Ports/lua/package.sh
@@ -1,8 +1,17 @@
 #!/usr/bin/env -S bash ../.port_include.sh
-port=lua
-version=5.3.6
-files="http://www.lua.org/ftp/lua-${version}.tar.gz lua-${version}.tar.gz fc5fd69bb8736323f026672b1b7235da613d7177e72558893a0bdcd320466d60"
+port='lua'
+version='5.4.4'
+files="http://www.lua.org/ftp/lua-${version}.tar.gz lua-${version}.tar.gz 164c7849653b80ae67bec4b7473b884bf5cc8d2dca05653475ec2ed27b9ebf61"
 depends=("readline")
-auth_type=sha256
-makeopts=("-Csrc/" "-j$(nproc)" "serenity" "CC=${CC}" "AR=${AR}" "RANLIB=${RANLIB}" )
-installopts=("INSTALL_TOP=${SERENITY_INSTALL_ROOT}/usr/local")
+auth_type='sha256'
+makeopts=(
+    "-Csrc/"
+    "-j$(nproc)"
+    "serenity"
+    "CC=${CC}"
+    "AR=${AR}"
+    "RANLIB=${RANLIB}"
+)
+installopts=(
+    "INSTALL_TOP=${SERENITY_INSTALL_ROOT}/usr/local"
+)
diff --git a/Ports/lua/patches/0001-Add-a-serenity-target-to-the-makefile.patch b/Ports/lua/patches/0001-Add-a-serenity-target-to-the-makefile.patch
index 0191d7023f..bac8d92ed3 100644
--- a/Ports/lua/patches/0001-Add-a-serenity-target-to-the-makefile.patch
+++ b/Ports/lua/patches/0001-Add-a-serenity-target-to-the-makefile.patch
@@ -9,32 +9,24 @@ Co-Authored-By: Larkin <45925460+larb0b@users.noreply.github.com>
 Co-Authored-By: Linus Groh <mail@linusgroh.de>
 Co-Authored-By: Noah Rosamilia <ivoahivoah@gmail.com>
 ---
- src/Makefile | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
+ src/Makefile | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/src/Makefile b/src/Makefile
-index a13afb9..c54c7bd 100644
+index 1907381..04beda5 100644
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -26,7 +26,7 @@ MYOBJS=
+@@ -30,7 +30,7 @@ CMCFLAGS=
  
  # == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE =======
  
--PLATS= aix bsd c89 freebsd generic linux macosx mingw posix solaris
-+PLATS= aix bsd c89 freebsd generic linux macosx mingw posix solaris serenity
+-PLATS= guess aix bsd c89 freebsd generic linux linux-readline macosx mingw posix solaris
++PLATS= guess aix bsd c89 freebsd generic linux linux-readline macosx mingw posix solaris serenity
  
  LUA_A=	liblua.a
- CORE_O=	lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
-@@ -100,7 +100,6 @@ c89:
- 	@echo '*** C89 does not guarantee 64-bit integers for Lua.'
- 	@echo ''
- 
--
- freebsd:
- 	$(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX -I/usr/include/edit" SYSLIBS="-Wl,-E -ledit" CC="cc"
- 
-@@ -124,6 +123,13 @@ posix:
- solaris:
+ CORE_O=	lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o lundump.o lvm.o lzio.o
+@@ -140,6 +140,13 @@ posix:
+ SunOS solaris:
  	$(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN -D_REENTRANT" SYSLIBS="-ldl"
  
 +serenity:
@@ -44,6 +36,6 @@ index a13afb9..c54c7bd 100644
 +		SYSCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN -DLUA_USE_READLINE" \
 +		SYSLIBS="-ldl -lreadline"
 +
- # list targets that do not create files (but not all makes understand .PHONY)
- .PHONY: all $(PLATS) default o a clean depend echo none
+ # Targets that do not create files (not all makes understand .PHONY).
+ .PHONY: all $(PLATS) help test clean default o a depend echo