CI/CD: update dependencies on distros

Xetibo · Jun 11, 2024 · 2b0898b · 2b0898b
1 parent 69d1312
commit 2b0898b
Show file tree

Hide file tree

Showing 7 changed files with 63 additions and 211 deletions.
diff --git a/PKGBUILD b/PKGBUILD
@@ -6,7 +6,10 @@ pkgrel=0
 arch=('x86_64')
 pkgdir="/usr/bin/${pkgname}"
 pkgdesc="A wip universal Linux settings application."
-depends=('rust' 'gtk4' 'dbus')
+depends=('gtk4' 'dbus' 'libadwaita')
+optdepends=('pipewire-pulse' 'networkmanager' 'bluez')
+makedepends=('rust')
+
 
 build() {
 	cargo build --release

diff --git a/debian/DEBIAN/control b/debian/DEBIAN/control
@@ -3,3 +3,7 @@ Version: 1.2.6
 Maintainer: DashieTM
 Architecture: all
 Description: A wip universal Linux settings application.
+Homepage: https://github.com/Xetibo/ReSet
+Build-Depends: rust
+Depends: libadwaita, gtk, dbus
+Recommends: pipewire-pulse, networkmanager, bluez
diff --git a/flatpak/cargo-sources.json b/flatpak/cargo-sources.json
@@ -285,32 +285,6 @@
         "dest": "cargo/vendor/dbus-tokio-0.7.6",
         "dest-filename": ".cargo-checksum.json"
     },
-    {
-        "type": "archive",
-        "archive-type": "tar-gzip",
-        "url": "https://static.crates.io/crates/directories-next/directories-next-2.0.0.crate",
-        "sha256": "339ee130d97a610ea5a5872d2bbb130fdf68884ff09d3028b81bec8a1ac23bbc",
-        "dest": "cargo/vendor/directories-next-2.0.0"
-    },
-    {
-        "type": "inline",
-        "contents": "{\"package\": \"339ee130d97a610ea5a5872d2bbb130fdf68884ff09d3028b81bec8a1ac23bbc\", \"files\": {}}",
-        "dest": "cargo/vendor/directories-next-2.0.0",
-        "dest-filename": ".cargo-checksum.json"
-    },
-    {
-        "type": "archive",
-        "archive-type": "tar-gzip",
-        "url": "https://static.crates.io/crates/dirs-sys-next/dirs-sys-next-0.1.2.crate",
-        "sha256": "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d",
-        "dest": "cargo/vendor/dirs-sys-next-0.1.2"
-    },
-    {
-        "type": "inline",
-        "contents": "{\"package\": \"4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d\", \"files\": {}}",
-        "dest": "cargo/vendor/dirs-sys-next-0.1.2",
-        "dest-filename": ".cargo-checksum.json"
-    },
     {
         "type": "archive",
         "archive-type": "tar-gzip",
@@ -519,19 +493,6 @@
         "dest": "cargo/vendor/gdk4-sys-0.8.1",
         "dest-filename": ".cargo-checksum.json"
     },
-    {
-        "type": "archive",
-        "archive-type": "tar-gzip",
-        "url": "https://static.crates.io/crates/getrandom/getrandom-0.2.14.crate",
-        "sha256": "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c",
-        "dest": "cargo/vendor/getrandom-0.2.14"
-    },
-    {
-        "type": "inline",
-        "contents": "{\"package\": \"94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c\", \"files\": {}}",
-        "dest": "cargo/vendor/getrandom-0.2.14",
-        "dest-filename": ".cargo-checksum.json"
-    },
     {
         "type": "archive",
         "archive-type": "tar-gzip",
@@ -896,19 +857,6 @@
         "dest": "cargo/vendor/libpulse-sys-1.21.0",
         "dest-filename": ".cargo-checksum.json"
     },
