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

chore: use local COSMIC support crates

Browse source
This commit is contained in:
Lionel DARNIS 2026-05-25 18:10:22 +02:00
parent be22ac64b7
commit bccdc3df16
3 changed files with 17 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Cargo.lock generated
View file

@ -1344,7 +1344,6 @@ dependencies = [
[[package]]
name = "cosmic-bg-config"
version = "1.0.3"
source = "git+https://github.com/pop-os/cosmic-bg#b1ca4c180ab29dd185472b777ab0abdb1f96ccaf"
dependencies = [
"cosmic-config",
"derive_setters",
@ -1355,11 +1354,10 @@ dependencies = [
[[package]]
name = "cosmic-client-toolkit"
version = "0.1.0"
source = "git+https://github.com/pop-os/cosmic-protocols//?rev=d0e95be#d0e95be25e423cfe523b11111a3666ed7aaf0dc4"
version = "0.2.0"
dependencies = [
"bitflags 2.11.1",
"cosmic-protocols 0.1.0",
"cosmic-protocols",
"libc",
"smithay-client-toolkit",
"wayland-client",
@ -1369,7 +1367,6 @@ dependencies = [
[[package]]
name = "cosmic-comp-config"
version = "1.0.0"
source = "git+https://github.com/pop-os/cosmic-comp#28258e5a5fbe17cf714ddf5a0036d5c750545956"
dependencies = [
"cosmic-config",
"input",
@ -1442,7 +1439,6 @@ dependencies = [
[[package]]
name = "cosmic-idle-config"
version = "0.1.0"
source = "git+https://github.com/pop-os/cosmic-idle#c95d066b5b640509a6369634b669ca60dc50e168"
dependencies = [
"cosmic-config",
"serde",
@ -1462,7 +1458,6 @@ dependencies = [
[[package]]
name = "cosmic-panel-config"
version = "0.1.0"
source = "git+https://github.com/pop-os/cosmic-panel#26fee6c0c310620e8b3ce3e5fbab432248a88195"
dependencies = [
"anyhow",
"cosmic-config",
@ -1486,20 +1481,6 @@ dependencies = [
"tracing",
]
[[package]]
name = "cosmic-protocols"
version = "0.1.0"
source = "git+https://github.com/pop-os/cosmic-protocols//?rev=d0e95be#d0e95be25e423cfe523b11111a3666ed7aaf0dc4"
dependencies = [
"bitflags 2.11.1",
"wayland-backend",
"wayland-client",
"wayland-protocols",
"wayland-protocols-wlr",
"wayland-scanner",
"wayland-server",
]
[[package]]
name = "cosmic-protocols"
version = "0.2.0"
@ -1516,9 +1497,8 @@ dependencies = [
[[package]]
name = "cosmic-randr"
version = "0.1.0"
source = "git+https://github.com/pop-os/cosmic-randr#6e8e795970fa06d434af22775e415b517f7552d3"
dependencies = [
"cosmic-protocols 0.1.0",
"cosmic-protocols",
"indexmap 2.14.0",
"thiserror 2.0.18",
"tokio",
@ -1530,7 +1510,6 @@ dependencies = [
[[package]]
name = "cosmic-randr-shell"
version = "0.1.0"
source = "git+https://github.com/pop-os/cosmic-randr#6e8e795970fa06d434af22775e415b517f7552d3"
dependencies = [
"kdl",
"slotmap",
@ -1555,7 +1534,7 @@ dependencies = [
"cosmic-idle-config",
"cosmic-mime-apps",
"cosmic-panel-config",
"cosmic-protocols 0.1.0",
"cosmic-protocols",
"cosmic-randr",
"cosmic-randr-shell",
"cosmic-settings-a11y-manager-subscription",
@ -1626,7 +1605,7 @@ dependencies = [
name = "cosmic-settings-a11y-manager-subscription"
version = "1.0.7"
dependencies = [
"cosmic-protocols 0.2.0",
"cosmic-protocols",
"iced_futures",
"num-derive",
"num-traits",
@ -1673,7 +1652,6 @@ dependencies = [
[[package]]
name = "cosmic-settings-config"
version = "0.1.0"
source = "git+https://github.com/pop-os/cosmic-settings-daemon#fa82bdf9fe7b5f5bd6008f32f393efd5e7a71c47"
dependencies = [
"cosmic-config",
"ron 0.11.0",
@ -1693,7 +1671,6 @@ dependencies = [
[[package]]
name = "cosmic-settings-daemon-config"
version = "0.1.0"
source = "git+https://github.com/pop-os/cosmic-settings-daemon#fa82bdf9fe7b5f5bd6008f32f393efd5e7a71c47"
dependencies = [
"cosmic-config",
"serde",
@ -9090,7 +9067,6 @@ checksum = "2fb433233f2df9344722454bc7e96465c9d03bff9d77c248f9e7523fe79585b5"
[[package]]
name = "xdg-shell-wrapper-config"
version = "0.1.0"
source = "git+https://github.com/pop-os/cosmic-panel#26fee6c0c310620e8b3ce3e5fbab432248a88195"
dependencies = [
"serde",
"wayland-protocols-wlr",

21
Cargo.toml
View file

@ -7,7 +7,7 @@ resolver = "3"
rust-version = "1.90"
[workspace.dependencies]
cosmic-randr = { git = "https://github.com/pop-os/cosmic-randr" }
cosmic-randr = { path = "../cosmic-randr/lib" }
tokio = { version = "1.49.0", features = ["macros"] }
# Yoda fork: direct path dep on iced_winit in libcosmic-yoda's submodule.
iced_winit = { path = "/home/lionel/Projets/COSMIC/libcosmic/iced/winit", default-features = false }
@ -28,20 +28,20 @@ path = "/home/lionel/Projets/COSMIC/libcosmic"
path = "/home/lionel/Projets/COSMIC/libcosmic/cosmic-config"
[workspace.dependencies.cosmic-bg-config]
git = "https://github.com/pop-os/cosmic-bg"
path = "../cosmic-bg/config"
[workspace.dependencies.cosmic-comp-config]
git = "https://github.com/pop-os/cosmic-comp"
path = "../cosmic-comp/cosmic-comp-config"
features = ["output"]
[workspace.dependencies.cosmic-idle-config]
git = "https://github.com/pop-os/cosmic-idle"
path = "../cosmic-idle/cosmic-idle-config"
[workspace.dependencies.cosmic-panel-config]
git = "https://github.com/pop-os/cosmic-panel"
path = "../cosmic-panel/cosmic-panel-config"
[workspace.dependencies.cosmic-randr-shell]
git = "https://github.com/pop-os/cosmic-randr"
path = "../cosmic-randr/shell"
[workspace.dependencies.sctk]
version = "0.20"
@ -61,15 +61,12 @@ inherits = "release"
lto = "off"
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/pop-os/cosmic-protocols']
cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols//", rev = "d0e95be" }
cosmic-client-toolkit = { git = "https://github.com/pop-os/cosmic-protocols//", rev = "d0e95be" }
cosmic-protocols = { path = "../cosmic-protocols" }
cosmic-client-toolkit = { path = "../cosmic-protocols/client-toolkit" }
# [patch.'https://github.com/pop-os/cosmic-settings-daemon']
# cosmic-settings-config = { git = "https://github.com/pop-os/cosmic-settings-daemon//", branch = "input_nobuild" }
# cosmic-settings-config = { path = "../cosmic-settings-daemon/config" }
# Yoda fork: redirect every transitive dep that asks for pop-os/libcosmic
# (cosmic-bg-config, cosmic-comp-config, cosmic-idle-config, cosmic-panel-config,

6
cosmic-settings/Cargo.toml
View file

@ -25,10 +25,10 @@ cosmic-dbus-networkmanager = { path = "../../dbus-settings-bindings/networkmanag
nm-secret-agent-manager = { path = "../../dbus-settings-bindings/nm-secret-agent-manager", optional = true }
cosmic-idle-config.workspace = true
cosmic-panel-config = { workspace = true, optional = true }
cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", optional = true }
cosmic-protocols = { path = "../../cosmic-protocols", optional = true }
cosmic-randr-shell.workspace = true
cosmic-randr = { workspace = true, optional = true }
cosmic-settings-config = { git = "https://github.com/pop-os/cosmic-settings-daemon", optional = true }
cosmic-settings-config = { path = "../../cosmic-settings-daemon/config", optional = true }
cosmic-settings-page = { path = "../page" }
cosmic-settings-accessibility-subscription = { path = "../subscriptions/accessibility", optional = true }
cosmic-settings-a11y-manager-subscription = { path = "../subscriptions/a11y-manager", optional = true }
@ -40,7 +40,7 @@ cosmic-settings-sound-subscription = { path = "../subscriptions/sound", optional
"auto-profile-init",
] }
cosmic-settings-wallpaper = { path = "../pages/wallpapers" }
cosmic-settings-daemon-config = { git = "https://github.com/pop-os/cosmic-settings-daemon", optional = true }
cosmic-settings-daemon-config = { path = "../../cosmic-settings-daemon/cosmic-settings-daemon-config", optional = true }
derive_setters = "0.1.9"
dirs = "6.0.0"
eyre = "0.6.12"