leyoda/cosmic-settings
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: align subscriptions with local stack

Browse source
This commit is contained in:
Lionel DARNIS 2026-05-23 20:49:24 +02:00
parent 16172ad5a3
commit f19473a05c
12 changed files with 32 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Cargo.lock generated
View file

@ -1352,7 +1352,7 @@ version = "0.1.0"
source = "git+https://github.com/pop-os/cosmic-protocols//?rev=d0e95be#d0e95be25e423cfe523b11111a3666ed7aaf0dc4"
dependencies = [
"bitflags 2.11.1",
"cosmic-protocols",
"cosmic-protocols 0.1.0",
"libc",
"smithay-client-toolkit",
"wayland-client",
@ -1495,12 +1495,25 @@ dependencies = [
"wayland-server",
]
[[package]]
name = "cosmic-protocols"
version = "0.2.0"
dependencies = [
"bitflags 2.11.1",
"wayland-backend",
"wayland-client",
"wayland-protocols",
"wayland-protocols-wlr",
"wayland-scanner",
"wayland-server",
]
[[package]]
name = "cosmic-randr"
version = "0.1.0"
source = "git+https://github.com/pop-os/cosmic-randr#6e8e795970fa06d434af22775e415b517f7552d3"
dependencies = [
"cosmic-protocols",
"cosmic-protocols 0.1.0",
"indexmap 2.14.0",
"thiserror 2.0.18",
"tokio",
@ -1537,7 +1550,7 @@ dependencies = [
"cosmic-idle-config",
"cosmic-mime-apps",
"cosmic-panel-config",
"cosmic-protocols",
"cosmic-protocols 0.1.0",
"cosmic-randr",
"cosmic-randr-shell",
"cosmic-settings-a11y-manager-subscription",
@ -1608,7 +1621,7 @@ dependencies = [
name = "cosmic-settings-a11y-manager-subscription"
version = "1.0.7"
dependencies = [
"cosmic-protocols",
"cosmic-protocols 0.2.0",
"iced_futures",
"num-derive",
"num-traits",
@ -9529,7 +9542,3 @@ dependencies = [
"syn 2.0.117",
"winnow 0.7.15",
]
[[patch.unused]]
name = "cosmic-text"
version = "0.19.0"

9
Cargo.toml
View file

@ -86,16 +86,13 @@ iced_winit = { path = "/home/lionel/Projets/COSMIC/libcosmic/iced/winit" }
# upower_dbus = { path = "../dbus-settings-bindings/upower" }
# nm-secret-agent-manager = { git = "https://github.com/pop-os/dbus-settings-bindings//", branch = "nm-secret-agent" }
# Yoda wayland cut v5: redirect window_clipboard + cosmic-text to our local
# forks (x11 gated behind opt-in feature + EAW/PR#503 respectively).
[patch.'https://github.com/pop-os/window_clipboard.git']
# Yoda wayland cut v5: redirect window_clipboard to the local fork
# (x11 gated behind opt-in feature).
[patch.'https://forge.aditua.com/leyoda/window_clipboard.git']
window_clipboard = { path = "/home/lionel/Projets/COSMIC/window_clipboard" }
dnd = { path = "/home/lionel/Projets/COSMIC/window_clipboard/dnd" }
mime = { path = "/home/lionel/Projets/COSMIC/window_clipboard/mime" }
[patch.'https://github.com/pop-os/cosmic-text']
cosmic-text = { path = "/home/lionel/Projets/COSMIC/cosmic-text" }
[patch.crates-io]
atspi = { git = "https://github.com/wash2/atspi" }
atspi-common = { git = "https://github.com/wash2/atspi" }

4
subscriptions/a11y-manager/Cargo.toml
View file

@ -7,8 +7,8 @@ rust-version.workspace = true
publish = true
[dependencies]
cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols" }
iced_futures = { git = "https://github.com/pop-os/libcosmic" }
cosmic-protocols = { path = "../../../cosmic-protocols" }
iced_futures = { path = "../../../libcosmic/iced/futures" }
num-derive = "0.4.2"
num-traits = "0.2.19"
sctk.workspace = true

2
subscriptions/accessibility/Cargo.toml
View file

@ -9,7 +9,7 @@ publish = true
[dependencies]
cosmic-dbus-a11y = { git = "https://github.com/pop-os/dbus-settings-bindings" }
futures = "0.3.32"
iced_futures = { git = "https://github.com/pop-os/libcosmic" }
iced_futures = { path = "../../../libcosmic/iced/futures" }
tokio = { version = "1.49.0", features = ["sync", "time"] }
tracing = "0.1.44"
zbus = "5.13"

2
subscriptions/airplane-mode/Cargo.toml
View file

@ -8,7 +8,7 @@ publish = true
[dependencies]
futures = "0.3.32"
iced_futures = { git = "https://github.com/pop-os/libcosmic" }
iced_futures = { path = "../../../libcosmic/iced/futures" }
log = "0.4.29"
rustix = "1.1.3"
tokio = "1.49.0"

2
subscriptions/network-manager/Cargo.toml
View file

@ -11,7 +11,7 @@ cosmic-dbus-networkmanager = { git = "https://github.com/pop-os/dbus-settings-bi
secret-service = { version = "5.1.0", features = ["rt-tokio-crypto-rust"] }
nm-secret-agent-manager = { git = "https://github.com/pop-os/dbus-settings-bindings" }
futures = "0.3.32"
iced_futures = { git = "https://github.com/pop-os/libcosmic" }
iced_futures = { path = "../../../libcosmic/iced/futures" }
itertools = "0.14.0"
secure-string = "0.3.0"
thiserror = "2.0.18"

2
subscriptions/network-manager/src/devices.rs
View file

@ -185,7 +185,7 @@ pub fn subscription<I: 'static + Hash + Copy + Send + Sync + Debug>(
conn,
},
|Wrapper {
id,
id: _,
has_popup,
conn,
}| {

2
subscriptions/network-manager/src/lib.rs
View file

@ -141,7 +141,7 @@ pub fn subscription<I: Copy + Debug + std::hash::Hash + 'static>(
self.id.hash(state);
}
}
Subscription::run_with(Wrapper { id, conn }, |Wrapper { id, conn }| {
Subscription::run_with(Wrapper { id, conn }, |Wrapper { id: _, conn }| {
let conn = conn.clone();
stream::channel(
50,

2
subscriptions/pulse/Cargo.toml
View file

@ -7,6 +7,6 @@ rust-version.workspace = true
[dependencies]
libpulse-binding = { version = "2.30.1" }
rustix = { version = "1.1.3", features = ["pipe"] }
iced_futures = { git = "https://github.com/pop-os/libcosmic" }
iced_futures = { path = "../../../libcosmic/iced/futures" }
futures = "0.3.32"
log = "0.4.27"

4
subscriptions/pulse/src/lib.rs
View file

@ -288,7 +288,7 @@ impl PulseChannels {
/// Set the speaker balance of the active sink.
pub fn set_balance(&mut self, balance: f32) {
if let Err(err) = self.tx.send(Request::Balance(self.index, balance)) {
log::error!("Failed to send new balance to channel");
log::error!("Failed to send new balance to channel: {err}");
} else {
self.pipe_tx
.write_all(&[1])
@ -299,7 +299,7 @@ impl PulseChannels {
/// Set the volume of the active sink.
pub fn set_volume(&mut self, volume: f32) {
if let Err(err) = self.tx.send(Request::Volume(self.index, volume)) {
log::error!("Failed to send new volume to channel");
log::error!("Failed to send new volume to channel: {err}");
} else {
self.pipe_tx
.write_all(&[1])

2
subscriptions/settings-daemon/Cargo.toml
View file

@ -7,7 +7,7 @@ publish = true
[dependencies]
futures = "0.3.32"
iced_futures = { git = "https://github.com/pop-os/libcosmic" }
iced_futures = { path = "../../../libcosmic/iced/futures" }
log = "0.4.29"
tokio = "1.49.0"
tokio-stream = "0.1.18"

2
subscriptions/upower/Cargo.toml
View file

@ -8,7 +8,7 @@ publish = true
[dependencies]
futures = "0.3.32"
iced_futures = { git = "https://github.com/pop-os/libcosmic" }
iced_futures = { path = "../../../libcosmic/iced/futures" }
log = "0.4.29"
tokio = "1.49.0"
tokio-stream = "0.1.18"