scite: fix use-lua patch

2 files changed, 64 insertions, 135 deletions

diff --git a/scite-fedora/use-lua5.4.4.patch b/scite-fedora/use-lua5.4.4.patch
index d4c2903..382df1a 100644
--- a/scite-fedora/use-lua5.4.4.patch
+++ b/scite-fedora/use-lua5.4.4.patch
@@ -1,9 +1,11 @@
-Name: Patch scite to use distro package of lua
-Version: 5.2.2
-Lua Version: 5.4.4
+Name: Patch scite to use distro package of lua, Devuan
+Version: 5.2.3
+Lua-Version: 5.4.4
 Author: bgstack15@gmail.com
-Date: 2022-04-04
-Includes almost exactly the debian 0007-Build-with-Debian-packaged-Lua.patch
+Date-Modified: 2022-05-31
+Message: Generated with the following command
+
+    sed -r -e 's/checkint\(/checkinteger\(/g;' -e 's/lua_strlen\(/lua_rawlen\(/g;' scite/src/LuaExtension.cxx > ~/LuaExtension.cxx.new
 diff -aur scite/gtk/deps.mak scite/gtk/deps.mak
 --- a/scite/gtk/deps.mak	2022-03-30 20:48:24.000000000 -0400
 +++ b/scite/gtk/deps.mak	2022-04-04 14:47:39.110529717 -0400
@@ -24,61 +26,61 @@ diff -aur scite/gtk/deps.mak scite/gtk/deps.mak
 diff -aur scite/src/LuaExtension.cxx scite/src/LuaExtension.cxx
 --- a/scite/src/LuaExtension.cxx	2022-03-30 20:48:24.000000000 -0400
 +++ b/scite/src/LuaExtension.cxx	2022-04-04 14:46:35.097978533 -0400
-@@ -237,7 +237,7 @@
+@@ -238,7 +238,7 @@
  
- 	const int paneIndex = lua_upvalueindex(1);
+ 	constexpr int paneIndex = lua_upvalueindex(1);
  	check_pane_object(L, paneIndex);
 -	const int message = luaL_checkint(L, 1);
 +	const int message = luaL_checkinteger(L, 1);
  
  	lua_pushvalue(L, paneIndex);
  	lua_replace(L, 1);
-@@ -276,7 +276,7 @@
+@@ -277,7 +277,7 @@
  }
  
