[totem/wip/hadess/update-flatpak: 1/5] flatpak: Use flathub shared module to build Lua



commit d2078f604d2041a1f21583fb9025808606b38972
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Jan 15 17:58:24 2019 +0100

    flatpak: Use flathub shared module to build Lua

 .gitmodules                         |   3 +
 flatpak/lua-5.3.0-autotoolize.patch | 192 ------------------------------------
 flatpak/lua-5.3.0-idsize.patch      |  12 ---
 flatpak/org.gnome.Totem.json        |   3 +-
 flatpak/org.lua.modules.json        |  28 ------
 flatpak/shared-modules              |   1 +
 6 files changed, 5 insertions(+), 234 deletions(-)
---
diff --git a/.gitmodules b/.gitmodules
index fa136361f..f33d9d006 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "subprojects/libgd"]
        path = subprojects/libgd
        url = https://gitlab.gnome.org/GNOME/libgd.git
+[submodule "flatpak/shared-modules"]
+       path = flatpak/shared-modules
+       url = https://github.com/flathub/shared-modules.git
diff --git a/flatpak/org.gnome.Totem.json b/flatpak/org.gnome.Totem.json
index ce25880ab..05b66abe1 100644
--- a/flatpak/org.gnome.Totem.json
+++ b/flatpak/org.gnome.Totem.json
@@ -51,6 +51,7 @@
     },
     "cleanup": [ "/include", "/share/bash-completion" ],
     "modules": [
+        "shared-modules/lua5.3/lua-5.3.2.json",
         {
             "name": "libpeas",
             "cleanup": [ "/bin/*", "/lib/peas-demo" ],
@@ -142,8 +143,6 @@
                 }
             ]
         },
-        /* FIXME use Flathub shared modules */
-        "org.lua.modules.json",
         {
             "name": "tracker",
             "cleanup": [ "/bin", "/etc", "/libexec" ],
diff --git a/flatpak/shared-modules b/flatpak/shared-modules
new file mode 160000
index 000000000..ecb014f50
--- /dev/null
+++ b/flatpak/shared-modules
@@ -0,0 +1 @@
+Subproject commit ecb014f5090b519513fc62a83d49d545750e4c77


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]