From 990b2da84206f6ef5fa5757881e934b342594e1c Mon Sep 17 00:00:00 2001 From: Alexander Zhirov Date: Thu, 11 May 2023 09:23:06 +0300 Subject: [PATCH] =?UTF-8?q?IUP=20=D0=BD=D0=B0=20=D0=BE=D1=81=D0=BD=D0=BE?= =?UTF-8?q?=D0=B2=D0=B5=20Lua=20=D0=B8=D0=B7=20=D1=80=D0=B5=D0=BF=D0=BE?= =?UTF-8?q?=D0=B7=D0=B8=D1=82=D0=BE=D0=B8=D1=8F=20=D0=A1=D1=82=D0=B0=D1=82?= =?UTF-8?q?=D0=B8=D1=87=D0=B5=D1=81=D0=BA=D0=B0=D1=8F=20=D0=BF=D1=80=D0=B8?= =?UTF-8?q?=D0=B2=D1=8F=D0=B7=D0=BA=D0=B0=20(=D0=BA=D1=80=D0=BE=D0=BC?= =?UTF-8?q?=D0=B5=20Lua=20=D0=B4=D0=BB=D1=8F=20iup)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../without-lua-prefix-with-linux6.patch | 388 ++++++------------ iup/package.yml | 14 +- .../without-lua-prefix-with-linux6.patch | 185 +++------ libcd/package.yml | 8 +- .../without-lua-prefix-with-linux6.patch | 60 --- libftgl/package.yml | 8 +- .../without-lua-prefix-with-linux6.patch | 151 ------- libim/package.yml | 11 +- libpdflib/package.yml | 2 +- lua/Makefile | 1 - ...e-shared-libraries-and-proper-prefix.patch | 82 ---- lua/files/lua-5.3.pc | 20 - lua/package.yml | 24 -- 13 files changed, 207 insertions(+), 747 deletions(-) delete mode 100644 libftgl/files/without-lua-prefix-with-linux6.patch delete mode 100644 libim/files/without-lua-prefix-with-linux6.patch delete mode 100644 lua/Makefile delete mode 100644 lua/files/0001-Use-shared-libraries-and-proper-prefix.patch delete mode 100644 lua/files/lua-5.3.pc delete mode 100644 lua/package.yml diff --git a/iup/files/without-lua-prefix-with-linux6.patch b/iup/files/without-lua-prefix-with-linux6.patch index 6ac18a7..eb5f6d7 100644 --- a/iup/files/without-lua-prefix-with-linux6.patch +++ b/iup/files/without-lua-prefix-with-linux6.patch @@ -1,229 +1,68 @@ -diff --git a/srclua5/config.mak b/srclua5/config.mak -index 77a8920..2118290 100755 ---- a/srclua5/config.mak -+++ b/srclua5/config.mak -@@ -38,7 +38,7 @@ ifdef USE_LUA54 - LUASFX = 54 - else - ifdef USE_LUA53 -- LUASFX = 53 -+# LUASFX = 53 - else - ifdef USE_LUA52 - LUASFX = 52 -diff --git a/srclua5/iup_mglplot.mak b/srclua5/iup_mglplot.mak -index 3c3407c..422eb8d 100755 ---- a/srclua5/iup_mglplot.mak -+++ b/srclua5/iup_mglplot.mak -@@ -42,7 +42,7 @@ ifdef USE_LUA54 - LUASFX = 54 - else - ifdef USE_LUA53 -- LUASFX = 53 -+# LUASFX = 53 - else - ifdef USE_LUA52 - LUASFX = 52 -diff --git a/srclua5/iup_plot.mak b/srclua5/iup_plot.mak -index b2af19d..0ba78fb 100755 ---- a/srclua5/iup_plot.mak -+++ b/srclua5/iup_plot.mak -@@ -43,7 +43,7 @@ ifdef USE_LUA54 - LUASFX = 54 - else - ifdef USE_LUA53 -- LUASFX = 53 -+# LUASFX = 53 - else - ifdef USE_LUA52 - LUASFX = 52 -diff --git a/srclua5/iup_scintilla.mak b/srclua5/iup_scintilla.mak -index 502bf59..08de8a1 100755 ---- a/srclua5/iup_scintilla.mak -+++ b/srclua5/iup_scintilla.mak -@@ -42,7 +42,7 @@ ifdef USE_LUA54 - LUASFX = 54 - else - ifdef USE_LUA53 -- LUASFX = 53 -+# LUASFX = 53 - else - ifdef USE_LUA52 - LUASFX = 52 -diff --git a/srclua5/iupcd.mak b/srclua5/iupcd.mak -index 429cd3e..1ee8c72 100755 ---- a/srclua5/iupcd.mak -+++ b/srclua5/iupcd.mak -@@ -44,7 +44,7 @@ ifdef USE_LUA54 - LUASFX = 54 - else - ifdef USE_LUA53 -- LUASFX = 53 -+# LUASFX = 53 - else - ifdef USE_LUA52 - LUASFX = 52 -diff --git a/srclua5/iupcontrols.mak b/srclua5/iupcontrols.mak -index cb00b95..492906f 100755 ---- a/srclua5/iupcontrols.mak -+++ b/srclua5/iupcontrols.mak -@@ -43,7 +43,7 @@ ifdef USE_LUA54 - LUASFX = 54 - else - ifdef USE_LUA53 -- LUASFX = 53 -+# LUASFX = 53 - else - ifdef USE_LUA52 - LUASFX = 52 -diff --git a/srclua5/iupfiledlg.mak b/srclua5/iupfiledlg.mak -index 6c6cf98..64ca8b3 100755 ---- a/srclua5/iupfiledlg.mak -+++ b/srclua5/iupfiledlg.mak -@@ -40,7 +40,7 @@ ifdef USE_LUA54 - LUASFX = 54 - else - ifdef USE_LUA53 -- LUASFX = 53 -+# LUASFX = 53 - else - ifdef USE_LUA52 - LUASFX = 52 -diff --git a/srclua5/iupgl.mak b/srclua5/iupgl.mak -index f633c1c..e1ae256 100755 ---- a/srclua5/iupgl.mak -+++ b/srclua5/iupgl.mak -@@ -41,7 +41,7 @@ ifdef USE_LUA54 - LUASFX = 54 - else - ifdef USE_LUA53 -- LUASFX = 53 -+# LUASFX = 53 - else - ifdef USE_LUA52 - LUASFX = 52 -diff --git a/srclua5/iupglcontrols.mak b/srclua5/iupglcontrols.mak -index e6469f9..570d924 100755 ---- a/srclua5/iupglcontrols.mak -+++ b/srclua5/iupglcontrols.mak -@@ -42,7 +42,7 @@ ifdef USE_LUA54 - LUASFX = 54 - else - ifdef USE_LUA53 -- LUASFX = 53 -+# LUASFX = 53 - else - ifdef USE_LUA52 - LUASFX = 52 -diff --git a/srclua5/iupim.mak b/srclua5/iupim.mak -index d2eb2d4..c3fc431 100755 ---- a/srclua5/iupim.mak -+++ b/srclua5/iupim.mak -@@ -42,7 +42,7 @@ ifdef USE_LUA54 - LUASFX = 54 - else - ifdef USE_LUA53 -- LUASFX = 53 -+# LUASFX = 53 - else - ifdef USE_LUA52 - LUASFX = 52 -diff --git a/srclua5/iupimglib.mak b/srclua5/iupimglib.mak -index fb56ad6..08afb97 100755 ---- a/srclua5/iupimglib.mak -+++ b/srclua5/iupimglib.mak -@@ -40,7 +40,7 @@ ifdef USE_LUA54 - LUASFX = 54 - else - ifdef USE_LUA53 -- LUASFX = 53 -+# LUASFX = 53 - else - ifdef USE_LUA52 - LUASFX = 52 -diff --git a/srclua5/iupluascripterdlg.mak b/srclua5/iupluascripterdlg.mak -index 56ae104..9132831 100755 ---- a/srclua5/iupluascripterdlg.mak -+++ b/srclua5/iupluascripterdlg.mak -@@ -42,7 +42,7 @@ ifdef USE_LUA54 - LUASFX = 54 - else - ifdef USE_LUA53 -- LUASFX = 53 -+# LUASFX = 53 - else - ifdef USE_LUA52 - LUASFX = 52 -diff --git a/srclua5/iupole.mak b/srclua5/iupole.mak -index 0b625b6..75dd416 100755 ---- a/srclua5/iupole.mak -+++ b/srclua5/iupole.mak -@@ -41,7 +41,7 @@ ifdef USE_LUA54 - LUASFX = 54 - else - ifdef USE_LUA53 -- LUASFX = 53 -+# LUASFX = 53 - else - ifdef USE_LUA52 - LUASFX = 52 -diff --git a/srclua5/iuptuio.mak b/srclua5/iuptuio.mak -index 853430c..09ecae1 100755 ---- a/srclua5/iuptuio.mak -+++ b/srclua5/iuptuio.mak -@@ -42,7 +42,7 @@ ifdef USE_LUA54 - LUASFX = 54 - else - ifdef USE_LUA53 -- LUASFX = 53 -+# LUASFX = 53 - else - ifdef USE_LUA52 - LUASFX = 52 -diff --git a/srclua5/iupweb.mak b/srclua5/iupweb.mak -index 9d7dff2..afe171a 100755 ---- a/srclua5/iupweb.mak -+++ b/srclua5/iupweb.mak -@@ -42,7 +42,7 @@ ifdef USE_LUA54 - LUASFX = 54 - else - ifdef USE_LUA53 -- LUASFX = 53 -+# LUASFX = 53 - else - ifdef USE_LUA52 - LUASFX = 52 diff --git a/srcluaconsole/config.mak b/srcluaconsole/config.mak -index 12baea3..8b02917 100755 +index 12baea3..2a3f3d8 100644 --- a/srcluaconsole/config.mak +++ b/srcluaconsole/config.mak -@@ -41,7 +41,7 @@ ifdef USE_LUA54 +@@ -197,8 +197,8 @@ else + # Except in Cygwin + else + # In UNIX Lua is always statically linked, late binding is used. +- NO_LUALINK = Yes +- SLIB += $(LUA_LIB)/liblua$(LUA_SFX).a ++ #NO_LUALINK = Yes ++ #SLIB += $(LUA_LIB)/liblua$(LUA_SFX).a + endif endif - else - ifdef USE_LUA53 -- LUASFX = 53 -+# LUASFX = 53 - ifneq ($(findstring SunOS, $(TEC_UNAME)), ) - ifneq ($(findstring x86, $(TEC_UNAME)), ) - FLAGS = -std=gnu99 + endif diff --git a/srcluascripter/config.mak b/srcluascripter/config.mak -index 76300c6..a201098 100755 +index 76300c6..bb47c4f 100644 --- a/srcluascripter/config.mak +++ b/srcluascripter/config.mak -@@ -38,7 +38,7 @@ ifdef USE_LUA54 +@@ -184,8 +184,8 @@ else + # Except in Cygwin + else + # In UNIX Lua is always statically linked, late binding is used. +- NO_LUALINK = Yes +- SLIB += $(LUA_LIB)/liblua$(LUA_SFX).a ++ #NO_LUALINK = Yes ++ #SLIB += $(LUA_LIB)/liblua$(LUA_SFX).a + endif endif + endif +diff --git a/srcview/config.mak b/srcview/config.mak +index db72772..41c4019 100644 +--- a/srcview/config.mak ++++ b/srcview/config.mak +@@ -14,7 +14,7 @@ USE_IUP3 = Yes + ifeq "$(TEC_SYSNAME)" "Haiku" + USE_HAIKU = Yes else - ifdef USE_LUA53 -- LUASFX = 53 -+# LUASFX = 53 - ifneq ($(findstring SunOS, $(TEC_UNAME)), ) - ifneq ($(findstring x86, $(TEC_UNAME)), ) - FLAGS = -std=gnu99 +- USE_STATIC = Yes ++# USE_STATIC = Yes + ifdef GTK_DEFAULT + ifdef USE_MOTIF + # Build Motif version in Linux and BSD diff --git a/srcvled/config.mak b/srcvled/config.mak -index d072320..9daf3e8 100755 +index d072320..6fbaef9 100644 --- a/srcvled/config.mak +++ b/srcvled/config.mak -@@ -129,4 +129,6 @@ ifneq ($(findstring MacOS, $(TEC_UNAME)), ) +@@ -14,7 +14,7 @@ USE_IUP3 = Yes + ifeq "$(TEC_SYSNAME)" "Haiku" + USE_HAIKU = Yes + else +- USE_STATIC = Yes ++# USE_STATIC = Yes + ifdef GTK_DEFAULT + ifdef USE_MOTIF + # Build Motif version in Linux and BSD +@@ -109,6 +109,7 @@ ifndef USE_NO_PLOT + SLIB += $(CD_LIB)/libcdgl.a + SLIB += $(CD_LIB)/libcdcontextplus.a + else ++ LIBS += iup_plot + LIBS += iupglcontrols + LIBS += cdgl + endif +@@ -129,4 +130,6 @@ ifneq ($(findstring MacOS, $(TEC_UNAME)), ) LIBS += fontconfig endif @@ -231,75 +70,108 @@ index d072320..9daf3e8 100755 + INCLUDES = ../src diff --git a/srcweb/config.mak b/srcweb/config.mak -index c528f2c..0d321a4 100755 +index c528f2c..4ff9689 100644 --- a/srcweb/config.mak +++ b/srcweb/config.mak -@@ -35,7 +35,7 @@ else +@@ -35,15 +35,20 @@ else LINK_WEBKIT = Yes ifdef USE_GTK3 - ifneq ($(findstring Linux5, $(TEC_UNAME)), ) -+ ifneq ($(findstring Linux5, $(subst Linux6,Linux5,$(TEC_UNAME))), ) ++ ifneq ($(findstring Linux6, $(TEC_UNAME)), ) DEFINES += USE_WEBKIT2 STDINCS += $(GTK)/include/webkitgtk-4.0 else +- ifneq ($(findstring Linux4, $(TEC_UNAME)), ) ++ ifneq ($(findstring Linux5, $(TEC_UNAME)), ) + DEFINES += USE_WEBKIT2 + STDINCS += $(GTK)/include/webkitgtk-4.0 + else +- STDINCS += $(GTK)/include/webkitgtk-3.0 ++ ifneq ($(findstring Linux4, $(TEC_UNAME)), ) ++ DEFINES += USE_WEBKIT2 ++ STDINCS += $(GTK)/include/webkitgtk-4.0 ++ else ++ STDINCS += $(GTK)/include/webkitgtk-3.0 ++ endif + endif + endif + else diff --git a/tecmake.mak b/tecmake.mak -index 48991a4..42d7131 100755 +index 48991a4..fdda137 100644 --- a/tecmake.mak +++ b/tecmake.mak -@@ -297,7 +297,7 @@ endif +@@ -297,6 +297,9 @@ endif ifdef GTK_DEFAULT ifndef USE_GTK2 -- ifneq ($(findstring Linux5, $(TEC_UNAME)), ) -+ ifneq ($(findstring Linux5, $(subst Linux6,Linux5,$(TEC_UNAME))), ) ++ ifneq ($(findstring Linux6, $(TEC_UNAME)), ) ++ USE_GTK3 = Yes ++ endif + ifneq ($(findstring 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))), ) +@@ -1062,7 +1065,8 @@ ifdef USE_LUA + LIBS += lualib$(LUA_SFX) + endif + ifndef NO_LUALINK +- LIBS += lua$(LUA_SFX) ++# LIBS += lua$(LUA_SFX) ++ LIBS += lua + LDIR += $(LUA_LIB) + else + ifneq ($(findstring cygw, $(TEC_UNAME)), ) +@@ -1210,6 +1214,9 @@ ifdef USE_CD + ifneq ($(findstring Linux5, $(TEC_UNAME)), ) LIBS += fontconfig endif ++ ifneq ($(findstring Linux6, $(TEC_UNAME)), ) ++ LIBS += fontconfig ++ endif ifneq ($(findstring cygw, $(TEC_UNAME)), ) -@@ -1245,7 +1245,7 @@ ifdef USE_IM + LIBS += fontconfig + endif +@@ -1245,20 +1252,24 @@ ifdef USE_IM endif ifdef LINK_WEBKIT - ifneq ($(findstring Linux5, $(TEC_UNAME)), ) -+ ifneq ($(findstring Linux5, $(subst Linux6,Linux5,$(TEC_UNAME))), ) ++ ifneq ($(findstring Linux6, $(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))), ) +- else +- ifneq ($(findstring Linux4, $(TEC_UNAME)), ) ++ else ++ ifneq ($(findstring Linux5, $(TEC_UNAME)), ) + LIBS += webkit2gtk-4.0 gio-2.0 + else +- ifneq ($(findstring Linux3, $(TEC_UNAME)), ) +- ifdef USE_GTK3 +- LIBS += webkitgtk-3.0 ++ ifneq ($(findstring Linux4, $(TEC_UNAME)), ) ++ LIBS += webkit2gtk-4.0 gio-2.0 ++ else ++ ifneq ($(findstring Linux3, $(TEC_UNAME)), ) ++ ifdef USE_GTK3 ++ LIBS += webkitgtk-3.0 ++ else ++ LIBS += webkitgtk-1.0 ++ endif + else +- LIBS += webkitgtk-1.0 ++ LIBS += webkit-1.0 + endif +- else +- LIBS += webkit-1.0 + endif + endif + endif +@@ -1479,6 +1490,9 @@ ifdef USE_GTK + ifneq ($(findstring Linux5, $(TEC_UNAME)), ) STDINCS += /usr/include/harfbuzz endif ++ ifneq ($(findstring Linux6, $(TEC_UNAME)), ) ++ STDINCS += /usr/include/harfbuzz ++ endif endif + endif + diff --git a/iup/package.yml b/iup/package.yml index 80f1855..ae2f7f9 100644 --- a/iup/package.yml +++ b/iup/package.yml @@ -28,7 +28,9 @@ patterns : - /usr/lib64/*.a environment: export USE_PKGCONFIG=Yes - export USE_LUA53=Yes + export USE_LUA_VERSION=53 + export LIBLUA_SFX= + export LUA_SFX= export LUA_INC=/usr/include export LUA_LIB=/usr/lib export LUA_BIN=/usr/bin/lua @@ -44,11 +46,11 @@ build : | %make -j1 install : | install -dm00755 $installdir/usr/lib64 - install -Dm00755 lib/Linux61_64/{*.so,*.a} $installdir/usr/lib64/ - install -Dm00755 lib/Linux61_64/Lua/{*.so,*.a} $installdir/usr/lib64/ - install -m00755 lib/Linux61_64/*.so $installdir/usr/lib64/ + install -Dm00755 lib/Linux62_64/{*.so,*.a} $installdir/usr/lib64/ + install -Dm00755 lib/Linux62_64/Lua53/{*.so,*.a} $installdir/usr/lib64/ + install -m00755 lib/Linux62_64/*.so $installdir/usr/lib64/ install -dm00755 $installdir/usr/bin - install -m00755 bin/Linux61_64/{iupview,iupvled,ledc} $installdir/usr/bin - install -m00755 bin/Linux61_64/Lua/* $installdir/usr/bin + install -m00755 bin/Linux62_64/{iupview,iupvled,ledc} $installdir/usr/bin + install -m00755 bin/Linux62_64/Lua53/* $installdir/usr/bin install -dm00755 $installdir/usr/include install -m00755 include/* $installdir/usr/include diff --git a/libcd/files/without-lua-prefix-with-linux6.patch b/libcd/files/without-lua-prefix-with-linux6.patch index f5a645d..88961be 100644 --- a/libcd/files/without-lua-prefix-with-linux6.patch +++ b/libcd/files/without-lua-prefix-with-linux6.patch @@ -1,151 +1,72 @@ -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 +index 48991a4..c359896 100644 --- a/tecmake.mak +++ b/tecmake.mak -@@ -297,7 +297,7 @@ endif +@@ -297,6 +297,9 @@ endif ifdef GTK_DEFAULT ifndef USE_GTK2 -- ifneq ($(findstring Linux5, $(TEC_UNAME)), ) -+ ifneq ($(findstring Linux5, $(subst Linux6,Linux5,$(TEC_UNAME))), ) ++ ifneq ($(findstring Linux6, $(TEC_UNAME)), ) ++ USE_GTK3 = Yes ++ endif + ifneq ($(findstring 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))), ) +@@ -1210,6 +1213,9 @@ ifdef USE_CD + ifneq ($(findstring Linux5, $(TEC_UNAME)), ) LIBS += fontconfig endif ++ ifneq ($(findstring Linux6, $(TEC_UNAME)), ) ++ LIBS += fontconfig ++ endif ifneq ($(findstring cygw, $(TEC_UNAME)), ) -@@ -1245,7 +1245,7 @@ ifdef USE_IM + LIBS += fontconfig + endif +@@ -1245,22 +1251,26 @@ ifdef USE_IM endif ifdef LINK_WEBKIT - ifneq ($(findstring Linux5, $(TEC_UNAME)), ) -+ ifneq ($(findstring Linux5, $(subst Linux6,Linux5,$(TEC_UNAME))), ) ++ ifneq ($(findstring Linux6, $(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))), ) +- else +- ifneq ($(findstring Linux4, $(TEC_UNAME)), ) ++ else ++ ifneq ($(findstring Linux5, $(TEC_UNAME)), ) + LIBS += webkit2gtk-4.0 gio-2.0 + else +- ifneq ($(findstring Linux3, $(TEC_UNAME)), ) +- ifdef USE_GTK3 +- LIBS += webkitgtk-3.0 ++ ifneq ($(findstring Linux4, $(TEC_UNAME)), ) ++ LIBS += webkit2gtk-4.0 gio-2.0 ++ else ++ ifneq ($(findstring Linux3, $(TEC_UNAME)), ) ++ ifdef USE_GTK3 ++ LIBS += webkitgtk-3.0 ++ else ++ LIBS += webkitgtk-1.0 ++ endif + else +- LIBS += webkitgtk-1.0 ++ LIBS += webkit-1.0 + endif +- else +- LIBS += webkit-1.0 +- endif +- endif ++ endif ++ endif + endif + endif + +@@ -1479,6 +1489,9 @@ ifdef USE_GTK + ifneq ($(findstring Linux5, $(TEC_UNAME)), ) STDINCS += /usr/include/harfbuzz endif ++ ifneq ($(findstring Linux6, $(TEC_UNAME)), ) ++ STDINCS += /usr/include/harfbuzz ++ endif endif + endif + diff --git a/libcd/package.yml b/libcd/package.yml index 1da8743..53675b5 100644 --- a/libcd/package.yml +++ b/libcd/package.yml @@ -27,7 +27,9 @@ patterns : - /usr/lib64/libcd*.a environment: export USE_PKGCONFIG=Yes - export USE_LUA53=Yes + export USE_LUA_VERSION=53 + export LIBLUA_SFX= + export LUA_SFX= export LUA_INC=/usr/include export LUA_LIB=/usr/lib export LUA_BIN=/usr/bin/lua @@ -39,7 +41,7 @@ build : | %make -j1 install : | install -dm00755 $installdir/usr/lib64 - install -Dm00755 lib/Linux61_64/{*.so,*.a} $installdir/usr/lib64/ - install -Dm00755 lib/Linux61_64/Lua/{*.so,*.a} $installdir/usr/lib64/ + install -Dm00755 lib/Linux62_64/{*.so,*.a} $installdir/usr/lib64/ + install -Dm00755 lib/Linux62_64/Lua53/{*.so,*.a} $installdir/usr/lib64/ install -dm00755 $installdir/usr/include install -m00755 include/* $installdir/usr/include diff --git a/libftgl/files/without-lua-prefix-with-linux6.patch b/libftgl/files/without-lua-prefix-with-linux6.patch deleted file mode 100644 index 1d2f9be..0000000 --- a/libftgl/files/without-lua-prefix-with-linux6.patch +++ /dev/null @@ -1,60 +0,0 @@ -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 diff --git a/libftgl/package.yml b/libftgl/package.yml index ac9d0ed..17d72fd 100644 --- a/libftgl/package.yml +++ b/libftgl/package.yml @@ -23,16 +23,16 @@ patterns : - /usr/lib64/*.a environment: export USE_PKGCONFIG=Yes - export USE_LUA53=Yes + export USE_LUA_VERSION=53 + export LIBLUA_SFX= + export LUA_SFX= export LUA_INC=/usr/include export LUA_LIB=/usr/lib export LUA_BIN=/usr/bin/lua -setup : | - %patch -p1 < $pkgfiles/without-lua-prefix-with-linux6.patch build : | %make -j1 install : | install -dm00755 $installdir/usr/lib64 - install -Dm00755 lib/Linux61_64/{*.so,*.a} $installdir/usr/lib64/ + install -Dm00755 lib/Linux62_64/{*.so,*.a} $installdir/usr/lib64/ install -dm00755 $installdir/usr/include/FTGL install -Dm00755 include/FTGL/* $installdir/usr/include/FTGL diff --git a/libim/files/without-lua-prefix-with-linux6.patch b/libim/files/without-lua-prefix-with-linux6.patch deleted file mode 100644 index a86aa4d..0000000 --- a/libim/files/without-lua-prefix-with-linux6.patch +++ /dev/null @@ -1,151 +0,0 @@ -diff --git a/src/imlua5.mak b/src/imlua5.mak -index f137b89..58809dc 100755 ---- a/src/imlua5.mak -+++ b/src/imlua5.mak -@@ -46,7 +46,7 @@ ifdef USE_LUA54 - LUASFX = 54 - else - ifdef USE_LUA53 -- LUASFX = 53 -+# LUASFX = 53 - else - ifdef USE_LUA52 - LUASFX = 52 -diff --git a/src/imlua_avi5.mak b/src/imlua_avi5.mak -index ff7cb22..c46d574 100755 ---- a/src/imlua_avi5.mak -+++ b/src/imlua_avi5.mak -@@ -36,7 +36,7 @@ ifdef USE_LUA54 - LUASFX = 54 - else - ifdef USE_LUA53 -- LUASFX = 53 -+# LUASFX = 53 - else - ifdef USE_LUA52 - LUASFX = 52 -diff --git a/src/imlua_capture5.mak b/src/imlua_capture5.mak -index 5e11cb4..faab2dc 100755 ---- a/src/imlua_capture5.mak -+++ b/src/imlua_capture5.mak -@@ -36,7 +36,7 @@ ifdef USE_LUA54 - LUASFX = 54 - else - ifdef USE_LUA53 -- LUASFX = 53 -+# LUASFX = 53 - else - ifdef USE_LUA52 - LUASFX = 52 -diff --git a/src/imlua_fftw35.mak b/src/imlua_fftw35.mak -index 5c46764..7c39ab8 100755 ---- a/src/imlua_fftw35.mak -+++ b/src/imlua_fftw35.mak -@@ -46,7 +46,7 @@ ifdef USE_LUA54 - LUASFX = 54 - else - ifdef USE_LUA53 -- LUASFX = 53 -+# LUASFX = 53 - else - ifdef USE_LUA52 - LUASFX = 52 -diff --git a/src/imlua_jp25.mak b/src/imlua_jp25.mak -index d811c32..dd26799 100755 ---- a/src/imlua_jp25.mak -+++ b/src/imlua_jp25.mak -@@ -36,7 +36,7 @@ ifdef USE_LUA54 - LUASFX = 54 - else - ifdef USE_LUA53 -- LUASFX = 53 -+# LUASFX = 53 - else - ifdef USE_LUA52 - LUASFX = 52 -diff --git a/src/imlua_process5.mak b/src/imlua_process5.mak -index 5ec9ec7..61af09f 100755 ---- a/src/imlua_process5.mak -+++ b/src/imlua_process5.mak -@@ -47,7 +47,7 @@ ifdef USE_LUA54 - LUASFX = 54 - else - ifdef USE_LUA53 -- LUASFX = 53 -+# LUASFX = 53 - else - ifdef USE_LUA52 - LUASFX = 52 -diff --git a/src/imlua_wmv5.mak b/src/imlua_wmv5.mak -index 38c3572..24241a7 100755 ---- a/src/imlua_wmv5.mak -+++ b/src/imlua_wmv5.mak -@@ -36,7 +36,7 @@ ifdef USE_LUA54 - LUASFX = 54 - else - ifdef USE_LUA53 -- LUASFX = 53 -+# LUASFX = 53 - else - ifdef USE_LUA52 - LUASFX = 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 diff --git a/libim/package.yml b/libim/package.yml index e078a02..a9059b8 100644 --- a/libim/package.yml +++ b/libim/package.yml @@ -14,6 +14,7 @@ builddeps : - pkgconfig(fftw3) - pkgconfig(lua) - pkgconfig(libpng) + - pkgconfig(ftgl) - lsb-release patterns : - lua : @@ -24,17 +25,17 @@ patterns : - /usr/lib64/libim*.a environment: export USE_PKGCONFIG=Yes - export USE_LUA53=Yes + export USE_LUA_VERSION=53 + export LIBLUA_SFX= + export LUA_SFX= export LUA_INC=/usr/include export LUA_LIB=/usr/lib export LUA_BIN=/usr/bin/lua -setup : | - %patch -p1 < $pkgfiles/without-lua-prefix-with-linux6.patch build : | %make -j1 install : | install -dm00755 $installdir/usr/lib64 - install -Dm00755 lib/Linux61_64/{*.so,*.a} $installdir/usr/lib64/ - install -Dm00755 lib/Linux61_64/Lua/{*.so,*.a} $installdir/usr/lib64/ + install -Dm00755 lib/Linux62_64/{*.so,*.a} $installdir/usr/lib64/ + install -Dm00755 lib/Linux62_64/Lua53/{*.so,*.a} $installdir/usr/lib64/ install -dm00755 $installdir/usr/include install -m00755 include/* $installdir/usr/include diff --git a/libpdflib/package.yml b/libpdflib/package.yml index bf37ccd..03fb56b 100644 --- a/libpdflib/package.yml +++ b/libpdflib/package.yml @@ -18,6 +18,6 @@ patterns : build : | %make install : | - install -Dm00755 lib/Linux61_64/libpdflib.so $installdir/usr/lib64/libpdflib.so + install -Dm00755 lib/Linux62_64/libpdflib.so $installdir/usr/lib64/libpdflib.so install -dm00755 $installdir/usr/include install -m00755 include/* $installdir/usr/include/ diff --git a/lua/Makefile b/lua/Makefile deleted file mode 100644 index 0a42375..0000000 --- a/lua/Makefile +++ /dev/null @@ -1 +0,0 @@ -include ../Makefile.common diff --git a/lua/files/0001-Use-shared-libraries-and-proper-prefix.patch b/lua/files/0001-Use-shared-libraries-and-proper-prefix.patch deleted file mode 100644 index 896affb..0000000 --- a/lua/files/0001-Use-shared-libraries-and-proper-prefix.patch +++ /dev/null @@ -1,82 +0,0 @@ -From e137059046d0b9367465ce6088dd2fcbc185818e Mon Sep 17 00:00:00 2001 -From: Joshua Strobl -Date: Sat, 16 Sep 2017 19:39:28 +0300 -Subject: [PATCH 1/1] Use shared libraries and proper prefix. - ---- - Makefile | 2 +- - src/Makefile | 10 ++++++++-- - src/luaconf.h | 2 +- - 3 files changed, 10 insertions(+), 4 deletions(-) - -diff --git a/Makefile b/Makefile -index 119110d..19c9573 100644 ---- a/Makefile -+++ b/Makefile -@@ -52,7 +52,7 @@ R= $V.4 - all: $(PLAT) - - $(PLATS) clean: -- cd src && $(MAKE) $@ -+ cd src && $(MAKE) $@ V=$(V) R=$(R) - - test: dummy - src/lua -v -diff --git a/src/Makefile b/src/Makefile -index d71c75c..35ea2f5 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -7,7 +7,7 @@ - PLAT= none - - CC= gcc -std=gnu99 --CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_2 $(SYSCFLAGS) $(MYCFLAGS) -+CFLAGS= -fPIC -O2 -Wall -Wextra -DLUA_COMPAT_5_2 -DLUA_COMPAT_5_1 $(SYSCFLAGS) $(MYCFLAGS) - LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS) - LIBS= -lm $(SYSLIBS) $(MYLIBS) - -@@ -29,6 +29,7 @@ MYOBJS= - PLATS= aix bsd c89 freebsd generic linux macosx mingw posix solaris - - LUA_A= liblua.a -+LUA_SO= liblua.so - 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 -@@ -43,7 +44,7 @@ LUAC_T= luac - LUAC_O= luac.o - - ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O) --ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) -+ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO) - ALL_A= $(LUA_A) - - # Targets start here. -@@ -59,6 +60,11 @@ $(LUA_A): $(BASE_O) - $(AR) $@ $(BASE_O) - $(RANLIB) $@ - -+$(LUA_SO): $(CORE_O) $(LIB_O) -+ $(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS) -+ ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V) -+ ln -sf $(LUA_SO).$(R) $(LUA_SO) -+ - $(LUA_T): $(LUA_O) $(LUA_A) - $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) - -diff --git a/src/luaconf.h b/src/luaconf.h -index f37bea0..e963d48 100644 ---- a/src/luaconf.h -+++ b/src/luaconf.h -@@ -200,7 +200,7 @@ - - #else /* }{ */ - --#define LUA_ROOT "/usr/local/" -+#define LUA_ROOT "/usr/" - #define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR "/" - #define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR "/" - #define LUA_PATH_DEFAULT \ --- -2.14.1 - diff --git a/lua/files/lua-5.3.pc b/lua/files/lua-5.3.pc deleted file mode 100644 index db61b11..0000000 --- a/lua/files/lua-5.3.pc +++ /dev/null @@ -1,20 +0,0 @@ -V=5.3 -R=5.3.4 - -prefix=/usr -INSTALL_BIN=${prefix}/bin -INSTALL_INC=${prefix}/include -INSTALL_LIB=${prefix}/lib -INSTALL_MAN=${prefix}/man/man1 -INSTALL_LMOD=${prefix}/share/lua/${V} -INSTALL_CMOD=${prefix}/lib/lua/${V} -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: Lua -Description: An Extensible Extension Language -Version: ${R} -Requires: -Libs: -L${libdir} -llua -lm -Cflags: -I${includedir} diff --git a/lua/package.yml b/lua/package.yml deleted file mode 100644 index d141422..0000000 --- a/lua/package.yml +++ /dev/null @@ -1,24 +0,0 @@ -name : lua -version : 5.3.4 -release : 7 -source : - - https://www.lua.org/ftp/lua-5.3.4.tar.gz : f681aa518233bc407e23acf0f5887c884f17436f000d453b2491a9f11a52400c -homepage : https://www.lua.org -license : MIT -component : programming -summary : Lightweight programming language -description: | - Lua is a powerful light-weight programming language designed for extending applications. It is also frequently used as a general-purpose, stand-alone language. Lua is implemented as a small library of C functions, written in ANSI C, and compiles unmodified in all known platforms. The implementation goals are simplicity, efficiency, portability, and low embedding cost. The result is a fast language engine with small footprint, making it ideal in embedded systems too. -patterns : - - devel : [/usr/bin] -setup : | - unset LD_AS_NEEDED - %patch -p1 < $pkgfiles/0001-Use-shared-libraries-and-proper-prefix.patch -build : | - unset LD_AS_NEEDED - %make linux -install : | - unset LD_AS_NEEDED - %make_install INSTALL_TOP=$installdir/usr TO_LIB="liblua.a liblua.so liblua.so.5.3 liblua.so.${version}" INSTALL_DATA="cp -d" INSTALL_MAN=$installdir/usr/share/man/man1 - install -Dm00644 $pkgfiles/lua-5.3.pc $installdir/usr/lib/pkgconfig/lua-5.3.pc - ln -s lua-5.3.pc $installdir/usr/lib/pkgconfig/lua.pc