diff --git a/app.briar.gtk.json b/app.briar.gtk.json new file mode 100644 index 0000000000000000000000000000000000000000..7fb28e79c5e06a704a1b65d3cd4a690a72aecdf7 --- /dev/null +++ b/app.briar.gtk.json @@ -0,0 +1,117 @@ +{ + "app-id": "app.briar.gtk", + "runtime": "org.gnome.Platform", + "runtime-version": "3.32", + "sdk": "org.gnome.Sdk", + "sdk-extensions": [ + "org.freedesktop.Sdk.Extension.openjdk11" + ], + "command": "briar-gtk", + "finish-args": [ + "--share=network", + "--share=ipc", + "--socket=x11", + "--socket=wayland", + "--filesystem=xdg-run/dconf", + "--filesystem=~/.config/dconf:ro", + "--filesystem=~/.briar", + "--talk-name=ca.desrt.dconf", + "--env=DCONF_USER_CONFIG_DIR=.config/dconf", + "--env=PATH=/app/bin:/usr/bin:/app/jre/bin" + ], + "build-options": { + "cflags": "-O2 -g", + "cxxflags": "-O2 -g", + "env": { + "V": "1" + } + }, + "cleanup": [ + "/include", + "/lib/pkgconfig", + "/man", + "/share/doc", + "/share/gtk-doc", + "/share/man", + "/share/pkgconfig", + "*.la", + "*.a" + ], + "modules": [ + { + "name": "openjdk", + "buildsystem": "simple", + "build-commands": [ + "/usr/lib/sdk/openjdk11/install.sh" + ] + }, + { + "name": "python-dependencies", + "buildsystem": "simple", + "build-commands": [ + "pip3 install --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} requests2 websockets" + ], + "sources": [ + { + "type": "file", + "url": "https://files.pythonhosted.org/packages/18/b0/8146a4f8dd402f60744fa380bc73ca47303cccf8b9190fd16a827281eac2/certifi-2019.9.11-py2.py3-none-any.whl", + "sha256": "fd7c7c74727ddcf00e9acd26bba8da604ffec95bf1c2144e67aff7a8b50e6cef" + }, + { + "type": "file", + "url": "https://files.pythonhosted.org/packages/24/53/f397db567de0aa0e81b211d81c13c41a779f14893e42189cf5bdb97611b2/urllib3-1.21.1-py2.py3-none-any.whl", + "sha256": "8ed6d5c1ff9d6ba84677310060d6a3a78ca3072ce0684cb3c645023009c114b1" + }, + { + "type": "file", + "url": "https://files.pythonhosted.org/packages/bc/a9/01ffebfb562e4274b6487b4bb1ddec7ca55ec7510b22e4c51f14098443b8/chardet-3.0.4-py2.py3-none-any.whl", + "sha256": "fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691" + }, + { + "type": "file", + "url": "https://files.pythonhosted.org/packages/89/f0/7cd1a25af31a5d4971d2eac794b0bc31eb445b28cadd621d4ad04be5ae4c/requests2-2.16.0-py2.py3-none-any.whl", + "sha256": "141d4f8ad6c1b68932d54f71f303c2aef681556b519c490ec83da193761a9f91" + }, + { + "type": "file", + "url": "https://files.pythonhosted.org/packages/11/7d/9bbbd7bb35f34b0169542487d2a8859e44306bb2e6a4455d491800a5621f/idna-2.5-py2.py3-none-any.whl", + "sha256": "cc19709fd6d0cbfed39ea875d29ba6d4e22c0cebc510a76d6302a28385e8bb70" + }, + { + "type": "file", + "url": "https://files.pythonhosted.org/packages/79/78/17e97a159dc55308b1468a638c7267f19765281f6205ec9c15253c154022/websockets-8.0.2.tar.gz", + "sha256": "882a7266fa867a2ebb2c0baaa0f9159cabf131cf18c1b4270d79ad42f9208dc5" + } + ] + }, + { + "name": "briar-headless", + "buildsystem": "simple", + "build-commands": [ + "mkdir -p /app/briar", + "install -Dm644 briar-headless.jar /app/briar/briar-headless.jar" + ], + "sources": [ + { + "type": "file", + "url": "https://media.dorfbrunnen.eu/briar/jars/004/briar-headless.jar", + "sha256": "e9dd86756ef42267b7e51a2ae3534a4666748570aa9acdff1e77bc4cdf5742cc" + } + ] + }, + { + "name": "briar-gtk", + "buildsystem": "meson", + "config-opts": [ + "--libdir=lib" + ], + "builddir": true, + "sources": [ + { + "type": "git", + "url": "https://code.briarproject.org/nicoalt/briar-gtk.git" + } + ] + } + ] +} diff --git a/app.briar.gtk.yaml b/app.briar.gtk.yaml deleted file mode 100644 index 0c505759cf7956f54ecabbdcd2c61d0126c6bd7a..0000000000000000000000000000000000000000 --- a/app.briar.gtk.yaml +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright (c) 2019 Nico Alt -# SPDX-License-Identifier: AGPL-3.0-only -# License-Filename: LICENSE.md - -app-id: app.briar.gtk -runtime: org.gnome.Platform -runtime-version: '3.32' -sdk: org.gnome.Sdk -sdk-extensions: -- org.freedesktop.Sdk.Extension.openjdk11 -command: briar-gtk -finish-args: -- --share=network -- --share=ipc -- --socket=x11 -- --socket=wayland -- --filesystem=xdg-run/dconf -- --filesystem=~/.config/dconf:ro -- --filesystem=~/.briar -- --talk-name=ca.desrt.dconf -- --env=DCONF_USER_CONFIG_DIR=.config/dconf -- --env=PATH=/app/bin:/usr/bin:/app/jre/bin -build-options: - cflags: -O2 -g - cxxflags: -O2 -g - env: - V: 1 -cleanup: -- /include -- /lib/pkgconfig -- /man -- /share/doc -- /share/gtk-doc -- /share/man -- /share/pkgconfig -- "*.la" -- "*.a" -modules: -- name: openjdk - buildsystem: simple - build-commands: - - /usr/lib/sdk/openjdk11/install.sh -- name: python-dependencies - buildsystem: simple - build-commands: - - pip3 install --no-index --find-links="file://${PWD}" --prefix=${FLATPAK_DEST} - requests2 websockets - sources: - - type: file - url: https://files.pythonhosted.org/packages/06/b8/d1ea38513c22e8c906275d135818fee16ad8495985956a9b7e2bb21942a1/certifi-2019.3.9.tar.gz - sha256: b26104d6835d1f5e49452a26eb2ff87fe7090b89dfcaee5ea2212697e1e1d7ae - - type: file - url: https://files.pythonhosted.org/packages/96/d9/40e4e515d3e17ed0adbbde1078e8518f8c4e3628496b56eb8f026a02b9e4/urllib3-1.21.1.tar.gz - sha256: b14486978518ca0901a76ba973d7821047409d7f726f22156b24e83fd71382a5 - - type: file - url: https://files.pythonhosted.org/packages/d8/82/28a51052215014efc07feac7330ed758702fc0581347098a81699b5281cb/idna-2.5.tar.gz - sha256: 3cb5ce08046c4e3a560fc02f138d0ac63e00f8ce5901a56b32ec8b7994082aab - - type: file - url: https://files.pythonhosted.org/packages/fc/bb/a5768c230f9ddb03acc9ef3f0d4a3cf93462473795d18e9535498c8f929d/chardet-3.0.4.tar.gz - sha256: 84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae - - type: file - url: https://files.pythonhosted.org/packages/09/0f/9dacaa075f8e46d463248c28dbb9770445d2e04cca5c4aa23d431c9ba861/requests2-2.16.0.tar.gz - sha256: f7685b2d620a172053cced288dddf12d4b3441a382cc382821c0f36c02488516 - - type: file - url: https://files.pythonhosted.org/packages/ba/60/59844a5cef2428cb752bd4f446b72095b1edee404a58c27e87cd12a141e2/websockets-7.0.tar.gz - sha256: 08e3c3e0535befa4f0c4443824496c03ecc25062debbcf895874f8a0b4c97c9f -- name: briar-headless - buildsystem: simple - build-commands: - - mkdir -p /app/briar - - install -Dm644 briar-headless.jar /app/briar/briar-headless.jar - sources: - - type: file - url: https://media.dorfbrunnen.eu/briar/jars/003/briar-headless.jar - sha256: aa93cfd27b3e7e9b8e3c7e40666d6fa76fd83139a82cbef04cf334a93c369503 -- name: briar-gtk - buildsystem: meson - config-opts: - - --libdir=lib - builddir: true - sources: - - type: git - url: https://code.briarproject.org/NicoAlt/briar-gtk.git -