From 2db25e43b9a5daa874cfca9d349ac121d08ce797 Mon Sep 17 00:00:00 2001
From: Tim Edwards <liststuff@fastmail.com.au>
Date: Sat, 20 Apr 2019 05:43:26 +0200
Subject: [PATCH] Temporary changes to use 'my' modified version of novncC

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

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 73581a1a..017c021d 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -11,16 +11,21 @@ confinement: devmode # use 'strict' once you have the right plugs and slots
 
 parts:
     novnc:
-        source: https://github.com/novnc/noVNC/archive/v$SNAPCRAFT_PROJECT_VERSION.tar.gz
+        source: https://github.com/tkedwards/noVNC.git # https://github.com/novnc/noVNC/archive/v$SNAPCRAFT_PROJECT_VERSION.tar.gz
         plugin: dump
+        source-type: git # only until my changes get commited
+        build-packages: # only until my changes get commited
+            - git       
+        #stage-snaps:
+        #    - websockify
     websockify:
         source: https://github.com/novnc/websockify
         plugin: dump
         source-type: git
         build-packages:
             - git
+        organize: # avoid filename conflicts with files from the novnc part
+            '*': utils/websockify/
 apps:
     novnc:
         command: utils/launch.sh
-    websockify:
-        command: utils/websockify/run