Update flatpak manifest and dependencies (#324)

This commit is contained in:
Hofer-Julian 2019-07-11 13:50:32 +02:00 committed by GitHub
parent 064e1b2ad7
commit f765361ac1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 27 deletions

View File

@ -16,9 +16,7 @@ finish-args:
# Sync # Sync
- --share=network - --share=network
# Filesystem access # Filesystem access
- --filesystem=home - --filesystem=host
- --filesystem=/run/media
- --filesystem=/media
# dconf access # dconf access
- --filesystem=xdg-run/dconf - --filesystem=xdg-run/dconf
- --filesystem=~/.config/dconf:ro - --filesystem=~/.config/dconf:ro
@ -37,15 +35,14 @@ finish-args:
- --socket=ssh-auth - --socket=ssh-auth
- --own-name=org.KDE.* - --own-name=org.KDE.*
# Notifications # Notifications
- --talk-name=org.freedesktop.Notifications.* - --talk-name=org.freedesktop.Notifications
build-options: build-options:
env: env:
MOUNT_FUSE_PATH: ../tmp/ MOUNT_FUSE_PATH: ../tmp/
modules: modules:
- dependencies/pyqt5.json - dependencies/pyqt5.json
- dependencies/openssl.json
- dependencies/openssh.json - dependencies/openssh.json
- dependencies/libfuse.json - dependencies/libfuse.json
- dependencies/python3-setuptools.json - dependencies/python3-setuptools.json
@ -64,11 +61,10 @@ modules:
- dependencies/python3-secretstorage.json - dependencies/python3-secretstorage.json
- dependencies/python3-pytest-runner.json - dependencies/python3-pytest-runner.json
- name: vorta - name: vorta
buildsystem: simple buildsystem: simple
build-commands: build-commands:
- make translations-to-qm
- pip3 install --prefix=/app --no-deps . - pip3 install --prefix=/app --no-deps .
- mkdir -p /app/share/metainfo/ - mkdir -p /app/share/metainfo/
- cp src/vorta/assets/metadata/com.borgbase.Vorta.appdata.xml /app/share/metainfo/ - cp src/vorta/assets/metadata/com.borgbase.Vorta.appdata.xml /app/share/metainfo/

View File

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

View File

@ -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"
}
]
}