-    {
-        "type": "archive",
-        "archive-type": "tar-gzip",
-        "url": "https://static.crates.io/crates/libredox/libredox-0.1.3.crate",
-        "sha256": "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d",
-        "dest": "cargo/vendor/libredox-0.1.3"
-    },
-    {
-        "type": "inline",
-        "contents": "{\"package\": \"c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d\", \"files\": {}}",
-        "dest": "cargo/vendor/libredox-0.1.3",
-        "dest-filename": ".cargo-checksum.json"
-    },
     {
         "type": "archive",
         "archive-type": "tar-gzip",
@@ -1211,14 +1159,14 @@
     {
         "type": "archive",
         "archive-type": "tar-gzip",
-        "url": "https://static.crates.io/crates/re_set-lib/re_set-lib-4.0.1.crate",
-        "sha256": "06cb3803fff21953f1c17a685ae01e92b6b4d3231b99726d389520c48fbc1310",
-        "dest": "cargo/vendor/re_set-lib-4.0.1"
+        "url": "https://static.crates.io/crates/re_set-lib/re_set-lib-5.2.4.crate",
+        "sha256": "f1f1aa52c35d115b4efc5de2d41d0288f20705dd7f3ca6a49a68f2bab9c31a8e",
+        "dest": "cargo/vendor/re_set-lib-5.2.4"
     },
     {
         "type": "inline",
-        "contents": "{\"package\": \"06cb3803fff21953f1c17a685ae01e92b6b4d3231b99726d389520c48fbc1310\", \"files\": {}}",
-        "dest": "cargo/vendor/re_set-lib-4.0.1",
+        "contents": "{\"package\": \"f1f1aa52c35d115b4efc5de2d41d0288f20705dd7f3ca6a49a68f2bab9c31a8e\", \"files\": {}}",
+        "dest": "cargo/vendor/re_set-lib-5.2.4",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -1237,27 +1185,14 @@
     {
         "type": "archive",
         "archive-type": "tar-gzip",
-        "url": "https://static.crates.io/crates/redox_users/redox_users-0.4.5.crate",
-        "sha256": "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891",
-        "dest": "cargo/vendor/redox_users-0.4.5"
-    },
-    {
-        "type": "inline",
-        "contents": "{\"package\": \"bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891\", \"files\": {}}",
-        "dest": "cargo/vendor/redox_users-0.4.5",
-        "dest-filename": ".cargo-checksum.json"
-    },
-    {
-        "type": "archive",
-        "archive-type": "tar-gzip",
-        "url": "https://static.crates.io/crates/reset_daemon/reset_daemon-1.4.0.crate",
-        "sha256": "4c9858fdb8b54d8d81a2e0c16f5f2f16837c627da54ea9f3e7a27a888c0ef1fa",
-        "dest": "cargo/vendor/reset_daemon-1.4.0"
+        "url": "https://static.crates.io/crates/reset_daemon/reset_daemon-2.1.3.crate",
+        "sha256": "aa3666f8d12729c489f0d5d60fa8f03299da80859d72507c9e4ae6d56e61fe79",
+        "dest": "cargo/vendor/reset_daemon-2.1.3"
     },
     {
         "type": "inline",
-        "contents": "{\"package\": \"4c9858fdb8b54d8d81a2e0c16f5f2f16837c627da54ea9f3e7a27a888c0ef1fa\", \"files\": {}}",
-        "dest": "cargo/vendor/reset_daemon-1.4.0",
+        "contents": "{\"package\": \"aa3666f8d12729c489f0d5d60fa8f03299da80859d72507c9e4ae6d56e61fe79\", \"files\": {}}",
+        "dest": "cargo/vendor/reset_daemon-2.1.3",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -1936,6 +1871,19 @@
         "dest": "cargo/vendor/winnow-0.6.6",
         "dest-filename": ".cargo-checksum.json"
     },
+    {
+        "type": "archive",
+        "archive-type": "tar-gzip",
+        "url": "https://static.crates.io/crates/xdg/xdg-2.5.2.crate",
+        "sha256": "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546",
+        "dest": "cargo/vendor/xdg-2.5.2"
+    },
+    {
+        "type": "inline",
+        "contents": "{\"package\": \"213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546\", \"files\": {}}",
+        "dest": "cargo/vendor/xdg-2.5.2",
+        "dest-filename": ".cargo-checksum.json"
+    },
     {
         "type": "inline",
         "contents": "[source.vendored-sources]\ndirectory = \"cargo/vendor\"\n\n[source.crates-io]\nreplace-with = \"vendored-sources\"\n",

diff --git a/flatpak/generated-sources.json b/flatpak/generated-sources.json
@@ -285,32 +285,6 @@
         "dest": "cargo/vendor/dbus-tokio-0.7.6",
         "dest-filename": ".cargo-checksum.json"
     },
-    {
-        "type": "archive",
-        "archive-type": "tar-gzip",
-        "url": "https://static.crates.io/crates/directories-next/directories-next-2.0.0.crate",
-        "sha256": "339ee130d97a610ea5a5872d2bbb130fdf68884ff09d3028b81bec8a1ac23bbc",
-        "dest": "cargo/vendor/directories-next-2.0.0"
-    },
-    {
-        "type": "inline",
-        "contents": "{\"package\": \"339ee130d97a610ea5a5872d2bbb130fdf68884ff09d3028b81bec8a1ac23bbc\", \"files\": {}}",
-        "dest": "cargo/vendor/directories-next-2.0.0",
-        "dest-filename": ".cargo-checksum.json"
-    },
-    {
-        "type": "archive",
-        "archive-type": "tar-gzip",
-        "url": "https://static.crates.io/crates/dirs-sys-next/dirs-sys-next-0.1.2.crate",
-        "sha256": "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d",
-        "dest": "cargo/vendor/dirs-sys-next-0.1.2"
-    },
-    {
-        "type": "inline",
-        "contents": "{\"package\": \"4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d\", \"files\": {}}",
-        "dest": "cargo/vendor/dirs-sys-next-0.1.2",
-        "dest-filename": ".cargo-checksum.json"
-    },
     {
         "type": "archive",
         "archive-type": "tar-gzip",
@@ -519,19 +493,6 @@
         "dest": "cargo/vendor/gdk4-sys-0.8.1",
         "dest-filename": ".cargo-checksum.json"
     },
-    {
-        "type": "archive",
-        "archive-type": "tar-gzip",
-        "url": "https://static.crates.io/crates/getrandom/getrandom-0.2.14.crate",
-        "sha256": "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c",
-        "dest": "cargo/vendor/getrandom-0.2.14"
-    },
-    {
-        "type": "inline",
-        "contents": "{\"package\": \"94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c\", \"files\": {}}",
-        "dest": "cargo/vendor/getrandom-0.2.14",
-        "dest-filename": ".cargo-checksum.json"
-    },
     {
         "type": "archive",
         "archive-type": "tar-gzip",
@@ -896,19 +857,6 @@
         "dest": "cargo/vendor/libpulse-sys-1.21.0",
         "dest-filename": ".cargo-checksum.json"
     },
-    {
-        "type": "archive",
-        "archive-type": "tar-gzip",
-        "url": "https://static.crates.io/crates/libredox/libredox-0.1.3.crate",
-        "sha256": "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d",
-        "dest": "cargo/vendor/libredox-0.1.3"
-    },
-    {
-        "type": "inline",
-        "contents": "{\"package\": \"c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d\", \"files\": {}}",
-        "dest": "cargo/vendor/libredox-0.1.3",
-        "dest-filename": ".cargo-checksum.json"
-    },
     {
         "type": "archive",
         "archive-type": "tar-gzip",
@@ -1211,14 +1159,14 @@
     {
         "type": "archive",
         "archive-type": "tar-gzip",
-        "url": "https://static.crates.io/crates/re_set-lib/re_set-lib-4.0.1.crate",
-        "sha256": "06cb3803fff21953f1c17a685ae01e92b6b4d3231b99726d389520c48fbc1310",
-        "dest": "cargo/vendor/re_set-lib-4.0.1"
+        "url": "https://static.crates.io/crates/re_set-lib/re_set-lib-5.2.4.crate",
+        "sha256": "f1f1aa52c35d115b4efc5de2d41d0288f20705dd7f3ca6a49a68f2bab9c31a8e",
+        "dest": "cargo/vendor/re_set-lib-5.2.4"
     },
     {
         "type": "inline",
-        "contents": "{\"package\": \"06cb3803fff21953f1c17a685ae01e92b6b4d3231b99726d389520c48fbc1310\", \"files\": {}}",
-        "dest": "cargo/vendor/re_set-lib-4.0.1",
+        "contents": "{\"package\": \"f1f1aa52c35d115b4efc5de2d41d0288f20705dd7f3ca6a49a68f2bab9c31a8e\", \"files\": {}}",
+        "dest": "cargo/vendor/re_set-lib-5.2.4",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -1237,27 +1185,14 @@
     {
         "type": "archive",
         "archive-type": "tar-gzip",
-        "url": "https://static.crates.io/crates/redox_users/redox_users-0.4.5.crate",
-        "sha256": "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891",
-        "dest": "cargo/vendor/redox_users-0.4.5"
-    },
-    {
-        "type": "inline",
-        "contents": "{\"package\": \"bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891\", \"files\": {}}",
-        "dest": "cargo/vendor/redox_users-0.4.5",
-        "dest-filename": ".cargo-checksum.json"
-    },
-    {
-        "type": "archive",
-        "archive-type": "tar-gzip",
-        "url": "https://static.crates.io/crates/reset_daemon/reset_daemon-1.4.0.crate",
-        "sha256": "4c9858fdb8b54d8d81a2e0c16f5f2f16837c627da54ea9f3e7a27a888c0ef1fa",
-        "dest": "cargo/vendor/reset_daemon-1.4.0"
+        "url": "https://static.crates.io/crates/reset_daemon/reset_daemon-2.1.3.crate",
+        "sha256": "aa3666f8d12729c489f0d5d60fa8f03299da80859d72507c9e4ae6d56e61fe79",
+        "dest": "cargo/vendor/reset_daemon-2.1.3"
     },
     {
         "type": "inline",
-        "contents": "{\"package\": \"4c9858fdb8b54d8d81a2e0c16f5f2f16837c627da54ea9f3e7a27a888c0ef1fa\", \"files\": {}}",
-        "dest": "cargo/vendor/reset_daemon-1.4.0",
+        "contents": "{\"package\": \"aa3666f8d12729c489f0d5d60fa8f03299da80859d72507c9e4ae6d56e61fe79\", \"files\": {}}",
+        "dest": "cargo/vendor/reset_daemon-2.1.3",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -1936,6 +1871,19 @@
         "dest": "cargo/vendor/winnow-0.6.6",
         "dest-filename": ".cargo-checksum.json"
     },
+    {
+        "type": "archive",
+        "archive-type": "tar-gzip",
+        "url": "https://static.crates.io/crates/xdg/xdg-2.5.2.crate",
+        "sha256": "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546",
+        "dest": "cargo/vendor/xdg-2.5.2"
+    },
+    {
+        "type": "inline",
+        "contents": "{\"package\": \"213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546\", \"files\": {}}",
+        "dest": "cargo/vendor/xdg-2.5.2",
+        "dest-filename": ".cargo-checksum.json"
+    },
     {
         "type": "inline",
         "contents": "[source.vendored-sources]\ndirectory = \"cargo/vendor\"\n\n[source.crates-io]\nreplace-with = \"vendored-sources\"\n",

diff --git a/flatpak/org.Xetibo.ReSet-release.json → flatpak/org.Xetibo.ReSet-debug.json b/flatpak/org.Xetibo.ReSet-release.json → flatpak/org.Xetibo.ReSet-debug.json
@@ -1,12 +1,12 @@
 {
   "app-id": "org.Xetibo.ReSet",
   "runtime": "org.gnome.Platform",
-  "runtime-version": "45",
+  "runtime-version": "46",
   "sdk": "org.gnome.Sdk",
   "sdk-extensions": [
     "org.freedesktop.Sdk.Extension.rust-nightly"
   ],
-  "command": "reset",
+  "command": "ReSet",
   "finish-args": [
     "--socket=pulseaudio",
     "--share=network",
@@ -17,8 +17,7 @@
     "--device=all",
     "--allow=bluetooth",
     "--socket=system-bus",
-    "--socket=session-bus",
-    "--persist=~/.config/reset:create"
+    "--socket=session-bus"
   ],
   "build-options": {
     "append-path": "/usr/lib/sdk/rust-nightly/bin"
@@ -34,8 +33,8 @@
       },
       "build-commands": [
         "cargo --offline fetch --manifest-path Cargo.toml --verbose",
-        "cargo --offline build --release --verbose",
-        "install -Dm755 ./target/release/reset -t /app/bin/",
+        "cargo --offline build --verbose",
+        "install -Dm755 ./target/debug/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"
       ],

diff --git a/flatpak/org.Xetibo.ReSet.json b/flatpak/org.Xetibo.ReSet.json
@@ -1,12 +1,12 @@
 {
   "app-id": "org.Xetibo.ReSet",
   "runtime": "org.gnome.Platform",
-  "runtime-version": "45",
+  "runtime-version": "46",
   "sdk": "org.gnome.Sdk",
   "sdk-extensions": [
     "org.freedesktop.Sdk.Extension.rust-nightly"
   ],
-  "command": "ReSet",
+  "command": "reset",
   "finish-args": [
     "--socket=pulseaudio",
     "--share=network",
@@ -34,8 +34,8 @@
       },
       "build-commands": [
         "cargo --offline fetch --manifest-path Cargo.toml --verbose",
-        "cargo --offline build --verbose",
-        "install -Dm755 ./target/release/ReSet -t /app/bin/",
+        "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"
       ],