Merge ~saviq/mir-kiosk:no-overlay into ~mir-team/mir-kiosk/+git/mir-kiosk-old:master

[Michał Sawicz]

[Alberto Aguirre (albaguirre)]

LGTM. Builds in a clean container with xenial-proposed.

review: Approve

[Alberto Aguirre (albaguirre)]

Worked with in a AMD64 VM ubuntu core image

[Alberto Aguirre (albaguirre)]

The snap version should probably be changed to "1.3.2" to match the lp:miral/release branch version.

[Michał Sawicz (saviq)]

> The snap version should probably be changed to "1.3.2" to match the lp:miral/release branch version.
Done

[Alan Griffiths (alan-griffiths)]

LGTM

review: Approve

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index abff93d..7fa9032 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: mir-kiosk
-version: 1.2.0 #The miral-examples version
+version: 1.2.3 # The miral release version
 summary: A minimal Mir based shell for kiosk type applications
 description: A minimal Mir based shell for kiosk type applications
 confinement: strict
@@ -23,11 +23,32 @@ apps:
 
 parts:
   miral-examples:
-    plugin: nil
-    stage-packages:
-     - miral-examples
+    plugin: cmake
+    source: lp:miral/release
+    configflags:
+      - -DCMAKE_INSTALL_PREFIX=/usr
     build-attributes:
-     - no-system-libraries
+      - no-system-libraries
+    build-packages:
+      - build-essential
+      - libfreetype6-dev
+      - libgles2-mesa-dev
+      - libglib2.0-dev
+      - libmirserver-dev
+      - libmirclient-dev
+      - pkg-config
+      - python-pil
+    stage-packages:
+      - libboost-filesystem1.58.0
+      - libboost-program-options1.58.0
+      - libboost-system1.58.0
+      - libegl1-mesa
+      - libfreetype6
+      - libgles2-mesa
+      - libglib2.0-0
+      - libnettle6
+      - libprotobuf-lite9v5
+      - libxkbcommon0
     prime:
       - usr/lib
       - -usr/lib/*/libmir* #Use the libraries from mir-libs content plug