lua5.4, bump version (#10642)

dev-lang/lua/lua-5.4.7.recipe

@@ -7,9 +7,9 @@ collection, making it ideal for configuration, scripting, and rapid prototyping.
 HOMEPAGE="https://www.lua.org/"
 COPYRIGHT="1994-2023 Lua.org, PUC-Rio"
 LICENSE="MIT"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="http://www.lua.org/ftp/lua-$portVersion.tar.gz"
-CHECKSUM_SHA256="7d5ea1b9cb6aa0b59ca3dde1c6adcb57ef83a1ba8e5432c0ecd06bf439b3ad88"
+CHECKSUM_SHA256="9fbf5e28ef86c69858f6d3d34eccc32e911c1a28b4120ff3e84aaa70cfbf1e30"
 PATCHES="lua-$portVersion.patchset"
 if [ $effectiveTargetArchitecture = x86_gcc2 ]; then
 	PATCHES+="
@@ -62,7 +62,9 @@ if [ $effectiveTargetArchitecture = x86_gcc2 ]; then
 	GCC2_CFLAG="-DLUA_NOBUILTIN=1"
 fi
 
-	make haiku MYCFLAGS="-DLUA_ROOT='\"$prefix/\"' -DLUA_LDIR='\"$dataDir/lua/$libVersion/\"' \
+	make haiku MYCFLAGS="-DLUA_ROOT='\"`finddir B_SYSTEM_DIRECTORY`/\"' \
+		-DLUA_LDIR='\"`finddir B_SYSTEM_DATA_DIRECTORY`/lua/$libVersion/\"' \
+		-DLUA_EXEC_DIR='\"`finddir B_SYSTEM_BIN_DIRECTORY`/\"' \
 		$GCC2_CFLAG" LUA_T="lua$libVersion" LUAC_T="luac$libVersion" \
 		LUA_SO="liblua.so.$libVersion"
 }
@@ -79,7 +81,7 @@ INSTALL()
 	ln -s liblua.so.$libVersion $libDir/liblua.so
 
 	mkdir -p $docDir
-	cp doc/{*.html,logo.gif,lua.css,manual.css,osi-certified-72x60.png} $docDir
+	cp doc/{*.html,logo.gif,lua.css,manual.css,OSIApproved_100X125.png} $docDir
 
 	rm -r $dataDir #empty directory
 	rm -r $prefix/lib/lua #empty directory

dev-lang/lua/patches/lua-5.4.7.gcc2.patchset

@@ -5,7 +5,7 @@ Subject: gcc2 patch
 
 
 diff --git a/src/Makefile b/src/Makefile
-index 9c5ff15..b5968c5 100644
+index f2a74ab..853680f 100644
 --- a/src/Makefile
 +++ b/src/Makefile
 @@ -6,8 +6,8 @@
@@ -20,5 +20,5 @@ index 9c5ff15..b5968c5 100644
  LIBS= -lm $(SYSLIBS) $(MYLIBS)
  
 -- 
-2.37.3
+2.45.1
 

dev-lang/lua/patches/lua-5.4.7.patchset

@@ -1,11 +1,11 @@
-From cb7c92bdacd0d801b564741a1b456283e1bcd243 Mon Sep 17 00:00:00 2001
+From 8934e5642887ff0569f893784f0b8ec5582c75de Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Mon, 5 May 2014 15:59:15 +0000
 Subject: import patch from 5.2.1
 
 
 diff --git a/Makefile b/Makefile
-index 8efa2eb..ff139c0 100644
+index 72ca8ff..06aa6ee 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -36,12 +36,12 @@ RM= rm -f
@@ -23,7 +23,7 @@ index 8efa2eb..ff139c0 100644
  TO_MAN= lua.1 luac.1
  
  # Lua version and release.
-@@ -52,7 +52,7 @@ R= $V.6
+@@ -52,7 +52,7 @@ R= $V.7
  all:	$(PLAT)
  
  $(PLATS) help test clean:
