Add org.sugarlabs.BaseApp

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "shared-modules"]
+	path = shared-modules
+	url = https://github.com/flathub/shared-modules.git

flathub.json

@@ -0,0 +1,3 @@
+{
+    "skip-appstream-check": true
+}

org.sugarlabs.BaseApp.json

@@ -0,0 +1,192 @@
+{
+    "id": "org.sugarlabs.BaseApp",
+    "runtime": "org.gnome.Platform",
+    "runtime-version": "3.36",
+    "sdk": "org.gnome.Sdk",
+    "separate-locales": false,
+    "cleanup": [
+        "/include",
+        "/lib/pkgconfig",
+        "/share/pkgconfig",
+        "/share/aclocal",
+        "/share/info",
+        "/share/gtk-doc",
+        "/share/man",
+        "/man",
+        "*.la",
+        "*.a"
+    ],
+    "modules": [
+        "shared-modules/dbus-glib/dbus-glib-0.110.json",
+        "shared-modules/intltool/intltool-0.51.json",
+        {
+            "name": "empy",
+            "cleanup": [ "*" ],
+            "buildsystem": "simple",
+            "build-commands": [
+                "pip3 install --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} empy"
+            ],
+            "sources": [
+                {
+                    "type": "file",
+                    "url": "https://files.pythonhosted.org/packages/3b/95/88ed47cb7da88569a78b7d6fb9420298df7e99997810c844a924d96d3c08/empy-3.3.4.tar.gz",
+                    "sha256": "73ac49785b601479df4ea18a7c79bc1304a8a7c34c02b9472cf1206ae88f01b3"
+                }
+            ],
+            "post-install": [
+                "chmod +x /app/lib/python3.7/site-packages/em.py",
+                "mkdir -p /app/bin/",
+                "ln -s /app/lib/python3.7/site-packages/em.py /app/bin/empy"
+            ]
+        },
+        {
+            "name": "perl-XML-Simple",
+            "cleanup": [ "*" ],
+            "buildsystem": "simple",
+            "build-commands": [
+                "perl Makefile.PL PREFIX=${FLATPAK_DEST}",
+                "make install"
+            ],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://cpan.metacpan.org/authors/id/G/GR/GRANTM/XML-Simple-2.25.tar.gz",
+                    "sha256": "531fddaebea2416743eb5c4fdfab028f502123d9a220405a4100e68fc480dbf8"
+                }
+            ]
+        },
+        {
+            "name": "xcursorgen",
+            "cleanup": [ "*" ],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://github.com/freedesktop/xcursorgen/archive/xcursorgen-1.0.6.tar.gz",
+                    "sha256": "0566c6848c93ef092b37e4ffdc6e86e9249fa9721f663117787b6cefea5eb55b"
+                }
+            ]
+        },
+        {
+            "name": "icon-naming-utils",
+            "cleanup": [ "*" ],
+            "build-options": {
+                "env": {
+                    "PERL5LIB": "/app/lib/perl5/site_perl/5.30.0/"
+                }
+            },
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "http://tango.freedesktop.org/releases/icon-naming-utils-0.8.90.tar.gz",
+                    "sha256": "044ab2199ed8c6a55ce36fd4fcd8b8021a5e21f5bab028c0a7cdcf52a5902e1c"
+                }
+            ]
+        },
+        {
+            "name": "sugar-artwork",
+            "no-parallel-make": true,
+            "config-opts": [
+                "--without-gtk2"
+            ],
+            "build-options": {
+                "env": {
+                    "PERL5LIB": "/app/lib/perl5/site_perl/5.30.0/"
+                }
+            },
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "http://download.sugarlabs.org/sources/sucrose/glucose/sugar-artwork/sugar-artwork-0.117.tar.xz",
+                    "sha256": "27a68d6c743101cfc5c60feed13a391d8b6edc25aac55dad46bd55d5ffa2351e"
+                }
+            ]
+        },
+        {
+            "name": "python-dbus",
+            "buildsystem": "simple",
+            "build-commands": [
+                "pip3 install --no-index --find-links \"file://${PWD}\" --install-option=\"--prefix=${FLATPAK_DEST}\" dbus-python"
+            ],
+            "sources": [
+                {
+                    "type": "file",
+                    "url": "https://files.pythonhosted.org/packages/b6/85/7b46d31f15a970665533ad5956adee013f03f0ad4421c3c83304ae9c9906/dbus-python-1.2.12.tar.gz",
+                    "sha256": "cdd4de2c4f5e58f287b12013ed7b41dee81d503c8d0d2397c5bd2fb01badf260"
+                }
+            ]
+        },
+        {
+            "name": "decorator",
+            "buildsystem": "simple",
+            "build-commands": [
+                "pip3 install --no-index --find-links \"file://${PWD}\" --install-option=\"--prefix=${FLATPAK_DEST}\" decorator"
+            ],
+            "sources": [
+                {
+                    "type": "file",
+                    "url": "https://pypi.python.org/packages/70/f1/cb9373195639db13063f55eb06116310ad691e1fd125e6af057734dc44ea/decorator-4.2.1.tar.gz",
+                    "sha256": "7d46dd9f3ea1cf5f06ee0e4e1277ae618cf48dfb10ada7c8427cd46c42702a0e"
+                }
+            ]
+        },
+        {
+            "name": "python-six",
+            "buildsystem": "simple",
+            "build-commands": [
+                "pip3 install --no-index --find-links \"file://${PWD}\" --install-option=\"--prefix=${FLATPAK_DEST}\" six"
+            ],
+            "sources": [
+                {
+                    "type": "file",
+                    "url": "https://files.pythonhosted.org/packages/dd/bf/4138e7bfb757de47d1f4b6994648ec67a51efe58fa907c1e11e350cddfca/six-1.12.0.tar.gz",
+                    "sha256": "d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73"
+                }
+            ]
+        },
+        {
+            "name": "telepathy-glib",
+            "config-opts": ["--disable-static", "--disable-gtk-doc"],
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://www.github.com/TelepathyIM/telepathy-glib.git",
+                    "tag": "telepathy-glib-0.24.1",
+                    "commit": "c834ef1a50a97cbfae7a0d560ff806fd5aa7ffe8"
+                },
+                {
+                    "type": "patch",
+                    "path": "telepathy-glib-uniquify.patch"
+                }
+            ]
+        },
+        {
+            "name": "sugar-toolkit-gtk3",
+            "no-parallel-make": true,
+            "config-opts": [
+                "--with-python3"
+            ],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "http://download.sugarlabs.org/sources/sucrose/glucose/sugar-toolkit-gtk3/sugar-toolkit-gtk3-0.117.tar.xz",
+                    "sha256": "eca4b113e30993b3ecc90a6be5eebc8104020c816e89c92938b375a33dc4ef4f"
+                }
+            ]
+        },
+        {
+            "name": "sugarapp",
+            "buildsystem": "simple",
+            "build-commands": [
+                "pip3 install --no-index --find-links ${PWD} --install-option=\"--prefix=${FLATPAK_DEST}\" $PWD"
+            ],
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://github.com/tchx84/sugarapp.git",
+                    "tag": "v1.12",
+                    "commit": "2e2211b3bb7f8ba07a70d8d24131412e04c084ea"
+                }
+            ]
+        }
+    ]
+}

telepathy-glib-uniquify.patch

@@ -0,0 +1,25 @@
+From fd733c82ba71201ab7793a38e8fc2fb47a9062f9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Sun, 19 Feb 2017 00:40:05 +0100
+Subject: [PATCH] base-client: Append a single element when uniquifying name
+
+---
+ telepathy-glib/base-client.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/telepathy-glib/base-client.c b/telepathy-glib/base-client.c
+index 600f292..7f5c155 100644
+--- a/telepathy-glib/base-client.c
++++ b/telepathy-glib/base-client.c
+@@ -1347,7 +1347,7 @@ tp_base_client_constructed (GObject *object)
+       unique = tp_escape_as_identifier (tp_dbus_daemon_get_unique_name (
+             self->priv->dbus));
+
+-      g_string_append_printf (string, ".%s.n%u", unique, unique_counter++);
++      g_string_append_printf (string, ".%sn%u", unique, unique_counter++);
+       g_free (unique);
+     }
+
+-- 
+2.9.3
+