From 6a41b5f43f7e02cd7e776a9bbd8cf330ef79f48d Mon Sep 17 00:00:00 2001 From: Lionel DARNIS Date: Mon, 25 May 2026 17:37:39 +0200 Subject: [PATCH] chore: use local COSMIC support crates --- Cargo.lock | 79 ++++++++++++++++++++-------------------------- Cargo.toml | 3 -- plugins/Cargo.toml | 8 ++--- 3 files changed, 38 insertions(+), 52 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6584dd2..a551635 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -506,8 +506,7 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cosmic-client-toolkit" -version = "0.1.0" -source = "git+https://github.com/pop-os//cosmic-protocols#af1997b1827ad64aab46fa31c0b77fb20d7a537a" +version = "0.2.0" dependencies = [ "bitflags", "cosmic-protocols", @@ -519,8 +518,7 @@ dependencies = [ [[package]] name = "cosmic-protocols" -version = "0.1.0" -source = "git+https://github.com/pop-os//cosmic-protocols#af1997b1827ad64aab46fa31c0b77fb20d7a537a" +version = "0.2.0" dependencies = [ "bitflags", "wayland-backend", @@ -1500,19 +1498,6 @@ dependencies = [ "unicase", ] -[[package]] -name = "nix" -version = "0.30.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6" -dependencies = [ - "bitflags", - "cfg-if", - "cfg_aliases", - "libc", - "memoffset", -] - [[package]] name = "num-conv" version = "0.1.0" @@ -2365,12 +2350,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - [[package]] name = "strsim" version = "0.11.1" @@ -2386,7 +2365,6 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "switcheroo-control" version = "0.1.0" -source = "git+https://github.com/pop-os/dbus-settings-bindings#3b86984332be2c930a3536ab714b843c851fa8ca" dependencies = [ "zbus", ] @@ -2615,7 +2593,7 @@ dependencies = [ "indexmap 2.11.4", "toml_datetime", "toml_parser", - "winnow", + "winnow 0.7.13", ] [[package]] @@ -2624,7 +2602,7 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4cf893c33be71572e0e9aa6dd15e6677937abd686b066eac3f8cd3531688a627" dependencies = [ - "winnow", + "winnow 0.7.13", ] [[package]] @@ -2810,6 +2788,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2" dependencies = [ "js-sys", + "serde", "wasm-bindgen", ] @@ -3413,6 +3392,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "winnow" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0592e1c9d151f854e6fd382574c3a0855250e1d9b2f99d9281c6e6391af352f1" +dependencies = [ + "memchr", +] + [[package]] name = "wit-bindgen" version = "0.46.0" @@ -3483,9 +3471,9 @@ dependencies = [ [[package]] name = "zbus" -version = "5.11.0" +version = "5.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d07e46d035fb8e375b2ce63ba4e4ff90a7f73cf2ffb0138b29e1158d2eaadf7" +checksum = "c3bcbf15c8708d7fc1be0c993622e0a5cbd5e8b52bfa40afa4c3e0cd8d724ac1" dependencies = [ "async-broadcast", "async-executor", @@ -3501,14 +3489,16 @@ dependencies = [ "futures-core", "futures-lite", "hex", - "nix", + "libc", "ordered-stream", + "rustix", "serde", "serde_repr", "tracing", "uds_windows", - "windows-sys 0.60.2", - "winnow", + "uuid", + "windows-sys 0.61.0", + "winnow 1.0.3", "zbus_macros", "zbus_names", "zvariant", @@ -3516,9 +3506,9 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "5.11.0" +version = "5.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57e797a9c847ed3ccc5b6254e8bcce056494b375b511b3d6edcec0aeb4defaca" +checksum = "51fa5406ad9175a8c825a931f8cf347116b531b3634fcb0b627c290f1f2516ff" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -3531,13 +3521,12 @@ dependencies = [ [[package]] name = "zbus_names" -version = "4.2.0" +version = "4.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7be68e64bf6ce8db94f63e72f0c7eb9a60d733f7e0499e628dfab0f84d6bcb97" +checksum = "7074f3e50b894eac91750142016d30d0a89be8e67dbfd9704fb875825760e52d" dependencies = [ "serde", - "static_assertions", - "winnow", + "winnow 1.0.3", "zvariant", ] @@ -3623,23 +3612,23 @@ dependencies = [ [[package]] name = "zvariant" -version = "5.7.0" +version = "5.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "999dd3be73c52b1fccd109a4a81e4fcd20fab1d3599c8121b38d04e1419498db" +checksum = "1c1567a6ec68df868cbbfde844cfc6d81649fe5109a62b116b19fabd53e618ee" dependencies = [ "endi", "enumflags2", "serde", - "winnow", + "winnow 1.0.3", "zvariant_derive", "zvariant_utils", ] [[package]] name = "zvariant_derive" -version = "5.7.0" +version = "5.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6643fd0b26a46d226bd90d3f07c1b5321fe9bb7f04673cb37ac6d6883885b68e" +checksum = "c7d5b780599bbde114e39d9a0799577fad1ced5105d38515745f7b3099d8ceda" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -3650,13 +3639,13 @@ dependencies = [ [[package]] name = "zvariant_utils" -version = "3.2.1" +version = "3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6949d142f89f6916deca2232cf26a8afacf2b9fdc35ce766105e104478be599" +checksum = "6d464f5733ffa07a3164d656f18533caace9d0638596721355d73256a410d691" dependencies = [ "proc-macro2", "quote", "serde", "syn", - "winnow", + "winnow 1.0.3", ] diff --git a/Cargo.toml b/Cargo.toml index a2c2e24..aec3a4e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -51,6 +51,3 @@ features = ["io-util"] # [patch.crates-io] # freedesktop-desktop-entry = { path = "../freedesktop-desktop-entry" } - -[patch."https://github.com/pop-os/cosmic-protocols"] -"cosmic-client-toolkit" = { git = "https://github.com/pop-os//cosmic-protocols" } diff --git a/plugins/Cargo.toml b/plugins/Cargo.toml index a9b9d1a..9066b20 100644 --- a/plugins/Cargo.toml +++ b/plugins/Cargo.toml @@ -22,8 +22,8 @@ slab = "0.4.11" strsim = "0.11.1" tracing.workspace = true urlencoding = "2.1.3" -zbus = "5.11.0" -zvariant = "5.7.0" +zbus = "5.14.0" +zvariant = "5.10.0" url = "2.5.7" anyhow.workspace = true flume.workspace = true @@ -33,13 +33,13 @@ bytes = "1.10.1" recently-used-xbel = "1.1.0" # dependencies cosmic toplevel -cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit" } +cctk = { path = "../../cosmic-protocols/client-toolkit", package = "cosmic-client-toolkit" } sctk = { package = "smithay-client-toolkit", version = "0.20.0", features = [ "calloop", ] } # dependencies desktop entries -switcheroo-control = { git = "https://github.com/pop-os/dbus-settings-bindings" } +switcheroo-control = { path = "../../dbus-settings-bindings/switcheroo-control" } [dependencies.reqwest] version = "0.12.23"