@@ -75,7 +75,7 @@ index b771196..9c5ff15 100644
  	$(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_IOS"
  
 diff --git a/src/luaconf.h b/src/luaconf.h
-index 137103e..73951a0 100644
+index 33bb580..f473ee5 100644
 --- a/src/luaconf.h
 +++ b/src/luaconf.h
 @@ -75,6 +75,12 @@
@@ -105,10 +105,10 @@ index 137103e..73951a0 100644
  
  #if !defined(LUA_PATH_DEFAULT)
 -- 
-2.39.2
+2.45.1
 
 
-From 36473ed9d445326d7215198ceb970e1fb540b76c Mon Sep 17 00:00:00 2001
+From 0173eef78d4e0591d31912bfe92d1a9589a24cee Mon Sep 17 00:00:00 2001
 From: Chris Roberts <cpr420@gmail.com>
 Date: Thu, 6 Jul 2023 10:28:47 -0600
 Subject: enable readline support on Haiku
@@ -128,5 +128,85 @@ index 9c5ff15..f2a74ab 100644
  ios:
  	$(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_IOS"
 -- 
-2.39.2
+2.45.1
+
+
+From 1903b3b6648f4e17162f68db6fa9f73c34702d56 Mon Sep 17 00:00:00 2001
+From: Schrijvers Luc <begasus@gmail.com>
+Date: Fri, 28 Jun 2024 09:20:53 +0200
+Subject: also undef LUA_EXEC_DIR
+
+
+diff --git a/src/luaconf.h b/src/luaconf.h
+index f473ee5..cee5745 100644
+--- a/src/luaconf.h
++++ b/src/luaconf.h
+@@ -189,7 +189,9 @@
+ */
+ #define LUA_PATH_SEP            ";"
+ #define LUA_PATH_MARK           "?"
++#ifndef LUA_EXEC_DIR
+ #define LUA_EXEC_DIR            "!"
++#endif
+ 
+ 
+ /*
+-- 
+2.45.1
+
+
+From 6ea49f79297095931886489551b4c6275448f51b Mon Sep 17 00:00:00 2001
+From: Schrijvers Luc <begasus@gmail.com>
+Date: Fri, 28 Jun 2024 11:31:45 +0200
+Subject: Add non-packaged search path
+
+
+diff --git a/src/luaconf.h b/src/luaconf.h
+index cee5745..45f18cb 100644
+--- a/src/luaconf.h
++++ b/src/luaconf.h
+@@ -243,12 +243,15 @@
+ #define LUA_PATH_DEFAULT  \
+ 		LUA_LDIR"?.lua;"  LUA_LDIR"?/init.lua;" \
+ 		LUA_CDIR"?.lua;"  LUA_CDIR"?/init.lua;" \
+-		"./?.lua;" "./?/init.lua"
++		"./?.lua;" "./?/init.lua;" \
++		"/boot/home/config/non-packaged/data/lua/5.4/?.lua;" \
++		"/boot/home/config/non-packaged/lib/lua/5.4/?/init.lua"
++
+ #endif
+ 
+ #if !defined(LUA_CPATH_DEFAULT)
+ #define LUA_CPATH_DEFAULT \
+-		LUA_CDIR"?.so;" LUA_CDIR"loadall.so;" "./?.so"
++		LUA_CDIR"?.so;" LUA_CDIR"loadall.so;" "./?.so;" "/boot/home/config/non-packaged/lib/lua/5.4/?.so"
+ #endif
+ 
+ #endif			/* } */
+-- 
+2.45.1
+
+
+From 0f65521c9c71a9d91e021221872600bef86b6bfa Mon Sep 17 00:00:00 2001
+From: Schrijvers Luc <begasus@gmail.com>
+Date: Fri, 28 Jun 2024 11:51:22 +0200
+Subject: add non-packaged path for bin
+
+
+diff --git a/src/luaconf.h b/src/luaconf.h
+index 45f18cb..992281e 100644
+--- a/src/luaconf.h
++++ b/src/luaconf.h
+@@ -243,7 +243,9 @@
+ #define LUA_PATH_DEFAULT  \
+ 		LUA_LDIR"?.lua;"  LUA_LDIR"?/init.lua;" \
+ 		LUA_CDIR"?.lua;"  LUA_CDIR"?/init.lua;" \
++		LUA_EXEC_DIR"!;"  "/boot/home/config/non-packaged/bin/?;" \
+ 		"./?.lua;" "./?/init.lua;" \
++		"/boot/home/config/non-packaged/bin/?;" \
+ 		"/boot/home/config/non-packaged/data/lua/5.4/?.lua;" \
+ 		"/boot/home/config/non-packaged/lib/lua/5.4/?/init.lua"
+ 
+-- 
+2.45.1