aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander M Pickering <alex@cogarr.net>2024-09-23 15:35:03 -0500
committerAlexander M Pickering <alex@cogarr.net>2024-09-23 15:35:03 -0500
commit8d66041ae560f53e107649c288e0f22e5101cc2b (patch)
treece5f7a60ced0a891d5a8a0de3c4fb238d5f5af2c
parentcbd88cf79dd21911003efde5b9c9c3d476b5af8c (diff)
downloadluarocks-packaging-8d66041ae560f53e107649c288e0f22e5101cc2b.tar.gz
luarocks-packaging-8d66041ae560f53e107649c288e0f22e5101cc2b.tar.bz2
luarocks-packaging-8d66041ae560f53e107649c288e0f22e5101cc2b.zip
Corrected patch
-rw-r--r--luarocks.exe.c.patch70
1 files changed, 35 insertions, 35 deletions
diff --git a/luarocks.exe.c.patch b/luarocks.exe.c.patch
index 5410bfc..a8c022f 100644
--- a/luarocks.exe.c.patch
+++ b/luarocks.exe.c.patch
@@ -1,47 +1,47 @@
1--- luarocks.exe.c 2024-09-23 15:27:52.663551300 -0500 1--- luarocks.exe.c 2024-09-23 15:25:00.870448000 -0500
2+++ luarocks.exe.c.orig 2024-09-23 15:25:00.870448000 -0500 2+++ luarocks.exe.c 2024-09-23 15:27:52.663551300 -0500
3@@ -17,33 +17,6 @@ 3@@ -17,6 +17,33 @@
4 #define getprogname() 4 #define getprogname()
5 #endif 5 #endif
6 6
7-/* LUA_OK defined in lua 5.2+ */ 7+/* LUA_OK defined in lua 5.2+ */
8-#ifndef LUA_OK 8+#ifndef LUA_OK
9-#define LUA_OK 0 9+#define LUA_OK 0
10-#endif 10+#endif
11- 11+
12-/* luaL_traceback() introduced in lua 5.2 */ 12+/* luaL_traceback() introduced in lua 5.2 */
13-#ifndef luaL_traceback 13+#ifndef luaL_traceback
14-static inline void 14+static inline void
15-luaL_traceback(lua_State *L, lua_State *L1, const char *msg, int level){ 15+luaL_traceback(lua_State *L, lua_State *L1, const char *msg, int level){
16- lua_getfield(L, LUA_GLOBALSINDEX, "debug"); 16+ lua_getfield(L, LUA_GLOBALSINDEX, "debug");
17- if(!lua_istable(L,-1)){ 17+ if(!lua_istable(L,-1)){
18- lua_pop(L,1); 18+ lua_pop(L,1);
19- return; 19+ return;
20- } 20+ }
21- lua_getfield(L, -1, "traceback"); 21+ lua_getfield(L, -1, "traceback");
22- if(!lua_isfunction(L,-1)){ 22+ if(!lua_isfunction(L,-1)){
23- lua_pop(L,2); 23+ lua_pop(L,2);
24- return; 24+ return;
25- } 25+ }
26- lua_pushthread(L1); 26+ lua_pushthread(L1);
27- lua_pushstring(L,msg); 27+ lua_pushstring(L,msg);
28- lua_pushnumber(L,level); 28+ lua_pushnumber(L,level);
29- lua_call(L,3,1); 29+ lua_call(L,3,1);
30- return; 30+ return;
31-} 31+}
32-#endif 32+#endif
33- 33+
34 static int registry_key; 34 static int registry_key;
35 35
36 /* fatal error, from srlua */ 36 /* fatal error, from srlua */
37@@ -38309,9 +38282,7 @@ 37@@ -38282,7 +38309,9 @@
38 lua_pop(L, 1); 38 lua_pop(L, 1);
39 lua_getfield(L, -1, "loaders"); /* table table.insert package package.loaders */ 39 lua_getfield(L, -1, "loaders"); /* table table.insert package package.loaders */
40 } 40 }
41- /* lua_copy introduced in lua 5.2 */ 41- lua_copy(L, 4, 3); /* table table.insert package.searchers */
42- lua_replace(L,3); 42+ /* lua_copy introduced in lua 5.2 */
43- //lua_copy(L, 4, 3); /* table table.insert package.searchers */ 43+ lua_replace(L,3);
44+ lua_copy(L, 4, 3); /* table table.insert package.searchers */ 44+ //lua_copy(L, 4, 3); /* table table.insert package.searchers */
45 lua_settop(L, 3); /* table table.insert package.searchers */ 45 lua_settop(L, 3); /* table table.insert package.searchers */
46 lua_pushnumber(L, 1); /* table table.insert package.searchers 1 */ 46 lua_pushnumber(L, 1); /* table table.insert package.searchers 1 */
47 lua_pushcfunction(L, pkg_loader); /* table table.insert package.searchers 1 pkg_loader */ 47 lua_pushcfunction(L, pkg_loader); /* table table.insert package.searchers 1 pkg_loader */