From 10d0c9b6f5eafd63a264bc95cfb2ceaaae494caf Mon Sep 17 00:00:00 2001
From: Antonio Zugaldia <antonio@mapbox.com>
Date: Sun, 21 Apr 2019 07:09:50 -0400
Subject: update snapcraft rules to include staging packages

---
 platform/linux/snap/README.md      |  6 +++---
 platform/linux/snap/snapcraft.yaml | 40 ++++++++++++++++++++++++++++++++------
 2 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/platform/linux/snap/README.md b/platform/linux/snap/README.md
index 0bc80972ad..7683713f47 100644
--- a/platform/linux/snap/README.md
+++ b/platform/linux/snap/README.md
@@ -22,7 +22,7 @@ First increase the default memory available to snapcraft. The default is 2G and
 export SNAPCRAFT_BUILD_ENVIRONMENT_MEMORY=16G
 ```
 
-After that, run `snapcraft` to build the package:
+After that, run `snapcraft` to build the package. If you're planning to update the Snap Store with this build, make sure you update the version string in `snapcraft.yaml` with the right date:
 
 ```
 snapcraft --debug
@@ -35,7 +35,7 @@ snapcraft --debug
 You can install the snap package locally with:
 
 ```
-sudo snap install my-snap-name_0.1_amd64.snap --dangerous --devmode
+sudo snap install mapbox-demo_20190420-master_amd64.snap --dangerous --devmode
 ```
 
 ## Publishing it to the Snap Store
@@ -49,5 +49,5 @@ snapcraft login
 Upload the snap and release it into the edge channel:
 
 ```
-snapcraft push --release=edge mysnap_latest_amd64.snap
+snapcraft push --release=edge mapbox-demo_20190420-master_amd64.snap
 ```
diff --git a/platform/linux/snap/snapcraft.yaml b/platform/linux/snap/snapcraft.yaml
index a0c88f6fc9..78a86aef51 100644
--- a/platform/linux/snap/snapcraft.yaml
+++ b/platform/linux/snap/snapcraft.yaml
@@ -5,7 +5,7 @@
 
 name: mapbox-demo
 base: core18
-version: '20190420-master'
+version: '20190421-master'
 summary: A simple map application for Linux.
 description: |
   A simple map application and test suite for Linux, based on Mapbox GL Native
@@ -17,6 +17,10 @@ description: |
 grade: stable
 confinement: strict
 
+apps:
+  mbgl-glfw:
+    command: bin/mbgl-glfw
+
 parts:
   mbgl-glfw:
     plugin: dump
@@ -29,8 +33,16 @@ parts:
       [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
       [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
       nvm install 8.15.1
+      sed -i '/ca-bundle.crt/d' platform/default/src/mbgl/storage/http_file_source.cpp
       make clean glfw-app
-      cp build/linux-x86_64/Debug/mbgl-glfw /bin
+      mkdir -p $SNAPCRAFT_PART_INSTALL/bin
+      cp build/linux-x86_64/Debug/mbgl-glfw $SNAPCRAFT_PART_INSTALL/bin/mbgl-glfw
+    stage:
+      - bin/
+      - usr/lib
+    prime:
+      - bin/
+      - usr/lib
     build-packages:
       - automake
       - build-essential
@@ -58,7 +70,23 @@ parts:
       - x11proto-xf86vidmode-dev
       - xutils-dev
       - zlib1g-dev
-
-apps:
-  mbgl-glfw:
-    command: /bin/mbgl-glfw
+    stage-packages:
+      - libx11-6
+      - libasn1-8-heimdal
+      - libcurl4-openssl-dev
+      - libgl1
+      - libglvnd0
+      - libglx0
+      - libgssapi3-heimdal
+      - libhcrypto4-heimdal
+      - libheimbase1-heimdal
+      - libheimntlm0-heimdal
+      - libhx509-5-heimdal
+      - libkrb5-26-heimdal
+      - libldap-2.4-2
+      - libnghttp2-14
+      - libpsl5
+      - libroken18-heimdal
+      - librtmp1
+      - libsasl2-2
+      - libwind0-heimdal
-- 
cgit v1.2.1