From be129ca39177d8a7dbbf8e15b719fab0ec98c222 Mon Sep 17 00:00:00 2001
From: Tim Edwards <liststuff@fastmail.com.au>
Date: Thu, 15 Aug 2019 03:15:14 +0200
Subject: [PATCH] Changed Snap package to pull in Websockify directly from
 Github (https://github.com/novnc/websockify.git) instead of relying on the
 Ubuntu package which is now outdated. Also changed the version to make it
 clearer this is pulling directly from git

---
 snap/snapcraft.yaml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index e21ef6e5..88d002eb 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,6 +1,6 @@
 name: novnc
 base: core18 # the base snap is the execution environment for this snap
-version: '1.1.0'
+version: 'latest-20190813'
 summary: Open Source VNC client using HTML5 (WebSockets, Canvas)
 description: |
   Open Source VNC client using HTML5 (WebSockets, Canvas).
@@ -10,11 +10,20 @@ grade: stable
 confinement: strict
 
 parts:
+    websockify:
+        source: https://github.com/novnc/websockify.git
+        plugin: dump
+        organize:
+            websockify/: utils/websockify/websockify/
+            run: utils/websockify/
+        # Avoid file name conflicts by not staging files from websockify that have the same names as those in novnc (docs/unimportant files only)
+        stage:
+            - -README.md
+            - -docs/notes
     novnc:
         source: https://github.com/novnc/noVNC.git #https://github.com/novnc/noVNC/archive/v$SNAPCRAFT_PROJECT_VERSION.tar.gz 
         plugin: dump
         stage-packages:
-            - websockify
             - bash
             - jq
             - python-numpy