diff --git a/flatpak/com.borgbase.Vorta.yaml b/flatpak/com.borgbase.Vorta.yaml index ad3362a0..3e5a27f1 100644 --- a/flatpak/com.borgbase.Vorta.yaml +++ b/flatpak/com.borgbase.Vorta.yaml @@ -16,9 +16,7 @@ finish-args: # Sync - --share=network # Filesystem access - - --filesystem=home - - --filesystem=/run/media - - --filesystem=/media + - --filesystem=host # dconf access - --filesystem=xdg-run/dconf - --filesystem=~/.config/dconf:ro @@ -37,15 +35,14 @@ finish-args: - --socket=ssh-auth - --own-name=org.KDE.* # Notifications - - --talk-name=org.freedesktop.Notifications.* + - --talk-name=org.freedesktop.Notifications build-options: env: MOUNT_FUSE_PATH: ../tmp/ modules: - - dependencies/pyqt5.json - - dependencies/openssl.json + - dependencies/pyqt5.json - dependencies/openssh.json - dependencies/libfuse.json - dependencies/python3-setuptools.json @@ -64,11 +61,10 @@ modules: - dependencies/python3-secretstorage.json - dependencies/python3-pytest-runner.json - - - name: vorta buildsystem: simple build-commands: + - make translations-to-qm - pip3 install --prefix=/app --no-deps . - mkdir -p /app/share/metainfo/ - cp src/vorta/assets/metadata/com.borgbase.Vorta.appdata.xml /app/share/metainfo/ diff --git a/flatpak/dependencies/openssh.json b/flatpak/dependencies/openssh.json index d2c38217..c93b22a9 100644 --- a/flatpak/dependencies/openssh.json +++ b/flatpak/dependencies/openssh.json @@ -1,11 +1,10 @@ { "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" + "url": "https://cloudflare.cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-8.0p1.tar.gz", + "sha256": "bd943879e69498e8031eb6b7f44d08cdc37d59a7ab689aa0b437320c3481fd68" } ] } diff --git a/flatpak/dependencies/openssl.json b/flatpak/dependencies/openssl.json deleted file mode 100644 index 7023fe88..00000000 --- a/flatpak/dependencies/openssl.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "openssl", - "buildsystem": "simple", - "build-commands": [ - "./config --prefix=/app --openssldir=/app/ssl shared zlib", - "make -j $FLATPAK_BUILDER_N_JOBS", - "make install" - ], - "sources": [ - { - "type": "archive", - "url": "https://www.openssl.org/source/openssl-1.1.1b.tar.gz", - "sha256": "5c557b023230413dfb0756f3137a13e6d726838ccd1430888ad15bfb2b43ea4b" - } - ] -}