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

fix: resolve rebase conflicts and fix package name

Browse source
This commit is contained in:
Lionel DARNIS 2026-07-22 15:21:58 +02:00
parent e6173b93ca
commit d1849f639b
5 changed files with 24 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Cargo.toml
View file

@ -43,7 +43,7 @@ iced_tiny_skia = { path = "../libcosmic/iced/tiny_skia" }
iced_graphics = { path = "../libcosmic/iced/graphics", features = ["geometry"] }
indexmap = "2.13"
keyframe = "1.1.1"
cosmic = { package = "libcosmic-yoda", path = "../libcosmic", default-features = false, features = [
cosmic = { package = "libcosmic", path = "../libcosmic", default-features = false, features = [
"tokio",
"wayland",
"multi-window",
@ -145,7 +145,7 @@ inherits = "release"
[profile.release]
lto = "fat"
[patch('https://github.com/pop-os/libcosmic')]
[patch."https://github.com/pop-os/libcosmic"]
cosmic-config = { path = "../libcosmic/cosmic-config" }
cosmic-theme = { path = "../libcosmic/cosmic-theme" }
iced = { path = "../libcosmic/iced" }
@ -160,20 +160,18 @@ iced_wgpu = { path = "../libcosmic/iced/wgpu" }
iced_widget = { path = "../libcosmic/iced/widget" }
iced_winit = { path = "../libcosmic/iced/winit" }
[patch('https://github.com/pop-os/cosmic-protocols')]
[patch."https://github.com/pop-os/cosmic-protocols"]
cosmic-protocols = { path = "../cosmic-protocols" }
cosmic-client-toolkit = { path = "../cosmic-protocols/client-toolkit" }
[patch('https://github.com/pop-os/cosmic-settings-daemon')]
[patch."https://github.com/pop-os/cosmic-settings-daemon"]
cosmic-settings-config = { path = "../cosmic-settings-daemon/config" }
cosmic-settings-daemon-config = { path = "../cosmic-settings-daemon/cosmic-settings-daemon-config" }
[patch('https://github.com/pop-os/cosmic-text.git')]
cosmic-text = { path = "../cosmic-text" }
[patch.'https://github.com/pop-os/cosmic-text.git']
[patch."https://github.com/pop-os/cosmic-text.git"]
cosmic-text = { path = "../cosmic-text" }
[patch('https://forge.aditua.com/leyoda/window_clipboard.git')]
[patch."https://forge.aditua.com/leyoda/window_clipboard.git"]
window_clipboard = { path = "../window_clipboard" }
dnd = { path = "../window_clipboard/dnd" }
mime = { path = "../window_clipboard/mime" }