From aad8f172b2477db940eb200cab2d7872a7450677 Mon Sep 17 00:00:00 2001 From: Ian Douglas Scott Date: Tue, 5 Nov 2024 12:19:13 -0800 Subject: [PATCH] WIP zbus5 --- Cargo.toml | 4 ++-- cosmic-config/Cargo.toml | 4 ++-- iced | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 3f225059217..04901ff2fbb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -89,7 +89,7 @@ async-fs = { version = "2.1", optional = true } cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit", rev = "c8d3a1c", optional = true } chrono = "0.4.35" cosmic-config = { path = "cosmic-config" } -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", branch = "zbus5", optional = true } css-color = "0.2.5" derive_setters = "0.1.5" fraction = "0.15.3" @@ -112,7 +112,7 @@ tracing = "0.1" unicode-segmentation = "1.6" url = "2.4.0" ustr = { version = "1.0.0", features = ["serde"] } -zbus = { version = "4.2.1", default-features = false, optional = true } +zbus = { version = "5.1.0", default-features = false, optional = true } [target.'cfg(unix)'.dependencies] freedesktop-icons = "0.2.5" diff --git a/cosmic-config/Cargo.toml b/cosmic-config/Cargo.toml index 98e98dc9ee3..ef25438afcf 100644 --- a/cosmic-config/Cargo.toml +++ b/cosmic-config/Cargo.toml @@ -10,8 +10,8 @@ macro = ["cosmic-config-derive"] subscription = ["iced_futures"] [dependencies] -cosmic-settings-daemon = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true } -zbus = { version = "4.2.1", default-features = false, optional = true } +cosmic-settings-daemon = { git = "https://github.com/pop-os/dbus-settings-bindings", branch = "zbus5", optional = true } +zbus = { version = "5.1.0", default-features = false, optional = true } atomicwrites = { git = "https://github.com/jackpot51/rust-atomicwrites" } calloop = { version = "0.14.0", optional = true } notify = "6.0.0" diff --git a/iced b/iced index 57288e5a3e1..a92abc845ce 160000 --- a/iced +++ b/iced @@ -1 +1 @@ -Subproject commit 57288e5a3e1d238572f15153d7c0a7fe5f1e43da +Subproject commit a92abc845cea46ae5133648e12283a0782481de4