From 26f99552b74cf2375276b7bb497ad4edc329c1e6 Mon Sep 17 00:00:00 2001
From: Michael James Gratton <mike@vee.net>
Date: Fri, 29 Sep 2017 00:41:14 +1000
Subject: [PATCH] Import flatpak-builder config into the tree from
 gnome-apps-nightly.

Point libgee to a stable tag rather than master so we're not tracking
development versions.
---
 .gitignore           |   1 +
 org.gnome.Geary.json | 110 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 111 insertions(+)
 create mode 100644 org.gnome.Geary.json

diff --git a/.gitignore b/.gitignore
index f6464f04..b8881d7d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@ debian/geary-dbg
 /geary
 /geary-mailer
 /geary-console
+.flatpak-builder
 *.diff
 *.patch
 *.xz
diff --git a/org.gnome.Geary.json b/org.gnome.Geary.json
new file mode 100644
index 00000000..5d1eafec
--- /dev/null
+++ b/org.gnome.Geary.json
@@ -0,0 +1,110 @@
+/* flatpak-builder config for Geary. */
+{
+    "app-id": "org.gnome.Geary",
+    "runtime": "org.gnome.Platform",
+    "runtime-version": "master",
+    "sdk": "org.gnome.Sdk",
+    "command": "geary",
+    "tags": ["nightly"],
+    "desktop-file-name-prefix": "(Nightly) ",
+    "rename-icon": "geary",
+    "copy-icon": true,
+    "finish-args": [
+        /* X11 + XShm access */
+        "--share=ipc", "--socket=x11",
+
+        /* Wayland access */
+        "--socket=wayland",
+
+        /* OpenGL access for WK2 */
+        "--device=dri",
+
+        /* Bus access */
+        "--socket=session-bus",
+
+        /* Pulseaudio */
+        "--socket=pulseaudio",
+
+        /* Needs to talk to the network: */
+        "--share=network",
+
+        /* Notification access */
+        "--talk-name=org.freedesktop.Notifications",
+
+        /* Secrets access */
+        "--talk-name=org.freedesktop.secrets",
+
+        /* Needed for dconf to work */
+        "--filesystem=xdg-run/dconf", "--filesystem=~/.config/dconf:ro",
+        "--talk-name=ca.desrt.dconf", "--env=DCONF_USER_CONFIG_DIR=.config/dconf"
+    ],
+    "build-options" : {
+        "cflags": "-O2 -g",
+        "cxxflags": "-O2 -g",
+        "env": {
+            "V": "1"
+        }
+    },
+    "cleanup": ["/include", "/lib/pkgconfig",
+                "/share/pkgconfig", "/share/aclocal",
+                "/man", "/share/man", "/share/gtk-doc",
+                "/share/vala",
+                "*.la", "*.a"],
+    "modules": [
+        {
+            "name": "gnome-doc-utils",
+            "build-options": {
+                "arch" : {
+                    /* Lie about our arch - no actual compilation happens here. */
+                    "arm": {
+                        "config-opts": [ "--build=amd64" ]
+                    },
+                    "aarch64": {
+                        "config-opts": [ "--build=amd64" ]
+                    }
+                }            },
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://download.gnome.org/sources/gnome-doc-utils/0.20/gnome-doc-utils-0.20.10.tar.xz",
+                    "sha256": "cb0639ffa9550b6ddf3b62f3b1add92fb92ab4690d351f2353cffe668be8c4a6"
+                }
+            ]
+        },
+        {
+            "name": "libgee",
+            "build-options" : {
+                "env": {
+                    "PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR": "/app/share/gir-1.0",
+                    "PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR": "/app/lib/girepository-1.0"
+                }
+            },
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://git.gnome.org/browse/libgee",
+                    "tag": "0.20.0"
+                }
+            ]
+        },
+        {
+            "name": "gmime",
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://git.gnome.org/browse/gmime",
+                    "branch": "gmime-2-6"
+                }
+            ]
+        },
+        {
+            "name": "geary",
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://git.gnome.org/browse/geary"
+                }
+            ]
+        }
+    ]
+}