- static int cf_scite_constname(lua_State *L) {
+ int cf_scite_constname(lua_State *L) {
 -	const int message = luaL_checkint(L, 1);
 +	const int message = luaL_checkinteger(L, 1);
  	const char *prefix = luaL_optstring(L, 2, nullptr);
  	const std::string constName = IFaceTable::GetConstantName(message, prefix);
  	if (constName.length() > 0) {
-@@ -307,7 +307,7 @@
+@@ -308,7 +308,7 @@
  }
  
- static int cf_scite_menu_command(lua_State *L) {
+ int cf_scite_menu_command(lua_State *L) {
 -	const int cmdID = luaL_checkint(L, 1);
 +	const int cmdID = luaL_checkinteger(L, 1);
  	if (cmdID) {
  		host->DoMenuCommand(cmdID);
  	}
-@@ -329,7 +329,7 @@
+@@ -330,7 +330,7 @@
  }
  
- static int cf_scite_strip_set(lua_State *L) {
+ int cf_scite_strip_set(lua_State *L) {
 -	const int control = luaL_checkint(L, 1);
 +	const int control = luaL_checkinteger(L, 1);
  	const char *value = luaL_checkstring(L, 2);
  	if (value) {
  		host->UserStripSet(control, value);
-@@ -338,7 +338,7 @@
+@@ -339,7 +339,7 @@
  }
  
- static int cf_scite_strip_set_list(lua_State *L) {
+ int cf_scite_strip_set_list(lua_State *L) {
 -	const int control = luaL_checkint(L, 1);
 +	const int control = luaL_checkinteger(L, 1);
  	const char *value = luaL_checkstring(L, 2);
  	if (value) {
  		host->UserStripSetList(control, value);
-@@ -347,7 +347,7 @@
+@@ -348,7 +348,7 @@
  }
  
- static int cf_scite_strip_value(lua_State *L) {
+ int cf_scite_strip_value(lua_State *L) {
 -	const int control = luaL_checkint(L, 1);
 +	const int control = luaL_checkinteger(L, 1);
  	std::string value = host->UserStripValue(control);
  	push_string(L, value);
  	return 1;
-@@ -437,7 +437,7 @@
+@@ -438,7 +438,7 @@
  		SA::Position rangeStart = 0;
  		SA::Position rangeEnd = 0;
  
@@ -87,7 +89,7 @@ diff -aur scite/src/LuaExtension.cxx scite/src/LuaExtension.cxx
  		hasError = (flags == 0 && lua_gettop(L) > nArgs);
  
  		if (!hasError) {
-@@ -514,7 +514,7 @@
+@@ -515,7 +515,7 @@
  
  	SA::ScintillaCall &sc = host->PaneCaller(pmo->pane);
  	sc.SetTarget(pmo->range);
@@ -96,7 +98,7 @@ diff -aur scite/src/LuaExtension.cxx scite/src/LuaExtension.cxx
  	pmo->range.end = sc.TargetEnd();
  	return 0;
  }
-@@ -600,7 +600,7 @@
+@@ -601,7 +601,7 @@
  		pmo->endPosOrig = 0;
  		pmo->flags = 0;
  		if (nargs >= 3) {
@@ -105,7 +107,7 @@ diff -aur scite/src/LuaExtension.cxx scite/src/LuaExtension.cxx
  			if (nargs >= 4) {
  				pmo->range.end = pmo->endPosOrig = luaL_checkinteger(L, 4);
  				if (pmo->range.end < 0) {
-@@ -765,7 +765,7 @@
+@@ -766,7 +766,7 @@
  	const int nargs = lua_gettop(L);
  	const char *code = luaL_checkstring(L, 1);
  	const char *name = luaL_optstring(L, 2, code);
@@ -114,7 +116,7 @@ diff -aur scite/src/LuaExtension.cxx scite/src/LuaExtension.cxx
  		lua_call(L, 0, LUA_MULTRET);
  		return lua_gettop(L) - nargs;
  	} else {
-@@ -896,7 +896,7 @@
+@@ -897,7 +897,7 @@
  	int loopParamCount = 2;
  
  	if (func.paramType[0] == iface_length && func.paramType[1] == iface_string) {
@@ -123,18 +125,18 @@ diff -aur scite/src/LuaExtension.cxx scite/src/LuaExtension.cxx
  		params[1] = SptrFromString(params[0] ? lua_tostring(L, arg) : "");
  		loopParamCount = 0;
  	} else if ((func.paramType[1] == iface_stringresult) || (func.returnType == iface_stringresult)) {
-@@ -915,8 +915,8 @@
+@@ -916,8 +916,8 @@
  			const char *s = lua_tostring(L, arg++);
  			params[i] = SptrFromString(s ? s : "");
  		} else if (func.paramType[i] == iface_keymod) {
 -			const int keycode = luaL_checkint(L, arg++) & 0xFFFF;
--			const int modifiers = luaL_checkint(L, arg++) &
+-			const intptr_t modifiers = luaL_checkint(L, arg++) &
 +			const int keycode = luaL_checkinteger(L, arg++) & 0xFFFF;
-+			const int modifiers = luaL_checkinteger(L, arg++) &
++			const intptr_t modifiers = luaL_checkinteger(L, arg++) &
  					      static_cast<int>(SA::KeyMod::Shift|SA::KeyMod::Ctrl|SA::KeyMod::Alt);
  			params[i] = keycode | (modifiers<<16);
  		} else if (func.paramType[i] == iface_bool) {
-@@ -1805,7 +1805,7 @@
+@@ -1787,7 +1787,7 @@
  	static int SetLevelAt(lua_State *L) {
  		StylingContext *context = Context(L);
  		const SA::Line line = luaL_checkinteger(L, 2);
@@ -143,7 +145,7 @@ diff -aur scite/src/LuaExtension.cxx scite/src/LuaExtension.cxx
  		context->styler->SetLevel(line, static_cast<SA::FoldLevel>(level));
  		return 0;
  	}
-@@ -1820,7 +1820,7 @@
+@@ -1802,7 +1802,7 @@
  	static int SetLineState(lua_State *L) {
  		StylingContext *context = Context(L);
  		const SA::Line line = luaL_checkinteger(L, 2);
@@ -152,7 +154,7 @@ diff -aur scite/src/LuaExtension.cxx scite/src/LuaExtension.cxx
  		context->styler->SetLineState(line, stateOfLine);
  		return 0;
  	}
-@@ -1898,7 +1898,7 @@
+@@ -1880,7 +1880,7 @@
  		StylingContext *context = Context(L);
  		const SA::Position startPosStyle = luaL_checkinteger(L, 2);
  		const SA::Position lengthStyle = luaL_checkinteger(L, 3);
@@ -161,7 +163,7 @@ diff -aur scite/src/LuaExtension.cxx scite/src/LuaExtension.cxx
  		context->StartStyling(startPosStyle, lengthStyle, initialStyle);
  		return 0;
  	}
-@@ -1957,7 +1957,7 @@
+@@ -1939,7 +1939,7 @@
  	static int SetState(lua_State *L) {
  		StylingContext *context = Context(L);
  		context->Colourize();
@@ -170,7 +172,7 @@ diff -aur scite/src/LuaExtension.cxx scite/src/LuaExtension.cxx
  		return 0;
  	}
  
-@@ -1965,13 +1965,13 @@
+@@ -1947,13 +1947,13 @@
  		StylingContext *context = Context(L);
  		context->Forward();
  		context->Colourize();
@@ -186,81 +188,4 @@ diff -aur scite/src/LuaExtension.cxx scite/src/LuaExtension.cxx
  		return 0;
  	}
  
-From: =?utf-8?q?Andreas_R=C3=B6nnquist?= <gusnan@debian.org>
-Date: Tue, 19 Jun 2018 15:34:57 +0200
-Subject: Build with Debian packaged Lua
-Forwarded: not-needed
-
----
- scite/gtk/deps.mak |  6 +-----
- scite/gtk/makefile | 30 ++++--------------------------
- 2 files changed, 5 insertions(+), 31 deletions(-)
 
---- a/scite/gtk/deps.mak
-+++ b/scite/gtk/deps.mak
-@@ -265,11 +265,7 @@
- 	../src/Extender.h \
- 	../src/IFaceTable.h \
- 	../src/SciTEKeys.h \
--	../src/LuaExtension.h \
--	../lua/src/lua.h \
--	../lua/src/luaconf.h \
--	../lua/src/lualib.h \
--	../lua/src/lauxlib.h
-+	../src/LuaExtension.h
- MatchMarker.o: \
- 	../src/MatchMarker.cxx \
- 	../../scintilla/include/ScintillaTypes.h \
---- a/scite/gtk/makefile
-+++ b/scite/gtk/makefile
-@@ -33,9 +33,9 @@
- 
- PYTHON = $(if $(windir),pyw,python3)
- 
--# For the Gnome desktop stuff to work, prefix must point to where Gnome thinks it is.
--CONFIGFLAGS:=$(shell $(PKG_CONFIG) --cflags $(GTK_VERSION))
--CONFIGLIB:=$(shell $(PKG_CONFIG) --libs $(GTK_VERSION) gthread-2.0 gmodule-no-export-2.0)
-+# For the Lua and Gnome desktop stuff to work, prefix must point to where Lua and Gnome thinks it is.
-+CONFIGFLAGS:=$(shell $(PKG_CONFIG) --cflags $(GTK_VERSION)) $(shell $(PKG_CONFIG) --cflags lua)
-+CONFIGLIB:=$(shell $(PKG_CONFIG) --libs $(GTK_VERSION) gthread-2.0 gmodule-no-export-2.0) $(shell $(PKG_CONFIG) --libs lua)
- gnomeprefix:=$(shell $(PKG_CONFIG) --variable=prefix $(GTK_VERSION) 2>/dev/null)
- ifndef prefix
- ifdef gnomeprefix
-@@ -72,28 +72,6 @@
- DEFINES += -D$(if $(DEBUG),DEBUG,NDEBUG)
- BASE_FLAGS += $(if $(DEBUG),-g,-Os)
- 
--ifndef NO_LUA
--LUA_CORE_OBJS = 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
--
--LUA_LIB_OBJS =	lauxlib.o lbaselib.o lbitlib.o lcorolib.o ldblib.o liolib.o lmathlib.o ltablib.o \
--		lstrlib.o loadlib.o loslib.o linit.o lutf8lib.o
--
--LUA_OBJS = LuaExtension.o $(LUA_CORE_OBJS) $(LUA_LIB_OBJS)
--
--vpath %.c $(srcdir)/../lua/src
--
--INCLUDES += -I$(srcdir)/../lua/src
--LUA_DEFINES = -DLUA_USE_POSIX -DLUA_USE_DLOPEN
--
--%.o: %.c
--	$(CC) $(CPPFLAGS) $(DEFINES) $(INCLUDES) $(WARNINGS) $(LUA_DEFINES) $(BASE_FLAGS) $(CFLAGS) -c $< -o $@
--
--else
--DEFINES += -DNO_LUA
--endif
--
- LIBS += -lm -lstdc++
- 
- UNAME:=$(shell uname -s)
-@@ -154,7 +132,7 @@
- 	StyleWriter.o \
- 	Utf8_16.o
- 
--$(PROG): SciTEGTK.o Strips.o GUIGTK.o Widget.o DirectorExtension.o $(SRC_OBJS) $(LUA_OBJS)
-+$(PROG): SciTEGTK.o Strips.o GUIGTK.o Widget.o DirectorExtension.o $(SRC_OBJS) LuaExtension.o
- 	$(CXX) $(BASE_FLAGS) $(LDFLAGS) -rdynamic -Wl,--as-needed -Wl,-rpath,'$${ORIGIN}' -Wl,--version-script $(srcdir)/lua.vers -Wl,-rpath,$(libdir) $^ -o $@ $(CONFIGLIB) $(LIBS) -L ../../scintilla/bin -lscintilla $(LDLIBS)
- 
- # Automatically generate header dependencies with "make depend"
diff --git a/scite/debian/patches/use-lua5.4.4.patch b/scite/debian/patches/use-lua5.4.4.patch
index 4268cc1..382df1a 100644
--- a/scite/debian/patches/use-lua5.4.4.patch
+++ b/scite/debian/patches/use-lua5.4.4.patch
@@ -1,8 +1,11 @@
 Name: Patch scite to use distro package of lua, Devuan
-Version: 5.2.2
-Lua Version: 5.4.4
+Version: 5.2.3
+Lua-Version: 5.4.4
 Author: bgstack15@gmail.com
-Date: 2022-04-04
+Date-Modified: 2022-05-31
+Message: Generated with the following command
+
+    sed -r -e 's/checkint\(/checkinteger\(/g;' -e 's/lua_strlen\(/lua_rawlen\(/g;' scite/src/LuaExtension.cxx > ~/LuaExtension.cxx.new
 diff -aur scite/gtk/deps.mak scite/gtk/deps.mak
 --- a/scite/gtk/deps.mak	2022-03-30 20:48:24.000000000 -0400
 +++ b/scite/gtk/deps.mak	2022-04-04 14:47:39.110529717 -0400
@@ -23,61 +26,61 @@ diff -aur scite/gtk/deps.mak scite/gtk/deps.mak
 diff -aur scite/src/LuaExtension.cxx scite/src/LuaExtension.cxx
 --- a/scite/src/LuaExtension.cxx	2022-03-30 20:48:24.000000000 -0400
 +++ b/scite/src/LuaExtension.cxx	2022-04-04 14:46:35.097978533 -0400
-@@ -237,7 +237,7 @@
+@@ -238,7 +238,7 @@
  
- 	const int paneIndex = lua_upvalueindex(1);
+ 	constexpr int paneIndex = lua_upvalueindex(1);
  	check_pane_object(L, paneIndex);
 -	const int message = luaL_checkint(L, 1);
 +	const int message = luaL_checkinteger(L, 1);
  
  	lua_pushvalue(L, paneIndex);
  	lua_replace(L, 1);
-@@ -276,7 +276,7 @@
+@@ -277,7 +277,7 @@
  }
  
- static int cf_scite_constname(lua_State *L) {
+ int cf_scite_constname(lua_State *L) {
 -	const int message = luaL_checkint(L, 1);
 +	const int message = luaL_checkinteger(L, 1);
  	const char *prefix = luaL_optstring(L, 2, nullptr);
  	const std::string constName = IFaceTable::GetConstantName(message, prefix);
  	if (constName.length() > 0) {
-@@ -307,7 +307,7 @@
+@@ -308,7 +308,7 @@
  }
  
- static int cf_scite_menu_command(lua_State *L) {
+ int cf_scite_menu_command(lua_State *L) {
 -	const int cmdID = luaL_checkint(L, 1);
 +	const int cmdID = luaL_checkinteger(L, 1);
  	if (cmdID) {
  		host->DoMenuCommand(cmdID);
  	}
-@@ -329,7 +329,7 @@
+@@ -330,7 +330,7 @@
  }
  
- static int cf_scite_strip_set(lua_State *L) {
+ int cf_scite_strip_set(lua_State *L) {
 -	const int control = luaL_checkint(L, 1);
 +	const int control = luaL_checkinteger(L, 1);
  	const char *value = luaL_checkstring(L, 2);
  	if (value) {
  		host->UserStripSet(control, value);
-@@ -338,7 +338,7 @@
+@@ -339,7 +339,7 @@
  }
  
- static int cf_scite_strip_set_list(lua_State *L) {
+ int cf_scite_strip_set_list(lua_State *L) {
 -	const int control = luaL_checkint(L, 1);
 +	const int control = luaL_checkinteger(L, 1);
  	const char *value = luaL_checkstring(L, 2);
  	if (value) {
  		host->UserStripSetList(control, value);
-@@ -347,7 +347,7 @@
+@@ -348,7 +348,7 @@
  }
  
- static int cf_scite_strip_value(lua_State *L) {
+ int cf_scite_strip_value(lua_State *L) {
 -	const int control = luaL_checkint(L, 1);
 +	const int control = luaL_checkinteger(L, 1);
  	std::string value = host->UserStripValue(control);
  	push_string(L, value);
  	return 1;
-@@ -437,7 +437,7 @@
+@@ -438,7 +438,7 @@
  		SA::Position rangeStart = 0;
  		SA::Position rangeEnd = 0;
  
@@ -86,7 +89,7 @@ diff -aur scite/src/LuaExtension.cxx scite/src/LuaExtension.cxx
  		hasError = (flags == 0 && lua_gettop(L) > nArgs);
  
  		if (!hasError) {
-@@ -514,7 +514,7 @@
+@@ -515,7 +515,7 @@
  
  	SA::ScintillaCall &sc = host->PaneCaller(pmo->pane);
  	sc.SetTarget(pmo->range);
@@ -95,7 +98,7 @@ diff -aur scite/src/LuaExtension.cxx scite/src/LuaExtension.cxx
  	pmo->range.end = sc.TargetEnd();
  	return 0;
  }
-@@ -600,7 +600,7 @@
+@@ -601,7 +601,7 @@
  		pmo->endPosOrig = 0;
  		pmo->flags = 0;
  		if (nargs >= 3) {
@@ -104,7 +107,7 @@ diff -aur scite/src/LuaExtension.cxx scite/src/LuaExtension.cxx
  			if (nargs >= 4) {
  				pmo->range.end = pmo->endPosOrig = luaL_checkinteger(L, 4);
  				if (pmo->range.end < 0) {
-@@ -765,7 +765,7 @@
+@@ -766,7 +766,7 @@
  	const int nargs = lua_gettop(L);
  	const char *code = luaL_checkstring(L, 1);
  	const char *name = luaL_optstring(L, 2, code);
@@ -113,7 +116,7 @@ diff -aur scite/src/LuaExtension.cxx scite/src/LuaExtension.cxx
  		lua_call(L, 0, LUA_MULTRET);
  		return lua_gettop(L) - nargs;
  	} else {
-@@ -896,7 +896,7 @@
+@@ -897,7 +897,7 @@
  	int loopParamCount = 2;
  
  	if (func.paramType[0] == iface_length && func.paramType[1] == iface_string) {
@@ -122,18 +125,18 @@ diff -aur scite/src/LuaExtension.cxx scite/src/LuaExtension.cxx
  		params[1] = SptrFromString(params[0] ? lua_tostring(L, arg) : "");
  		loopParamCount = 0;
  	} else if ((func.paramType[1] == iface_stringresult) || (func.returnType == iface_stringresult)) {
-@@ -915,8 +915,8 @@
+@@ -916,8 +916,8 @@
  			const char *s = lua_tostring(L, arg++);
  			params[i] = SptrFromString(s ? s : "");
  		} else if (func.paramType[i] == iface_keymod) {
 -			const int keycode = luaL_checkint(L, arg++) & 0xFFFF;
--			const int modifiers = luaL_checkint(L, arg++) &
+-			const intptr_t modifiers = luaL_checkint(L, arg++) &
 +			const int keycode = luaL_checkinteger(L, arg++) & 0xFFFF;
-+			const int modifiers = luaL_checkinteger(L, arg++) &
++			const intptr_t modifiers = luaL_checkinteger(L, arg++) &
  					      static_cast<int>(SA::KeyMod::Shift|SA::KeyMod::Ctrl|SA::KeyMod::Alt);
  			params[i] = keycode | (modifiers<<16);
  		} else if (func.paramType[i] == iface_bool) {
-@@ -1805,7 +1805,7 @@
+@@ -1787,7 +1787,7 @@
  	static int SetLevelAt(lua_State *L) {
  		StylingContext *context = Context(L);
  		const SA::Line line = luaL_checkinteger(L, 2);
@@ -142,7 +145,7 @@ diff -aur scite/src/LuaExtension.cxx scite/src/LuaExtension.cxx
  		context->styler->SetLevel(line, static_cast<SA::FoldLevel>(level));
  		return 0;
  	}
-@@ -1820,7 +1820,7 @@
+@@ -1802,7 +1802,7 @@
  	static int SetLineState(lua_State *L) {
  		StylingContext *context = Context(L);
  		const SA::Line line = luaL_checkinteger(L, 2);
@@ -151,7 +154,7 @@ diff -aur scite/src/LuaExtension.cxx scite/src/LuaExtension.cxx
  		context->styler->SetLineState(line, stateOfLine);
  		return 0;
  	}
-@@ -1898,7 +1898,7 @@
+@@ -1880,7 +1880,7 @@
  		StylingContext *context = Context(L);
  		const SA::Position startPosStyle = luaL_checkinteger(L, 2);
  		const SA::Position lengthStyle = luaL_checkinteger(L, 3);
@@ -160,7 +163,7 @@ diff -aur scite/src/LuaExtension.cxx scite/src/LuaExtension.cxx
  		context->StartStyling(startPosStyle, lengthStyle, initialStyle);
  		return 0;
  	}
-@@ -1957,7 +1957,7 @@
+@@ -1939,7 +1939,7 @@
  	static int SetState(lua_State *L) {
  		StylingContext *context = Context(L);
  		context->Colourize();
@@ -169,7 +172,7 @@ diff -aur scite/src/LuaExtension.cxx scite/src/LuaExtension.cxx
  		return 0;
  	}
  
-@@ -1965,13 +1965,13 @@
+@@ -1947,13 +1947,13 @@
  		StylingContext *context = Context(L);
  		context->Forward();
  		context->Colourize();
@@ -185,3 +188,4 @@ diff -aur scite/src/LuaExtension.cxx scite/src/LuaExtension.cxx
  		return 0;
  	}
  
+