From 9125142181c8f9f484d6752b5a3a88e52e427c4c Mon Sep 17 00:00:00 2001
From: takotori <tranfelix99@gmail.com>
Date: Sun, 2 Jun 2024 20:40:23 +0200
Subject: [PATCH] bump reset lib version
---
Cargo.lock | 69 ++++--------------------
Cargo.toml | 2 +-
flatpak/cargo-sources.json | 98 ++++++++--------------------------
flatpak/generated-sources.json | 98 ++++++++--------------------------
flatpak/org.Xetibo.ReSet.json | 2 +-
5 files changed, 59 insertions(+), 210 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index f98e912..e1fc4b8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -185,27 +185,6 @@ dependencies = [
"tokio",
]
-[[package]]
-name = "directories-next"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "339ee130d97a610ea5a5872d2bbb130fdf68884ff09d3028b81bec8a1ac23bbc"
-dependencies = [
- "cfg-if",
- "dirs-sys-next",
-]
-
-[[package]]
-name = "dirs-sys-next"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
-dependencies = [
- "libc",
- "redox_users",
- "winapi",
-]
-
[[package]]
name = "equivalent"
version = "1.0.1"
@@ -377,17 +356,6 @@ dependencies = [
"system-deps",
]
-[[package]]
-name = "getrandom"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi",
-]
-
[[package]]
name = "gimli"
version = "0.29.0"
@@ -717,16 +685,6 @@ dependencies = [
"winapi",
]
-[[package]]
-name = "libredox"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
-dependencies = [
- "bitflags 2.5.0",
- "libc",
-]
-
[[package]]
name = "lock_api"
version = "0.4.12"
@@ -899,9 +857,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.84"
+version = "1.0.85"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6"
+checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23"
dependencies = [
"unicode-ident",
]
@@ -917,19 +875,19 @@ dependencies = [
[[package]]
name = "re_set-lib"
-version = "5.0.0"
+version = "5.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f69411e6d401334298177698a3487d3c1f13dcb9a7b0cd18ad6e742a588a829e"
+checksum = "01fb110dc5087cdb0d8df799c3855c13e4ecb41f987e9691bf3d101c2dad1b3a"
dependencies = [
"dbus",
"dbus-crossroads",
- "directories-next",
"gtk4",
"libloading",
"libpulse-binding",
"once_cell",
"serial_test",
"toml",
+ "xdg",
]
[[package]]
@@ -941,17 +899,6 @@ dependencies = [
"bitflags 2.5.0",
]
-[[package]]
-name = "redox_users"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
-dependencies = [
- "getrandom",
- "libredox",
- "thiserror",
-]
-
[[package]]
name = "reset"
version = "1.2.1"
@@ -1437,3 +1384,9 @@ checksum = "86c949fede1d13936a99f14fafd3e76fd642b556dd2ce96287fbe2e0151bfac6"
dependencies = [
"memchr",
]
+
+[[package]]
+name = "xdg"
+version = "2.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546"
diff --git a/Cargo.toml b/Cargo.toml
index 240f256..35402c8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,7 +8,7 @@ license = "GPL-3.0-or-later"
[dependencies]
reset_daemon = "1.5.0"
-re_set-lib = "5.0.0"
+re_set-lib = "5.2.1"
#re_set-lib = { git = "https://github.com/Xetibo/ReSet-Lib" }
adw = { version = "0.6.0", package = "libadwaita", features = ["v1_4"] }
dbus = "0.9.7"
diff --git a/flatpak/cargo-sources.json b/flatpak/cargo-sources.json
index 5d128a7..ab77bc2 100644
--- a/flatpak/cargo-sources.json
+++ b/flatpak/cargo-sources.json
@@ -259,32 +259,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",
@@ -493,19 +467,6 @@
"dest": "cargo/vendor/gdk4-sys-0.8.2",
"dest-filename": ".cargo-checksum.json"
},
- {
- "type": "archive",
- "archive-type": "tar-gzip",
- "url": "https://static.crates.io/crates/getrandom/getrandom-0.2.15.crate",
- "sha256": "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7",
- "dest": "cargo/vendor/getrandom-0.2.15"
- },
- {
- "type": "inline",
- "contents": "{\"package\": \"c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7\", \"files\": {}}",
- "dest": "cargo/vendor/getrandom-0.2.15",
- "dest-filename": ".cargo-checksum.json"
- },
{
"type": "archive",
"archive-type": "tar-gzip",
@@ -857,19 +818,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",
@@ -1120,14 +1068,14 @@
{
"type": "archive",
"archive-type": "tar-gzip",
- "url": "https://static.crates.io/crates/proc-macro2/proc-macro2-1.0.84.crate",
- "sha256": "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6",
- "dest": "cargo/vendor/proc-macro2-1.0.84"
+ "url": "https://static.crates.io/crates/proc-macro2/proc-macro2-1.0.85.crate",
+ "sha256": "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23",
+ "dest": "cargo/vendor/proc-macro2-1.0.85"
},
{
"type": "inline",
- "contents": "{\"package\": \"ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6\", \"files\": {}}",
- "dest": "cargo/vendor/proc-macro2-1.0.84",
+ "contents": "{\"package\": \"22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23\", \"files\": {}}",
+ "dest": "cargo/vendor/proc-macro2-1.0.85",
"dest-filename": ".cargo-checksum.json"
},
{
@@ -1146,14 +1094,14 @@
{
"type": "archive",
"archive-type": "tar-gzip",
- "url": "https://static.crates.io/crates/re_set-lib/re_set-lib-5.0.0.crate",
- "sha256": "f69411e6d401334298177698a3487d3c1f13dcb9a7b0cd18ad6e742a588a829e",
- "dest": "cargo/vendor/re_set-lib-5.0.0"
+ "url": "https://static.crates.io/crates/re_set-lib/re_set-lib-5.2.1.crate",
+ "sha256": "01fb110dc5087cdb0d8df799c3855c13e4ecb41f987e9691bf3d101c2dad1b3a",
+ "dest": "cargo/vendor/re_set-lib-5.2.1"
},
{
"type": "inline",
- "contents": "{\"package\": \"f69411e6d401334298177698a3487d3c1f13dcb9a7b0cd18ad6e742a588a829e\", \"files\": {}}",
- "dest": "cargo/vendor/re_set-lib-5.0.0",
+ "contents": "{\"package\": \"01fb110dc5087cdb0d8df799c3855c13e4ecb41f987e9691bf3d101c2dad1b3a\", \"files\": {}}",
+ "dest": "cargo/vendor/re_set-lib-5.2.1",
"dest-filename": ".cargo-checksum.json"
},
{
@@ -1169,19 +1117,6 @@
"dest": "cargo/vendor/redox_syscall-0.5.1",
"dest-filename": ".cargo-checksum.json"
},
- {
- "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",
@@ -1884,6 +1819,19 @@
"dest": "cargo/vendor/winnow-0.6.9",
"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
index 5d128a7..ab77bc2 100644
--- a/flatpak/generated-sources.json
+++ b/flatpak/generated-sources.json
@@ -259,32 +259,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",
@@ -493,19 +467,6 @@
"dest": "cargo/vendor/gdk4-sys-0.8.2",
"dest-filename": ".cargo-checksum.json"
},
- {
- "type": "archive",
- "archive-type": "tar-gzip",
- "url": "https://static.crates.io/crates/getrandom/getrandom-0.2.15.crate",
- "sha256": "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7",
- "dest": "cargo/vendor/getrandom-0.2.15"
- },
- {
- "type": "inline",
- "contents": "{\"package\": \"c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7\", \"files\": {}}",
- "dest": "cargo/vendor/getrandom-0.2.15",
- "dest-filename": ".cargo-checksum.json"
- },
{
"type": "archive",
"archive-type": "tar-gzip",
@@ -857,19 +818,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",
@@ -1120,14 +1068,14 @@
{
"type": "archive",
"archive-type": "tar-gzip",
- "url": "https://static.crates.io/crates/proc-macro2/proc-macro2-1.0.84.crate",
- "sha256": "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6",
- "dest": "cargo/vendor/proc-macro2-1.0.84"
+ "url": "https://static.crates.io/crates/proc-macro2/proc-macro2-1.0.85.crate",
+ "sha256": "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23",
+ "dest": "cargo/vendor/proc-macro2-1.0.85"
},
{
"type": "inline",
- "contents": "{\"package\": \"ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6\", \"files\": {}}",
- "dest": "cargo/vendor/proc-macro2-1.0.84",
+ "contents": "{\"package\": \"22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23\", \"files\": {}}",
+ "dest": "cargo/vendor/proc-macro2-1.0.85",
"dest-filename": ".cargo-checksum.json"
},
{
@@ -1146,14 +1094,14 @@
{
"type": "archive",
"archive-type": "tar-gzip",
- "url": "https://static.crates.io/crates/re_set-lib/re_set-lib-5.0.0.crate",
- "sha256": "f69411e6d401334298177698a3487d3c1f13dcb9a7b0cd18ad6e742a588a829e",
- "dest": "cargo/vendor/re_set-lib-5.0.0"
+ "url": "https://static.crates.io/crates/re_set-lib/re_set-lib-5.2.1.crate",
+ "sha256": "01fb110dc5087cdb0d8df799c3855c13e4ecb41f987e9691bf3d101c2dad1b3a",
+ "dest": "cargo/vendor/re_set-lib-5.2.1"
},
{
"type": "inline",
- "contents": "{\"package\": \"f69411e6d401334298177698a3487d3c1f13dcb9a7b0cd18ad6e742a588a829e\", \"files\": {}}",
- "dest": "cargo/vendor/re_set-lib-5.0.0",
+ "contents": "{\"package\": \"01fb110dc5087cdb0d8df799c3855c13e4ecb41f987e9691bf3d101c2dad1b3a\", \"files\": {}}",
+ "dest": "cargo/vendor/re_set-lib-5.2.1",
"dest-filename": ".cargo-checksum.json"
},
{
@@ -1169,19 +1117,6 @@
"dest": "cargo/vendor/redox_syscall-0.5.1",
"dest-filename": ".cargo-checksum.json"
},
- {
- "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",
@@ -1884,6 +1819,19 @@
"dest": "cargo/vendor/winnow-0.6.9",
"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.json b/flatpak/org.Xetibo.ReSet.json
index a0d08ba..75a5533 100644
--- a/flatpak/org.Xetibo.ReSet.json
+++ b/flatpak/org.Xetibo.ReSet.json
@@ -1,7 +1,7 @@
{
"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"