leyoda/libcosmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat!: update zbus from 4.x to 5.x

Browse source
This commit is contained in:
Ian Douglas Scott 2025-05-22 15:02:23 -07:00 • committed by GitHub
parent ce56237ab9
commit 25322e0263
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Cargo.toml
View file

@ -51,7 +51,7 @@ desktop-systemd-scope = ["desktop", "dep:zbus"]
# Enables keycode serialization # Enables keycode serialization
serde-keycode = ["iced_core/serde"] serde-keycode = ["iced_core/serde"]
# Prevents multiple separate process instances. # Prevents multiple separate process instances.
single-instance = ["dep:zbus", "ron"] single-instance = ["zbus/blocking-api", "ron"]
# smol async runtime # smol async runtime
smol = ["dep:smol", "iced/smol", "zbus?/async-io", "rfd?/async-std"] smol = ["dep:smol", "iced/smol", "zbus?/async-io", "rfd?/async-std"]
tokio = [ tokio = [
@ -130,7 +130,7 @@ tokio = { version = "1.44.1", optional = true }
tracing = "0.1.41" tracing = "0.1.41"
unicode-segmentation = "1.12" unicode-segmentation = "1.12"
url = "2.5.4" url = "2.5.4"
zbus = { version = "4.4.0", default-features = false, optional = true } zbus = { version = "5.7.1", default-features = false, optional = true }
[target.'cfg(unix)'.dependencies] [target.'cfg(unix)'.dependencies]
freedesktop-icons = { package = "cosmic-freedesktop-icons", git = "https://github.com/pop-os/freedesktop-icons" } freedesktop-icons = { package = "cosmic-freedesktop-icons", git = "https://github.com/pop-os/freedesktop-icons" }

2
cosmic-config/Cargo.toml
View file

@ -11,7 +11,7 @@ subscription = ["iced_futures"]
[dependencies] [dependencies]
cosmic-settings-daemon = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true } cosmic-settings-daemon = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true }
zbus = { version = "4.4.0", default-features = false, optional = true } zbus = { version = "5.7.1", default-features = false, optional = true }
atomicwrites = { git = "https://github.com/jackpot51/rust-atomicwrites" } atomicwrites = { git = "https://github.com/jackpot51/rust-atomicwrites" }
calloop = { version = "0.14.2", optional = true } calloop = { version = "0.14.2", optional = true }
notify = "8.0.0" notify = "8.0.0"

2
src/dbus_activation.rs
View file

@ -21,7 +21,7 @@ pub fn subscription<App: ApplicationExt>() -> Subscription<crate::Action<App::Me
iced::stream::channel(10, move |mut output| async move { iced::stream::channel(10, move |mut output| async move {
let mut single_instance: DbusActivation = DbusActivation::new(); let mut single_instance: DbusActivation = DbusActivation::new();
let mut rx = single_instance.rx(); let mut rx = single_instance.rx();
if let Ok(builder) = zbus::ConnectionBuilder::session() { if let Ok(builder) = zbus::connection::Builder::session() {
let path: String = format!("/{}", App::APP_ID.replace('.', "/")); let path: String = format!("/{}", App::APP_ID.replace('.', "/"));
if let Ok(conn) = builder.build().await { if let Ok(conn) = builder.build().await {
// XXX Setup done this way seems to be more reliable. // XXX Setup done this way seems to be more reliable.