From cca11a50ee012530c44d64eb0e6f923a9cf43d4e Mon Sep 17 00:00:00 2001
From: Fabio Lenherr / DashieTM <fabio.lenherr@gmail.com>
Date: Wed, 13 Dec 2023 01:44:56 +0100
Subject: [PATCH] chore: Revert to all system bus access tue to performance

---
 flatpak/cargo-sources.json        | 20 ++++++------
 flatpak/org.Xetibo.ReSet.json     |  7 ++---
 flatpak/org.Xetibo.ReSet.json.wip | 52 +++++++++++++++++++++++++++++++
 3 files changed, 65 insertions(+), 14 deletions(-)
 create mode 100644 flatpak/org.Xetibo.ReSet.json.wip

diff --git a/flatpak/cargo-sources.json b/flatpak/cargo-sources.json
index eab3b17..3d0e395 100644
--- a/flatpak/cargo-sources.json
+++ b/flatpak/cargo-sources.json
@@ -1029,14 +1029,14 @@
     {
         "type": "archive",
         "archive-type": "tar-gzip",
-        "url": "https://static.crates.io/crates/re_set-lib/re_set-lib-0.7.9.crate",
-        "sha256": "6b3393da22503efafbc751b28385c85a9cc1bfa06370c1f6e5796a127946a651",
-        "dest": "cargo/vendor/re_set-lib-0.7.9"
+        "url": "https://static.crates.io/crates/re_set-lib/re_set-lib-0.8.2.crate",
+        "sha256": "37a810fe8a6e0f9b47c02bedeceea1d7994ae99c3af0b13990378ac81ca139cb",
+        "dest": "cargo/vendor/re_set-lib-0.8.2"
     },
     {
         "type": "inline",
-        "contents": "{\"package\": \"6b3393da22503efafbc751b28385c85a9cc1bfa06370c1f6e5796a127946a651\", \"files\": {}}",
-        "dest": "cargo/vendor/re_set-lib-0.7.9",
+        "contents": "{\"package\": \"37a810fe8a6e0f9b47c02bedeceea1d7994ae99c3af0b13990378ac81ca139cb\", \"files\": {}}",
+        "dest": "cargo/vendor/re_set-lib-0.8.2",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -1068,14 +1068,14 @@
     {
         "type": "archive",
         "archive-type": "tar-gzip",
-        "url": "https://static.crates.io/crates/reset_daemon/reset_daemon-0.5.2.crate",
-        "sha256": "ad5b58e2d2617a325b3c4188fb504b520d680089534acd3ea15dcd382cd3e739",
-        "dest": "cargo/vendor/reset_daemon-0.5.2"
+        "url": "https://static.crates.io/crates/reset_daemon/reset_daemon-0.5.6.crate",
+        "sha256": "240504ebc73a3d749480f765c1e9070a0add5a57ba6c1a0be1e97d52132da268",
+        "dest": "cargo/vendor/reset_daemon-0.5.6"
     },
     {
         "type": "inline",
-        "contents": "{\"package\": \"ad5b58e2d2617a325b3c4188fb504b520d680089534acd3ea15dcd382cd3e739\", \"files\": {}}",
-        "dest": "cargo/vendor/reset_daemon-0.5.2",
+        "contents": "{\"package\": \"240504ebc73a3d749480f765c1e9070a0add5a57ba6c1a0be1e97d52132da268\", \"files\": {}}",
+        "dest": "cargo/vendor/reset_daemon-0.5.6",
         "dest-filename": ".cargo-checksum.json"
     },
     {
diff --git a/flatpak/org.Xetibo.ReSet.json b/flatpak/org.Xetibo.ReSet.json
index 75f7ee9..bc63cf5 100644
--- a/flatpak/org.Xetibo.ReSet.json
+++ b/flatpak/org.Xetibo.ReSet.json
@@ -8,9 +8,6 @@
   ],
   "command": "reset",
   "finish-args": [
-    "--talk-name=org.Xetibo.ReSetDaemon",
-    "--system-talk-name=org.freedesktop.NetworkManager",
-    "--system-talk-name=org.bluez",
     "--socket=pulseaudio",
     "--share=network",
     "--share=ipc",
@@ -18,7 +15,9 @@
     "--socket=wayland",
     "--device=dri",
     "--device=all",
-    "--allow=bluetooth"
+    "--allow=bluetooth",
+    "--socket=system-bus",
+    "--socket=session-bus"
   ],
   "build-options": {
     "append-path": "/usr/lib/sdk/rust-stable/bin"
diff --git a/flatpak/org.Xetibo.ReSet.json.wip b/flatpak/org.Xetibo.ReSet.json.wip
new file mode 100644
index 0000000..b65efe0
--- /dev/null
+++ b/flatpak/org.Xetibo.ReSet.json.wip
@@ -0,0 +1,52 @@
+{
+  "app-id": "org.Xetibo.ReSet",
+  "runtime": "org.gnome.Platform",
+  "runtime-version": "45",
+  "sdk": "org.gnome.Sdk",
+  "sdk-extensions": [
+    "org.freedesktop.Sdk.Extension.rust-stable"
+  ],
+  "command": "reset",
+  "finish-args": [
+    "--talk-name=org.Xetibo.ReSetDaemon",
+    "--system-talk-name=org.freedesktop.NetworkManager",
+    "--system-talk-name=org.freedesktop.DBus",
+    "--system-talk-name=org.bluez",
+    "--socket=pulseaudio",
+    "--share=network",
+    "--share=ipc",
+    "--socket=fallback-x11",
+    "--socket=wayland",
+    "--device=dri",
+    "--device=all",
+    "--allow=bluetooth"
+  ],
+  "build-options": {
+    "append-path": "/usr/lib/sdk/rust-stable/bin"
+  },
+  "modules": [
+    {
+      "name": "reset",
+      "buildsystem": "simple",
+      "build-options": {
+        "env": {
+          "CARGO_HOME": "/run/build/reset/cargo"
+        }
+      },
+      "build-commands": [
+        "cargo --offline fetch --manifest-path Cargo.toml --verbose",
+        "cargo --offline build --release --verbose",
+        "install -Dm755 ./target/release/reset -t /app/bin/",
+        "install -Dm644 ./src/resources/icons/ReSet.svg /app/share/icons/hicolor/scalable/apps/org.Xetibo.ReSet.svg",
+        "install -Dm644 ./flatpak/org.Xetibo.ReSet.desktop /app/share/applications/org.Xetibo.ReSet.desktop"
+      ],
+      "sources": [
+        {
+          "type": "dir",
+          "path": ".."
+        },
+        "cargo-sources.json"
+      ]
+    }
+  ]
+}