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

chore: update dependencies

Browse source
This commit is contained in:
Vukašin Vojinović 2025-09-12 14:59:30 +02:00 • committed by Ashley Wulber
parent 2533b5542b
commit 29da0330aa
6 changed files with 652 additions and 507 deletions
Download patch file Download diff file Expand all files Collapse all files

1087
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

19
Cargo.toml
View file

@ -1,14 +1,14 @@
[workspace]
members = ["cosmic-settings", "page", "pages/*"]
default-members = ["cosmic-settings"]
resolver = "2"
resolver = "3"
[workspace.package]
rust-version = "1.85.0"
rust-version = "1.85"
[workspace.dependencies]
cosmic-randr = { git = "https://github.com/pop-os/cosmic-randr" }
tokio = { version = "1.47.0", features = ["macros"] }
tokio = { version = "1.47.1", features = ["macros"] }
[workspace.dependencies.libcosmic]
features = ["dbus-config", "multi-window", "winit", "tokio"]
@ -58,22 +58,15 @@ debug = true
# [patch.'https://github.com/pop-os/cosmic-text']
# cosmic-text = { git = "https://github.com/pop-os/cosmic-text//", rev = "b017d7c" }
# [patch.'https://github.com/smithay/client-toolkit/']
# smithay-client-toolkit = { git = "https://github.com/smithay/client-toolkit//", rev = "c583de8" }
[patch.'https://github.com/pop-os/cosmic-protocols']
cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols//", rev = "408af98" }
cosmic-client-toolkit = { git = "https://github.com/pop-os/cosmic-protocols//", rev = "408af98" }
cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols//", rev = "6254f50" }
cosmic-client-toolkit = { git = "https://github.com/pop-os/cosmic-protocols//", rev = "6254f50" }
# [patch.'https://github.com/pop-os/cosmic-settings-daemon']
# cosmic-settings-config = { git = "https://github.com/pop-os/cosmic-settings-daemon//", branch = "input_nobuild" }
# For development and testing purposes
# [patch.'https://github.com/pop-os/libcosmic']
# libcosmic = { git = "https://github.com/pop-os/libcosmic//", rev = "8c4cb2e" }
# cosmic-config = { git = "https://github.com/pop-os/libcosmic//", rev = "8c4cb2e" }
# cosmic-theme = { git = "https://github.com/pop-os/libcosmic//", rev = "8c4cb2e" }
# iced_futures = { git = "https://github.com/pop-os/libcosmic//", rev = "8c4cb2e" }
# libcosmic = { path = "../libcosmic" }
# cosmic-config = { path = "../libcosmic/cosmic-config" }
# cosmic-theme = { path = "../libcosmic/cosmic-theme" }
@ -84,4 +77,4 @@ cosmic-client-toolkit = { git = "https://github.com/pop-os/cosmic-protocols//",
# upower_dbus = { path = "../dbus-settings-bindings/upower" }
[patch."https://github.com/smithay/client-toolkit.git"]
sctk = { package = "smithay-client-toolkit", version = "=0.19.2" }
sctk = { package = "smithay-client-toolkit", version = "0.20.0" }

31
cosmic-settings/Cargo.toml
View file

@ -7,13 +7,11 @@ license = "GPL-3.0-only"
[dependencies]
accounts-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true }
anyhow = "1.0"
as-result = "0.2.1"
ashpd = { version = "0.11", default-features = false, features = [
ashpd = { version = "0.12", default-features = false, features = [
"tokio",
], optional = true }
async-channel = "2.5.0"
chrono = "0.4.41"
clap = { version = "4.5.42", features = ["derive"] }
chrono = "0.4.42"
clap = { version = "4.5.47", features = ["derive"] }
color-eyre = "0.6.5"
cosmic-bg-config.workspace = true
cosmic-comp-config = { workspace = true, optional = true }
@ -30,10 +28,8 @@ cosmic-settings-subscriptions = { workspace = true, optional = true }
cosmic-settings-system = { path = "../pages/system", optional = true }
cosmic-settings-wallpaper = { path = "../pages/wallpapers" }
cosmic-settings-daemon-config = { git = "https://github.com/pop-os/cosmic-settings-daemon", optional = true }
derivative = "2.2.0"
derive_setters = "0.1.8"
dirs = "6.0.0"
downcast-rs = "2.0.1"
eyre = "0.6.12"
freedesktop-desktop-entry = "0.7.14"
futures = "0.3.31"
@ -47,20 +43,21 @@ image = { version = "0.25", default-features = false, features = [
"webp",
"hdr",
] }
indexmap = "2.10.0"
indexmap = "2.11.1"
itertools = "0.14.0"
itoa = "1.0.15"
libcosmic.workspace = true
locale1 = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true }
mime-apps = { package = "cosmic-mime-apps", git = "https://github.com/pop-os/cosmic-mime-apps", optional = true }
# TODO: updating notify beyond this hangs the app
notify = "6.1.1"
regex = "1.11.1"
ron = "0.10.1"
regex = "1.11.2"
ron = "0.11"
rust-embed = "8.7.2"
sctk = { workspace = true, optional = true }
secure-string = "0.3.0"
serde = { version = "1.0.219", features = ["derive"] }
slab = "0.4.10"
slab = "0.4.11"
slotmap = "1.0.7"
static_init = "1.0.4"
sunrise = "2.1.0"
@ -68,26 +65,24 @@ tachyonix = "0.3.1"
timedate-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true }
tokio = { workspace = true, features = ["fs", "io-util", "sync"] }
tracing = "0.1.41"
tracing-subscriber = "0.3.19"
tracing-subscriber = "0.3.20"
udev = { version = "0.9.3", optional = true }
upower_dbus = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true }
bluez-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true }
url = "2.5.4"
url = "2.5.7"
xkb-data = "0.2.1"
zbus = { version = "5.9.0", default-features = false, features = [
zbus = { version = "5.11.0", default-features = false, features = [
"tokio",
], optional = true }
zbus_polkit = { version = "5.0.0", optional = true }
fontdb = "0.23.0"
fixed_decimal = "0.5.6"
mime = "0.3.17"
rustix = { version = "1.0.8", features = ["process"] }
rustix = { version = "1.1.2", features = ["process"] }
gettext-rs = { version = "0.7.2", features = [
"gettext-system",
], optional = true }
async-fn-stream = "0.2.2"
async-fn-stream = "0.3"
num-traits = "0.2"
num-derive = "0.4"
pwhash = "1"
[dependencies.icu]

5
cosmic-settings/src/pages/desktop/appearance/mode_and_colors.rs
View file

@ -231,11 +231,8 @@ fn accent_color_palette<'a>(
cosmic::iced::widget::column![
text::body(&descriptions[labels["accent_color"]]),
widget::flex_row(accent_palette_row)
.padding([0, 0, 16, 0])
.spacing(16)
widget::flex_row(accent_palette_row).spacing(16)
]
.padding([16, 0, 0, 0])
.spacing(space_xxs)
}

9
page/Cargo.toml
View file

@ -5,10 +5,9 @@ edition = "2024"
[dependencies]
derive_setters = "0.1.8"
regex = "1.11.1"
regex = "1.11.2"
slotmap = "1.0.7"
libcosmic = { workspace = true }
downcast-rs = "2.0.1"
tokio.workspace = true
url = "2.5.4"
slab = "0.4.10"
downcast-rs = "2.0.2"
url = "2.5.7"
slab = "0.4.11"

8
pages/wallpapers/Cargo.toml
View file

@ -8,7 +8,6 @@ rust-version.workspace = true
[dependencies]
cosmic-bg-config = { workspace = true }
cosmic-config = { workspace = true }
cosmic-randr-shell = { workspace = true }
dirs = "6.0.0"
eyre = "0.6.12"
@ -16,12 +15,11 @@ eyre = "0.6.12"
fast_image_resize = { git = "https://github.com/jackpot51/fast_image_resize.git", features = [
"image",
] }
freedesktop-icons = { package = "cosmic-freedesktop-icons", git = "https://github.com/pop-os/freedesktop-icons" }
futures-lite = "2.6.0"
futures-lite = "2.6.1"
futures-util = "0.3.31"
image = "0.25.6"
image = "0.25.8"
infer = "0.19.0"
jxl-oxide = { version = "0.12.4", features = ["image"] }
tokio = { version = "1.47.0", features = ["sync"] }
tokio = { workspace = true, features = ["sync"] }
tracing = "0.1.41"
walkdir = "=2.5.0"