[polari/wip/fmuellner/xdg-app] xdg-app: Allow building as xdg-app

[Florian Müllner <fmuellner src gnome org>]

commit 15eb4a98f8d70b57955c36c695042b7c50dbd97f
Author: Florian Müllner <fmuellner gnome org>
Date:   Sat Jan 23 18:45:15 2016 +0100

    xdg-app: Allow building as xdg-app

 Makefile.am                        |    2 +-
 configure.ac                       |    1 +
 xdg-app/Makefile.am                |    7 ++++
 xdg-app/manifest.json              |   57 ++++++++++++++++++++++++++++++++++++
 xdg-app/tpl-override-basedir.patch |   27 +++++++++++++++++
 5 files changed, 93 insertions(+), 1 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 45dd146..0e607ff 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = src data po
+SUBDIRS = src data po xdg-app
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
diff --git a/configure.ac b/configure.ac
index c882e13..520eefe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,6 +61,7 @@ AC_CONFIG_FILES([
   data/icons/Makefile
   po/Makefile.in
   src/Makefile
+  xdg-app/Makefile
 ])
 
 AC_OUTPUT
diff --git a/xdg-app/Makefile.am b/xdg-app/Makefile.am
new file mode 100644
index 0000000..dd7a3d9
--- /dev/null
+++ b/xdg-app/Makefile.am
@@ -0,0 +1,7 @@
+xdg-app: manifest.json clean-local
+       xdg-app-builder $(APP_ID) $<
+
+clean-local:
+       -rm -rf $(APP_ID)
+
+EXTRA_DIST = manifest.json
diff --git a/xdg-app/manifest.json b/xdg-app/manifest.json
new file mode 100644
index 0000000..72c42e6
--- /dev/null
+++ b/xdg-app/manifest.json
@@ -0,0 +1,57 @@
+{
+  "app-id": "org.gnome.Polari",
+  "version": "master",
+  "runtime": "org.gnome.Platform",
+  "runtime-version": "master",
+  "sdk": "org.gnome.Sdk",
+  "command": "polari",
+  "finish-args": [
+    "--share=ipc", "--socket=x11", "--socket=wayland",
+    "--share=network", "--socket=session-bus",
+    "--filesystem=~/.local/share/TpLogger",
+    "--env=TPL_LOG_DIR=.local/share",
+    "--filesystem=~/.config/dconf", "--talk-name=ca.desrt.dconf",
+    "--env=DCONF_USER_CONFIG_DIR=.config/dconf"],
+  "build-options": {
+    "cflags": "-O2 -g",
+    "env": {
+      "V": "1"
+    }
+  },
+  "cleanup": ["/include","/libexec","/lib/*.la","/lib/*.a",
+              "/lib/pkgconfig","/lib/polari/*.la",
+              "/share/aclocal", "/share/gir-1.0", "/share/gtk-doc"],
+  "modules": [
+    { "name": "telepathy-glib",
+      "sources": [
+        {
+          "type": "archive",
+          "url": "http://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-0.24.1.tar.gz";,
+          "sha256": "9e0df1d8f857e0270cf0b32e2d1ca5a24aa7282873361785d573f72ad7f7d5eb"
+        }
+      ]
+    },
+    { "name": "telepathy-logger",
+      "sources": [
+        {
+          "type": "archive",
+          "url": "http://telepathy.freedesktop.org/releases/telepathy-logger/telepathy-logger-0.8.2.tar.bz2";,
+          "sha256": "8fcad534d653b1b365132c5b158adae947810ffbae9843f72dd1797966415dae",
+          "patches": [ "allow-to-override-basedir.patch" ]
+        },{
+          "type": "patch",
+          "path": "tpl-override-basedir.patch"
+        }
+      ]
+    },
+    { "name": "polari",
+      "sources": [
+        {
+          "type": "git",
+          "url": "git://git.gnome.org/polari",
+          "branch": "wip/fmuellner/xdg-app"
+        }
+      ]
+    }
+  ]
+}
diff --git a/xdg-app/tpl-override-basedir.patch b/xdg-app/tpl-override-basedir.patch
new file mode 100644
index 0000000..4d8dde5
--- /dev/null
+++ b/xdg-app/tpl-override-basedir.patch
@@ -0,0 +1,27 @@
+From c0349769acc1289189110f0a2a7d24401fbfae08 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner gnome org>
+Date: Sat, 20 Feb 2016 04:24:57 +0100
+Subject: [PATCH] log-store-xml: Allow overriding basedir
+
+---
+ telepathy-logger/log-store-xml.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/telepathy-logger/log-store-xml.c b/telepathy-logger/log-store-xml.c
+index be881d0..01676fa 100644
+--- a/telepathy-logger/log-store-xml.c
++++ b/telepathy-logger/log-store-xml.c
+@@ -1744,6 +1744,10 @@ log_store_xml_get_basedir (TplLogStoreXml *self)
+         {
+           user_data_dir = g_getenv ("TPL_TEST_LOG_DIR");
+         }
++      else if (g_getenv ("TPL_LOG_DIR") != NULL)
++        {
++          user_data_dir = g_getenv ("TPL_LOG_DIR");
++        }
+       else
+         {
+           user_data_dir = g_get_user_data_dir ();
+-- 
+2.7.1
+