[gnome-games/wip/exalm/dosbox-svn: 644/648] flatpak: Sync lua with shared-modules
- From: Alexander Mikhaylenko <alexm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-games/wip/exalm/dosbox-svn: 644/648] flatpak: Sync lua with shared-modules
- Date: Sat, 15 Feb 2020 18:07:56 +0000 (UTC)
commit 8ca50b8531cf1f827c303925ff329af0c374db66
Author: Alexander Mikhaylenko <exalm7659 gmail com>
Date: Sun Jan 20 15:27:24 2019 +0500
flatpak: Sync lua with shared-modules
Also move it to a subdirectory.
flatpak/{ => lua5.3}/lua-5.3.0-autotoolize.patch | 0
.../lua5.3/lua-5.3.0-configure-compat-module.patch | 35 ++++++++++++++++++++++
flatpak/{ => lua5.3}/lua-5.3.0-idsize.patch | 0
.../lua-5.3.2.json} | 12 ++++++--
flatpak/org.gnome.Games.json | 2 +-
5 files changed, 45 insertions(+), 4 deletions(-)
---
diff --git a/flatpak/lua-5.3.0-autotoolize.patch b/flatpak/lua5.3/lua-5.3.0-autotoolize.patch
similarity index 100%
rename from flatpak/lua-5.3.0-autotoolize.patch
rename to flatpak/lua5.3/lua-5.3.0-autotoolize.patch
diff --git a/flatpak/lua5.3/lua-5.3.0-configure-compat-module.patch
b/flatpak/lua5.3/lua-5.3.0-configure-compat-module.patch
new file mode 100644
index 00000000..bd5d41d4
--- /dev/null
+++ b/flatpak/lua5.3/lua-5.3.0-configure-compat-module.patch
@@ -0,0 +1,35 @@
+diff -up lua-5.2.2/configure.ac.compat-module lua-5.2.2/configure.ac
+--- lua-5.2.2/configure.ac.compat-module 2013-05-10 10:16:05.344137597 -0400
++++ lua-5.2.2/configure.ac 2013-05-10 10:16:05.357137596 -0400
+@@ -11,6 +11,20 @@ AC_PROG_CC
+ AC_PROG_LIBTOOL
+
+ AC_ARG_WITH(
++ [compat-module],
++ [AC_HELP_STRING([--with-compat-module], [Enable LUA_COMPAT_MODULE functions [default=no]])],
++ [use_compat_module=$withval],
++ [use_compat_module=no]
++)
++
++COMPAT_DEFS="#undef LUA_COMPAT_ALL"
++if test "x$use_compat_module" == "xyes"; then
++ COMPAT_DEFS="#define LUA_COMPAT_5_1
++#define LUA_COMPAT_5_2"
++fi
++AC_SUBST(COMPAT_DEFS)
++
++AC_ARG_WITH(
+ [readline],
+ [AC_HELP_STRING([--with-readline], [Use readline for interpreter input [default=yes]])],
+ [use_readline=$withval],
+diff -up lua-5.2.2/src/luaconf.h.template.in.compat-module lua-5.2.2/src/luaconf.h.template.in
+--- lua-5.2.2/src/luaconf.h.template.in.compat-module 2013-05-10 10:25:42.586116963 -0400
++++ lua-5.2.2/src/luaconf.h.template.in 2013-05-10 10:26:29.957115269 -0400
+@@ -15,6 +15,7 @@
+ @LUA_DL_DEFS@
+ @LUA_BUILD_AS_DLL_DEFS@
+ @READLINE_DEFS@
++@COMPAT_DEFS@
+
+
+ /*
diff --git a/flatpak/lua-5.3.0-idsize.patch b/flatpak/lua5.3/lua-5.3.0-idsize.patch
similarity index 100%
rename from flatpak/lua-5.3.0-idsize.patch
rename to flatpak/lua5.3/lua-5.3.0-idsize.patch
diff --git a/flatpak/org.lua.modules.json b/flatpak/lua5.3/lua-5.3.2.json
similarity index 70%
rename from flatpak/org.lua.modules.json
rename to flatpak/lua5.3/lua-5.3.2.json
index 4b58f2b0..464ded5d 100644
--- a/flatpak/org.lua.modules.json
+++ b/flatpak/lua5.3/lua-5.3.2.json
@@ -1,16 +1,18 @@
{
- "name": "lua",
+ "name": "lua-5.3",
+ "config-opts": [
+ "--with-compat-module"
+ ],
"sources": [
{
"type": "archive",
- "url": "http://www.lua.org/ftp/lua-5.3.4.tar.gz",
+ "url": "https://www.lua.org/ftp/lua-5.3.4.tar.gz",
"sha256": "f681aa518233bc407e23acf0f5887c884f17436f000d453b2491a9f11a52400c"
},
{
"type": "shell",
"commands": [ "mv src/luaconf.h src/luaconf.h.template.in" ]
},
- /* Patches from the Fedora package */
{
"type": "patch",
"path": "lua-5.3.0-autotoolize.patch"
@@ -19,6 +21,10 @@
"type": "patch",
"path": "lua-5.3.0-idsize.patch"
},
+ {
+ "type": "patch",
+ "path": "lua-5.3.0-configure-compat-module.patch"
+ },
{
"type": "shell",
"commands": [ "autoreconf -i" ]
diff --git a/flatpak/org.gnome.Games.json b/flatpak/org.gnome.Games.json
index 43ecec0b..f454d0c2 100644
--- a/flatpak/org.gnome.Games.json
+++ b/flatpak/org.gnome.Games.json
@@ -90,7 +90,7 @@
]
},
/* End libretro cores */
- "org.lua.modules.json",
+ "lua5.3/lua-5.3.2.json",
{
"name" : "tracker",
"buildsystem" : "meson",
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]