Flatpak: Enable SSH and improvements to manifest and CONTRIBUTION

* Move dependencies to dedicated folder

* Enable SSH

* Improvements to manifest and CONTRIBUTION

CONTRIBUTING.md

@@ -7,6 +7,8 @@ All contributions that improve Vorta for everyone are welcome. Before coding a n
 
 ## Local Development Setup
 
+### macOS (or Linux if Flatpak is not an option) with pip
+
 Clone the latest version of this repo:
 ```
 $ git clone https://github.com/borgbase/vorta/
@@ -27,7 +29,7 @@ Then run as Python script. Any changes from your source folder should be reflect
 $ vorta
 ```
 
-### Package with Flatpak
+### Linux with Flatpak
 
 Follow the setup guide on [flatpak.org](http://flatpak.org/setup/) to make sure you have ``flatpak`` and ``flathub`` installed.
 
@@ -49,14 +51,20 @@ Next, in Vorta’s source directory, use ``flatpak-builder`` to build a Vorta fl
 $ cd vorta/flatpak/
 $ mkdir app
 $ flatpak-builder --repo=$HOME/my-flatpak-builds app com.borgbase.vorta.yaml
-$ flatpak install --user my-flatpak-builds com.borgbase.vorta -y
+$ flatpak install --user my-flatpak-builds com.borgbase.vorta//devel -y
 ```
 
 Now you can work on the codebase.
 When you want to test your changes you can execute inside of ``vorta/flatpak/``
 ```
-$ flatpak-builder --repo=$HOME/my-flatpak-builds app com.borgbase.vorta.yaml --force-clean && flatpak update com.borgbase.vorta -y
-$ flatpak run com.borgbase.vorta 
+$ flatpak-builder --repo=$HOME/my-flatpak-builds app com.borgbase.vorta.yaml --force-clean && flatpak update com.borgbase.vorta//devel -y
+$ flatpak run com.borgbase.vorta//devel 
+```
+
+To set which branch of Vorta (master from flathub or devel from local development setup) will be used in your OS you can use
+
+```
+$ flatpak make-current com.borgbase.vorta [master|devel]
 ```
 
 

flatpak/README.md

@@ -1,5 +0,0 @@
-flatpak-builder --repo=$HOME/my-flatpak-builds app com.borgbase.vorta.yaml --force-clean; flatpak update com.borgbase.vorta -y
-
-flatpak run com.borgbase.vorta 
-
-

flatpak/com.borgbase.vorta.yaml

@@ -3,6 +3,7 @@ app-id: com.borgbase.vorta
 runtime: org.kde.Platform
 runtime-version: '5.12'
 sdk: org.kde.Sdk
+branch: devel
 
 command: vorta
 
@@ -23,36 +24,46 @@ finish-args:
   - --filesystem=~/.config/dconf:ro
   - --talk-name=ca.desrt.dconf
   - --env=DCONF_USER_CONFIG_DIR=.config/dconf
-  # without it, no tray icon is displayed
-  - --own-name=org.kde.*
-  # without it mounting does not work
-  - --own-name=org.freedesktop.*
-  # allow access to keyring
+  # Tray icon
+  - --talk-name=org.kde.StatusNotifierWatcher
+  - --own-name=org.kde.StatusNotifierItem-2-1
+  - --own-name=org.kde.StatusNotifierItem-4-1
+  # Mounting
+  - --talk-name=org.freedesktop.DBus.*
+  - --talk-name=org.freedesktop.Flatpak.*
+  # Allow access to keyring
   - --talk-name=org.freedesktop.secrets
+  # SSH
+  - --socket=ssh-auth
+  - --own-name=org.KDE.*
+  # Notifications
+  - --talk-name=org.freedesktop.Notifications.*
 
 build-options:
   env:
     MOUNT_FUSE_PATH: ../tmp/
 
 modules:
-  - python3-pyqt5.json  
-  - python3-setuptools_scm.json
-  - python3-appdirs.json
-  - python3-apscheduler.json
-  - python3-paramiko.json
-  - python3-peewee.json
-  - python3-psutil.json
-  - python3-python-dateutil.json
-  - python3-qdarkstyle.json
-  - python3-secretstorage.json
-  - python3-setuptools.json
-  - python3-setuptools_git.json
-  - python3-pytest-runner.json
-  - openssl.json
-  - python3-borgbackup.json
-  - python3-pytest.json
-  - libfuse.json
-  - python3-llfuse.json
+  - dependencies/pyqt5.json  
+  - dependencies/openssl.json
+  - dependencies/openssh.json
+  - dependencies/libfuse.json
+  - dependencies/python3-setuptools.json
+  - dependencies/python3-setuptools_git.json
+  - dependencies/python3-setuptools_scm.json
+  - dependencies/python3-borgbackup.json
+  - dependencies/python3-pytest.json
+  - dependencies/python3-llfuse.json
+  - dependencies/python3-appdirs.json
+  - dependencies/python3-apscheduler.json
+  - dependencies/python3-paramiko.json
+  - dependencies/python3-peewee.json
+  - dependencies/python3-psutil.json
+  - dependencies/python3-python-dateutil.json
+  - dependencies/python3-qdarkstyle.json
+  - dependencies/python3-secretstorage.json
+  - dependencies/python3-pytest-runner.json
+
 
 
   - name: vorta

flatpak/dependencies/openssh.json

@@ -0,0 +1,11 @@
+{
+    "name": "openssh",
+    "config-opts": ["--without-pie"],
+    "sources": [
+        {
+            "type": "archive",
+            "url": "https://cloudflare.cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-7.9p1.tar.gz",
+            "sha256": "6b4b3ba2253d84ed3771c8050728d597c91cfce898713beb7b64a305b6f11aad"
+        }
+    ]
+}

flatpak/dependencies/python3-apscheduler.json

@@ -25,11 +25,6 @@
             "url": "https://files.pythonhosted.org/packages/ed/69/c805067de1feedbb98c53174b0f2df44cc05e0e9ee73bb85eebc59e508c6/setuptools-41.0.0.zip",
             "sha256": "79d30254b6fe7a8e672e43cd85f13a9f3f2a50080bc81d851143e2219ef0dcb1"
         },
-        {
-            "type": "file",
-            "url": "https://files.pythonhosted.org/packages/54/85/514ba3ca2a022bddd68819f187ae826986051d130ec5b972076e4f58a9f3/setuptools_scm-3.2.0.tar.gz",
-            "sha256": "52ab47715fa0fc7d8e6cd15168d1a69ba995feb1505131c3e814eb7087b57358"
-        },
         {
             "type": "file",
             "url": "https://files.pythonhosted.org/packages/3d/e7/c63d49e5ac6feea330e837eaa6af1ce5c7ac9242288facc0aa71cb268a75/APScheduler-3.6.0.tar.gz",

flatpak/dependencies/python3-borgbackup.json

@@ -0,0 +1,14 @@
+{
+    "name": "python3-borgbackup",
+    "buildsystem": "simple",
+    "build-commands": [
+        "pip3 install --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} borgbackup"
+    ],
+    "sources": [
+        {
+            "type": "file",
+            "url": "https://files.pythonhosted.org/packages/24/13/77cd0bed77fa80cf79e18d1fb1806641e895878bda389771ea63f30560de/borgbackup-1.1.10.tar.gz",
+            "sha256": "efb41416d24ff1d13c7952c7f4eaf41ef6fc5e1000354217db55cd62c905e7de"
+        }
+    ]
+}

flatpak/python3-borgbackup.json

@@ -1,19 +0,0 @@
-{
-    "name": "python3-borgbackup",
-    "buildsystem": "simple",
-    "build-commands": [
-        "pip3 install --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} borgbackup"
-    ],
-    "sources": [
-        {
-            "type": "file",
-            "url": "https://files.pythonhosted.org/packages/f8/26/1138625c9d0ad0e7673c1a313038922b879bef3e6f47242ee4862b25ee5c/borgbackup-1.1.9.tar.gz",
-            "sha256": "7d0ff84e64c4be35c43ae2c047bb521a94f15b278c2fe63b43950c4836b42575"
-        },
-        {
-            "type": "file",
-            "url": "https://files.pythonhosted.org/packages/8a/20/6eca772d1a5830336f84aca1d8198e5a3f4715cd1c7fc36d3cc7f7185091/msgpack-python-0.5.6.tar.gz",
-            "sha256": "378cc8a6d3545b532dfd149da715abae4fda2a3adb6d74e525d0d5e51f46909b"
-        }
-    ]
-}