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

yoda: use local dbus settings bindings

Browse source
This commit is contained in:
Lionel DARNIS 2026-05-25 09:55:11 +02:00
parent f19473a05c
commit 331aba9d95
7 changed files with 14 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Cargo.lock generated
View file

@ -104,7 +104,6 @@ dependencies = [
[[package]] [[package]]
name = "accounts-zbus" name = "accounts-zbus"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/dbus-settings-bindings#507e342c21d3ce6ae41b1d4f3fa2f0ad5ee23e75"
dependencies = [ dependencies = [
"zbus", "zbus",
] ]
@ -825,7 +824,6 @@ dependencies = [
[[package]] [[package]]
name = "bluez-zbus" name = "bluez-zbus"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/dbus-settings-bindings#507e342c21d3ce6ae41b1d4f3fa2f0ad5ee23e75"
dependencies = [ dependencies = [
"futures-channel", "futures-channel",
"futures-util", "futures-util",
@ -1402,7 +1400,6 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-dbus-a11y" name = "cosmic-dbus-a11y"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/dbus-settings-bindings#507e342c21d3ce6ae41b1d4f3fa2f0ad5ee23e75"
dependencies = [ dependencies = [
"zbus", "zbus",
] ]
@ -1410,7 +1407,6 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-dbus-networkmanager" name = "cosmic-dbus-networkmanager"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/dbus-settings-bindings#507e342c21d3ce6ae41b1d4f3fa2f0ad5ee23e75"
dependencies = [ dependencies = [
"bitflags 2.11.1", "bitflags 2.11.1",
"derive_builder", "derive_builder",
@ -1680,8 +1676,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-settings-daemon" name = "cosmic-settings-daemon"
version = "0.1.0" version = "0.1.1-yoda.1"
source = "git+https://github.com/pop-os/dbus-settings-bindings#507e342c21d3ce6ae41b1d4f3fa2f0ad5ee23e75"
dependencies = [ dependencies = [
"zbus", "zbus",
] ]
@ -3088,7 +3083,6 @@ checksum = "f558a64ac9af88b5ba400d99b579451af0d39c6d360980045b91aac966d705e2"
[[package]] [[package]]
name = "hostname1-zbus" name = "hostname1-zbus"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/dbus-settings-bindings#507e342c21d3ce6ae41b1d4f3fa2f0ad5ee23e75"
dependencies = [ dependencies = [
"zbus", "zbus",
] ]
@ -4684,7 +4678,6 @@ checksum = "11d3d7f243d5c5a8b9bb5d6dd2b1602c0cb0b9db1621bafc7ed66e35ff9fe092"
[[package]] [[package]]
name = "locale1" name = "locale1"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/dbus-settings-bindings#507e342c21d3ce6ae41b1d4f3fa2f0ad5ee23e75"
dependencies = [ dependencies = [
"zbus", "zbus",
] ]
@ -5026,7 +5019,6 @@ dependencies = [
[[package]] [[package]]
name = "nm-secret-agent-manager" name = "nm-secret-agent-manager"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/dbus-settings-bindings#507e342c21d3ce6ae41b1d4f3fa2f0ad5ee23e75"
dependencies = [ dependencies = [
"zbus", "zbus",
] ]
@ -7260,7 +7252,6 @@ dependencies = [
[[package]] [[package]]
name = "timedate-zbus" name = "timedate-zbus"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/dbus-settings-bindings#507e342c21d3ce6ae41b1d4f3fa2f0ad5ee23e75"
dependencies = [ dependencies = [
"zbus", "zbus",
] ]
@ -7650,7 +7641,6 @@ checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
[[package]] [[package]]
name = "upower_dbus" name = "upower_dbus"
version = "0.3.2" version = "0.3.2"
source = "git+https://github.com/pop-os/dbus-settings-bindings#507e342c21d3ce6ae41b1d4f3fa2f0ad5ee23e75"
dependencies = [ dependencies = [
"serde", "serde",
"serde_repr", "serde_repr",

5
Cargo.toml
View file

@ -81,11 +81,6 @@ cosmic-theme = { path = "/home/lionel/Projets/COSMIC/libcosmic/cosmic-theme" }
iced_futures = { path = "/home/lionel/Projets/COSMIC/libcosmic/iced/futures" } iced_futures = { path = "/home/lionel/Projets/COSMIC/libcosmic/iced/futures" }
iced_winit = { path = "/home/lionel/Projets/COSMIC/libcosmic/iced/winit" } iced_winit = { path = "/home/lionel/Projets/COSMIC/libcosmic/iced/winit" }
# [patch.'https://github.com/pop-os/dbus-settings-bindings']
# cosmic-dbus-networkmanager = { path = "../dbus-settings-bindings/networkmanager" }
# 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 to the local fork # Yoda wayland cut v5: redirect window_clipboard to the local fork
# (x11 gated behind opt-in feature). # (x11 gated behind opt-in feature).
[patch.'https://forge.aditua.com/leyoda/window_clipboard.git'] [patch.'https://forge.aditua.com/leyoda/window_clipboard.git']

16
cosmic-settings/Cargo.toml
View file

@ -9,7 +9,7 @@ publish = false
xdgen = "0.1" xdgen = "0.1"
[dependencies] [dependencies]
accounts-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true } accounts-zbus = { path = "../../dbus-settings-bindings/accounts-zbus", optional = true }
anyhow = "1.0" anyhow = "1.0"
ashpd = { version = "0.12", default-features = false, features = [ ashpd = { version = "0.12", default-features = false, features = [
"tokio", "tokio",
@ -21,8 +21,8 @@ color-eyre = "0.6.5"
cosmic-bg-config.workspace = true cosmic-bg-config.workspace = true
cosmic-comp-config = { workspace = true, optional = true } cosmic-comp-config = { workspace = true, optional = true }
cosmic-config.workspace = true cosmic-config.workspace = true
cosmic-dbus-networkmanager = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true } cosmic-dbus-networkmanager = { path = "../../dbus-settings-bindings/networkmanager", optional = true }
nm-secret-agent-manager = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true } nm-secret-agent-manager = { path = "../../dbus-settings-bindings/nm-secret-agent-manager", optional = true }
cosmic-idle-config.workspace = true cosmic-idle-config.workspace = true
cosmic-panel-config = { workspace = true, optional = true } cosmic-panel-config = { workspace = true, optional = true }
cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", optional = true } cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", optional = true }
@ -47,7 +47,7 @@ eyre = "0.6.12"
freedesktop-desktop-entry = "0.8.1" freedesktop-desktop-entry = "0.8.1"
futures = "0.3.32" futures = "0.3.32"
hostname-validator = "1.1.1" hostname-validator = "1.1.1"
hostname1-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true } hostname1-zbus = { path = "../../dbus-settings-bindings/hostname1", optional = true }
i18n-embed-fl = "0.10.0" i18n-embed-fl = "0.10.0"
image = { version = "0.25", default-features = false, features = [ image = { version = "0.25", default-features = false, features = [
"jpeg", "jpeg",
@ -61,7 +61,7 @@ itertools = "0.14.0"
itoa = "1.0.17" itoa = "1.0.17"
libcosmic-yoda.workspace = true libcosmic-yoda.workspace = true
iced_winit.workspace = true iced_winit.workspace = true
locale1 = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true } locale1 = { path = "../../dbus-settings-bindings/locale1", optional = true }
sysinfo = { version = "=0.38.0", optional = true } sysinfo = { version = "=0.38.0", optional = true }
mime-apps = { package = "cosmic-mime-apps", git = "https://github.com/pop-os/cosmic-mime-apps", optional = true } mime-apps = { package = "cosmic-mime-apps", git = "https://github.com/pop-os/cosmic-mime-apps", optional = true }
notify = "8.2.0" notify = "8.2.0"
@ -75,13 +75,13 @@ slab = "0.4.12"
slotmap = "1.1.1" slotmap = "1.1.1"
static_init = "1.0.4" static_init = "1.0.4"
sunrise = "3.0.0" sunrise = "3.0.0"
timedate-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true } timedate-zbus = { path = "../../dbus-settings-bindings/timedate", optional = true }
tokio = { workspace = true, features = ["fs", "io-util", "process", "sync"] } tokio = { workspace = true, features = ["fs", "io-util", "process", "sync"] }
tracing = "0.1.44" tracing = "0.1.44"
tracing-subscriber = { version = "0.3.22", features = ["env-filter"] } tracing-subscriber = { version = "0.3.22", features = ["env-filter"] }
udev = { version = "0.9.3", optional = true } udev = { version = "0.9.3", optional = true }
upower_dbus = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true } upower_dbus = { path = "../../dbus-settings-bindings/upower", optional = true }
bluez-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true } bluez-zbus = { path = "../../dbus-settings-bindings/bluez", optional = true }
url = "2.5.8" url = "2.5.8"
xkb-data = "0.2.2" xkb-data = "0.2.2"
xkeysym = { version = "0.2.1", optional = true } xkeysym = { version = "0.2.1", optional = true }

2
subscriptions/accessibility/Cargo.toml
View file

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

2
subscriptions/bluetooth/Cargo.toml
View file

@ -7,7 +7,7 @@ rust-version.workspace = true
publish = true publish = true
[dependencies] [dependencies]
bluez-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings" } bluez-zbus = { path = "../../../dbus-settings-bindings/bluez" }
futures = "0.3.32" futures = "0.3.32"
iced_futures = { git = "https://github.com/pop-os/libcosmic" } iced_futures = { git = "https://github.com/pop-os/libcosmic" }
tokio = "1.49.0" tokio = "1.49.0"

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

@ -7,9 +7,9 @@ rust-version.workspace = true
publish = true publish = true
[dependencies] [dependencies]
cosmic-dbus-networkmanager = { git = "https://github.com/pop-os/dbus-settings-bindings" } cosmic-dbus-networkmanager = { path = "../../../dbus-settings-bindings/networkmanager" }
secret-service = { version = "5.1.0", features = ["rt-tokio-crypto-rust"] } secret-service = { version = "5.1.0", features = ["rt-tokio-crypto-rust"] }
nm-secret-agent-manager = { git = "https://github.com/pop-os/dbus-settings-bindings" } nm-secret-agent-manager = { path = "../../../dbus-settings-bindings/nm-secret-agent-manager" }
futures = "0.3.32" futures = "0.3.32"
iced_futures = { path = "../../../libcosmic/iced/futures" } iced_futures = { path = "../../../libcosmic/iced/futures" }
itertools = "0.14.0" itertools = "0.14.0"

2
subscriptions/upower/Cargo.toml
View file

@ -12,5 +12,5 @@ iced_futures = { path = "../../../libcosmic/iced/futures" }
log = "0.4.29" log = "0.4.29"
tokio = "1.49.0" tokio = "1.49.0"
tokio-stream = "0.1.18" tokio-stream = "0.1.18"
upower_dbus = { git = "https://github.com/pop-os/dbus-settings-bindings" } upower_dbus = { path = "../../../dbus-settings-bindings/upower" }
zbus = "5.13.2" zbus = "5.13.2"