From 15ddd868d4ae55b0fc12f8f603beee21c0d875b5 Mon Sep 17 00:00:00 2001
From: PayouZon MagIT <11562401+payomagic@users.noreply.github.com>
Date: Sun, 17 Mar 2019 07:33:19 +0100
Subject: [PATCH] Barrier Snappy

Snappy ready & tested on Ubuntu 18.04
---
 snap/snapcraft.yaml | 99 +++++++++++++++++++++++++++++++++++----------
 1 file changed, 78 insertions(+), 21 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 0634ed2f..671ccd4a 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,22 +1,80 @@
-
-  name: barrier-kvm # you probably want to 'snapcraft register <name>'
-base: core18 # the base snap is the execution environment for this snap
-version: '0.3' # just for humans, typically '1.2+git' or '1.3.2'
-summary: Single-line elevator pitch for your amazing snap # 79 char long summary
+name: barrier-kvm # the Barrier Snappy for Linux / not tested on MAC yet
+base: core18 
+version: '2.2.0' # 03/2019 
+summary: Eliminate the barrier between your machines.
 description: |
-  A GNU fork of Synergy. Barrier. With SSL support. Server+Client.
-
-grade: devel # must be 'stable' to release into candidate/stable channels
-confinement: devmode # use 'strict' once you have the right plugs and slots
+       Barrier is KVM software forked from Symless's synergy 1.9 codebase. 
+       Synergy was a commercialized reimplementation of the original 
+       CosmoSynergy written by Chris Schoeneman.
+grade: stable # must be 'stable' to release into candidate/stable channels
+confinement: strict # use 'strict' once you have the right plugs and slots
 
+apps:
+  barrier-kvm:
+    command: desktop-launch barrier #first run might take longer
+    plugs:
+      gnome-3-26-1604:
+        interface: content
+        target: gnome-platform
+        default-provider: gnome-3-26-1604:gnome-3-26-1604
+    plugs: [gnome-3-26-1604]
+    plugs: [x11]
+parts: [qt5conf]
 parts:
+  desktop:
+    plugin: nil
+    source: https://github.com/ubuntu/snapcraft-desktop-helpers.git
+  desktop-qt5:
+    source: https://github.com/ubuntu/snapcraft-desktop-helpers.git
+    source-subdir: qt
+    plugin: make
+    make-parameters: ["FLAVOR=qt5"]
+    build-packages:
+      - build-essential
+      - qtbase5-dev
+      - dpkg-dev
+    stage-packages:
+      - libxkbcommon0
+      - ttf-ubuntu-font-family
+      - dmz-cursor-theme
+      - light-themes
+      - adwaita-icon-theme
+      - gnome-themes-standard
+      - shared-mime-info
+      - libqt5gui5
+      - libgdk-pixbuf2.0-0
+      - libqt5svg5 # for loading icon themes which are svg
+      - try: [appmenu-qt5] # not available on core18
+      - locales-all
+      - xdg-user-dirs
+      - fcitx-frontend-qt5  
+  qt5:
+    source: https://github.com/ubuntu/snapcraft-desktop-helpers.git    
+    source-subdir: qt
+    plugin: make
+    make-parameters: ["FLAVOR=qt5"]
+    build-packages:
+      - qtbase5-dev
+      - dpkg-dev
+    stage-packages:
+      - libxkbcommon0
+      - ttf-ubuntu-font-family
+      - dmz-cursor-theme
+      - light-themes
+      - adwaita-icon-theme
+      - gnome-themes-standard
+      - shared-mime-info
+      - libqt5gui5
+      - libgdk-pixbuf2.0-0
+      - libqt5svg5 # for loading icon themes which are svg
+      - try: [appmenu-qt5] # not available on core18
+      - locales-all    
   barrier-kvm:
     source: https://github.com/payomagic/barrier.git
-#    source-subdir: 
-    # See 'snapcraft plugins'
-    plugin: cmake 
+    plugin: cmake
     build-packages:
       - g++
+      - gcc
       - make
       - xorg-dev 
       - libcurl4-openssl-dev
@@ -25,6 +83,8 @@ parts:
       - libx11-dev
       - libqt4-dev
       - qtbase5-dev
+      - qt5-style-plugins
+      - qt5ct
     stage-packages:
       - libxinerama-dev
       - libxinerama1
@@ -36,12 +96,9 @@ parts:
       - qtdeclarative5-dev
       - libavahi-compat-libdnssd-dev
       - libqt5gui5
-      - qt5dxcb-plugin
-    after: [qt5conf]
-#     configflags:
-#     - CMAKE_CXX_STANDARD 14
-#     - CMAKE_CXX_EXTENSIONS OFF
-apps:
-  barrier-kvm:
-    command: barrier
-    plugs: [x11]
+      - libavahi-common-dev
+      - libqt5x11extras5
+      - libqt5svg5
+      - libqt5svg5-dev
+      - qt5ct
+    after: [desktop-qt5]