From 58fc09fd1de3db6d50f259aa99d35a385f2274df Mon Sep 17 00:00:00 2001 From: Fabio Lenherr / DashieTM Date: Wed, 15 Nov 2023 15:22:13 +0100 Subject: [PATCH] chore: Include instructions for flatpak build --- flatpak/README.md | 12 ++++++++++++ flatpak/build.sh | 5 +++++ flatpak/cargo-sources.json | 20 ++++++++++---------- flatpak/org.xetibo.ReSet.json | 1 + 4 files changed, 28 insertions(+), 10 deletions(-) create mode 100644 flatpak/README.md create mode 100755 flatpak/build.sh diff --git a/flatpak/README.md b/flatpak/README.md new file mode 100644 index 0000000..75d76f6 --- /dev/null +++ b/flatpak/README.md @@ -0,0 +1,12 @@ +### instructions for building: + +- `python3 flatpak-generator.py ../Cargo.lock -o cargo-sources.json` +- `flatpak-builder build org.xetibo.ReSet.json --force-clean` +- `flatpak build-export export build` +- `flatpak build-bundle export reset.flatpak org.xetibo.ReSet` +- you can also use the build.sh script provided +- note: if you are using a point release distribution(ubuntu, debian stable etc. please use the flatpak version of these commands -> flatpak run org.flatpak.Builder build...) + +### instructions for installation: + +`flatpak install --user reset.flatpak` diff --git a/flatpak/build.sh b/flatpak/build.sh new file mode 100755 index 0000000..45426b3 --- /dev/null +++ b/flatpak/build.sh @@ -0,0 +1,5 @@ +#! /bin/bash +python3 flatpak-generator.py ../Cargo.lock -o cargo-sources.json +flatpak-builder build org.xetibo.ReSet.json --force-clean +flatpak build-export export build +flatpak build-bundle export reset.flatpak org.xetibo.ReSet diff --git a/flatpak/cargo-sources.json b/flatpak/cargo-sources.json index b3ce78b..ef16d58 100644 --- a/flatpak/cargo-sources.json +++ b/flatpak/cargo-sources.json @@ -2,14 +2,14 @@ { "type": "archive", "archive-type": "tar-gzip", - "url": "https://static.crates.io/crates/ReSet-Lib/ReSet-Lib-0.2.3.crate", - "sha256": "3e3ef13734e2a2324ffed82ac9b24acab15306c2de644ac649d1ae3a16be0960", - "dest": "cargo/vendor/ReSet-Lib-0.2.3" + "url": "https://static.crates.io/crates/ReSet-Lib/ReSet-Lib-0.2.8.crate", + "sha256": "6761097b3d41653f8ad3b265625c840b6c415282ba20a0491fe6a7a7e817873a", + "dest": "cargo/vendor/ReSet-Lib-0.2.8" }, { "type": "inline", - "contents": "{\"package\": \"3e3ef13734e2a2324ffed82ac9b24acab15306c2de644ac649d1ae3a16be0960\", \"files\": {}}", - "dest": "cargo/vendor/ReSet-Lib-0.2.3", + "contents": "{\"package\": \"6761097b3d41653f8ad3b265625c840b6c415282ba20a0491fe6a7a7e817873a\", \"files\": {}}", + "dest": "cargo/vendor/ReSet-Lib-0.2.8", "dest-filename": ".cargo-checksum.json" }, { @@ -1042,14 +1042,14 @@ { "type": "archive", "archive-type": "tar-gzip", - "url": "https://static.crates.io/crates/reset_daemon/reset_daemon-0.1.0.crate", - "sha256": "6c6c0fa05313f248b7283c371f1aa7eced0421a6dbeaf4aef0db3f291a75bec1", - "dest": "cargo/vendor/reset_daemon-0.1.0" + "url": "https://static.crates.io/crates/reset_daemon/reset_daemon-0.1.3.crate", + "sha256": "1d7b1c575b773eadd0fc8991de8abb883cfb7bce9c5e8c4f9e10b85cb142efee", + "dest": "cargo/vendor/reset_daemon-0.1.3" }, { "type": "inline", - "contents": "{\"package\": \"6c6c0fa05313f248b7283c371f1aa7eced0421a6dbeaf4aef0db3f291a75bec1\", \"files\": {}}", - "dest": "cargo/vendor/reset_daemon-0.1.0", + "contents": "{\"package\": \"1d7b1c575b773eadd0fc8991de8abb883cfb7bce9c5e8c4f9e10b85cb142efee\", \"files\": {}}", + "dest": "cargo/vendor/reset_daemon-0.1.3", "dest-filename": ".cargo-checksum.json" }, { diff --git a/flatpak/org.xetibo.ReSet.json b/flatpak/org.xetibo.ReSet.json index 1c4ace1..34a7a20 100644 --- a/flatpak/org.xetibo.ReSet.json +++ b/flatpak/org.xetibo.ReSet.json @@ -7,6 +7,7 @@ "command": "reset", "finish-args": [ "--socket=session-bus", + "--socket=pulseaudio", "--share=ipc", "--socket=fallback-x11", "--socket=wayland",