merge: epoch-1.9.0 d'upstream
# Conflicts: # Cargo.lock # Cargo.toml
This commit is contained in:
commit
647332f1a4
15 changed files with 1217 additions and 787 deletions
|
|
@ -18,6 +18,7 @@ cosmic-comp-config.workspace = true
|
|||
cosmic-config = { workspace = true, features = ["calloop", "macro"] }
|
||||
cosmic-greeter-config.workspace = true
|
||||
cosmic-greeter-daemon = { path = "daemon" }
|
||||
cosmic-osk-config = { git = "https://github.com/pop-os/cosmic-osk" }
|
||||
dirs = "6"
|
||||
cosmic = { package = "libcosmic-yoda", path = "../libcosmic", default-features = false, features = [
|
||||
"advanced-shaping",
|
||||
|
|
@ -89,6 +90,7 @@ image = { version = "0.25", default-features = false, features = [
|
|||
] }
|
||||
# JPEG-XL support
|
||||
jxl-oxide = { version = "0.12.6", features = ["image"] }
|
||||
enumflags2 = "0.7.12"
|
||||
|
||||
[dependencies.greetd_ipc]
|
||||
version = "0.10.3"
|
||||
|
|
@ -171,8 +173,8 @@ iced_widget = { path = "../libcosmic/iced/widget" }
|
|||
iced_winit = { path = "../libcosmic/iced/winit" }
|
||||
|
||||
[patch."https://github.com/pop-os/cosmic-protocols"]
|
||||
cosmic-protocols = { path = "../cosmic-protocols" }
|
||||
cosmic-client-toolkit = { path = "../cosmic-protocols/client-toolkit" }
|
||||
cosmic-protocols = { path = "../cosmic-protocols" }
|
||||
|
||||
[patch."https://github.com/pop-os/cosmic-settings-daemon"]
|
||||
cosmic-settings-config = { path = "../cosmic-settings-daemon/config" }
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue