diff --git a/cd/without-lua-prefix-with-linux6.patch b/cd/without-lua-prefix-with-linux6.patch new file mode 100644 index 0000000..f5a645d --- /dev/null +++ b/cd/without-lua-prefix-with-linux6.patch @@ -0,0 +1,151 @@ +diff --git a/src/cdlua5.mak b/src/cdlua5.mak +index e6631ef..d0558c8 100755 +--- a/src/cdlua5.mak ++++ b/src/cdlua5.mak +@@ -31,7 +31,7 @@ ifdef USE_LUA54 + LIBNAME := $(LIBNAME)54 + else + ifdef USE_LUA53 +- LIBNAME := $(LIBNAME)53 ++# LIBNAME := $(LIBNAME)53 + else + ifdef USE_LUA52 + LIBNAME := $(LIBNAME)52 +diff --git a/src/cdluacairo5.mak b/src/cdluacairo5.mak +index dea11d2..bb842db 100755 +--- a/src/cdluacairo5.mak ++++ b/src/cdluacairo5.mak +@@ -33,7 +33,7 @@ ifdef USE_LUA54 + LIBNAME := $(LIBNAME)54 + else + ifdef USE_LUA53 +- LIBNAME := $(LIBNAME)53 ++# LIBNAME := $(LIBNAME)53 + else + ifdef USE_LUA52 + LIBNAME := $(LIBNAME)52 +diff --git a/src/cdluacontextplus5.mak b/src/cdluacontextplus5.mak +index bdb05d8..5113e84 100755 +--- a/src/cdluacontextplus5.mak ++++ b/src/cdluacontextplus5.mak +@@ -43,7 +43,7 @@ ifdef USE_LUA54 + LIBNAME := $(LIBNAME)54 + else + ifdef USE_LUA53 +- LIBNAME := $(LIBNAME)53 ++# LIBNAME := $(LIBNAME)53 + else + ifdef USE_LUA52 + LIBNAME := $(LIBNAME)52 +diff --git a/src/cdluadirect2d5.mak b/src/cdluadirect2d5.mak +index 244a52e..85f2f1f 100755 +--- a/src/cdluadirect2d5.mak ++++ b/src/cdluadirect2d5.mak +@@ -33,7 +33,7 @@ ifdef USE_LUA54 + LIBNAME := $(LIBNAME)54 + else + ifdef USE_LUA53 +- LIBNAME := $(LIBNAME)53 ++# LIBNAME := $(LIBNAME)53 + else + ifdef USE_LUA52 + LIBNAME := $(LIBNAME)52 +diff --git a/src/cdluagl5.mak b/src/cdluagl5.mak +index 61ed576..21ef0b7 100755 +--- a/src/cdluagl5.mak ++++ b/src/cdluagl5.mak +@@ -33,7 +33,7 @@ ifdef USE_LUA54 + LIBNAME := $(LIBNAME)54 + else + ifdef USE_LUA53 +- LIBNAME := $(LIBNAME)53 ++# LIBNAME := $(LIBNAME)53 + else + ifdef USE_LUA52 + LIBNAME := $(LIBNAME)52 +diff --git a/src/cdluaim5.mak b/src/cdluaim5.mak +index 4858162..07c72a9 100755 +--- a/src/cdluaim5.mak ++++ b/src/cdluaim5.mak +@@ -32,7 +32,7 @@ ifdef USE_LUA54 + LIBNAME := $(LIBNAME)54 + else + ifdef USE_LUA53 +- LIBNAME := $(LIBNAME)53 ++# LIBNAME := $(LIBNAME)53 + else + ifdef USE_LUA52 + LIBNAME := $(LIBNAME)52 +diff --git a/src/cdluapdf5.mak b/src/cdluapdf5.mak +index fae16fb..8e1cd50 100755 +--- a/src/cdluapdf5.mak ++++ b/src/cdluapdf5.mak +@@ -33,7 +33,7 @@ ifdef USE_LUA54 + LIBNAME := $(LIBNAME)54 + else + ifdef USE_LUA53 +- LIBNAME := $(LIBNAME)53 ++# LIBNAME := $(LIBNAME)53 + else + ifdef USE_LUA52 + LIBNAME := $(LIBNAME)52 +diff --git a/tecmake.mak b/tecmake.mak +index 48991a4..42d7131 100755 +--- a/tecmake.mak ++++ b/tecmake.mak +@@ -297,7 +297,7 @@ endif + + ifdef GTK_DEFAULT + ifndef USE_GTK2 +- ifneq ($(findstring Linux5, $(TEC_UNAME)), ) ++ ifneq ($(findstring Linux5, $(subst Linux6,Linux5,$(TEC_UNAME))), ) + USE_GTK3 = Yes + endif + ifneq ($(findstring Linux4, $(TEC_UNAME)), ) +@@ -469,7 +469,7 @@ ifdef USE_LUA52 + LIBLUA_SFX := 52 + endif + ifdef USE_LUA53 +- LIBLUA_SFX := 53 ++# LIBLUA_SFX := 53 + endif + ifdef USE_LUA54 + LIBLUA_SFX := 54 +@@ -877,8 +877,8 @@ ifdef USE_LUA52 + endif + + ifdef USE_LUA53 +- LUA_SFX := 53 +- LIBLUA_SFX := 53 ++# LUA_SFX := 53 ++# LIBLUA_SFX := 53 + override USE_LUA = Yes + LUA := $(LUA53) + NO_LUALIB := Yes +@@ -1207,7 +1207,7 @@ ifdef USE_CD + ifneq ($(findstring Linux4, $(TEC_UNAME)), ) + LIBS += fontconfig + endif +- ifneq ($(findstring Linux5, $(TEC_UNAME)), ) ++ ifneq ($(findstring Linux5, $(subst Linux6,Linux5,$(TEC_UNAME))), ) + LIBS += fontconfig + endif + ifneq ($(findstring cygw, $(TEC_UNAME)), ) +@@ -1245,7 +1245,7 @@ ifdef USE_IM + endif + + ifdef LINK_WEBKIT +- ifneq ($(findstring Linux5, $(TEC_UNAME)), ) ++ ifneq ($(findstring Linux5, $(subst Linux6,Linux5,$(TEC_UNAME))), ) + LIBS += webkit2gtk-4.0 gio-2.0 + else + ifneq ($(findstring Linux4, $(TEC_UNAME)), ) +@@ -1476,7 +1476,7 @@ ifdef USE_GTK + ifneq ($(findstring FreeBSD, $(TEC_UNAME)), ) + STDINCS += /lib/X11R6/include/gtk-2.0 + endif +- ifneq ($(findstring Linux5, $(TEC_UNAME)), ) ++ ifneq ($(findstring Linux5, $(subst Linux6,Linux5,$(TEC_UNAME))), ) + STDINCS += /usr/include/harfbuzz + endif + endif