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

merge: epoch-1.9.0 d'upstream

Browse source 
# Conflicts:
#	Cargo.lock
#	Cargo.toml
#	cosmic-app-list/Cargo.toml
#	cosmic-app-list/cosmic-app-list-config/Cargo.toml
#	cosmic-applet-a11y/Cargo.toml
#	cosmic-applet-audio/Cargo.toml
#	cosmic-applet-battery/Cargo.toml
#	cosmic-applet-bluetooth/Cargo.toml
#	cosmic-applet-input-sources/Cargo.toml
#	cosmic-applet-minimize/Cargo.toml
#	cosmic-applet-network/Cargo.toml
#	cosmic-applet-notifications/Cargo.toml
#	cosmic-applet-power/Cargo.toml
#	cosmic-applet-status-area/Cargo.toml
#	cosmic-applet-tiling/Cargo.toml
#	cosmic-applet-time/Cargo.toml
#	cosmic-applet-workspaces/Cargo.toml
#	cosmic-applets-config/Cargo.toml
#	cosmic-applets/Cargo.toml
#	cosmic-applets/src/main.rs
#	cosmic-panel-button/Cargo.toml
This commit is contained in:
Lionel DARNIS 2026-09-24 20:50:47 +02:00
commit e13e162e53
64 changed files with 1223 additions and 789 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Cargo.toml
View file

@ -10,6 +10,7 @@ members = [
"cosmic-applet-minimize",
"cosmic-applet-network",
"cosmic-applet-notifications",
"cosmic-applet-osk",
"cosmic-applet-power",
"cosmic-applet-status-area",
"cosmic-applet-tiling",
@ -27,6 +28,7 @@ resolver = "3"
anyhow = "1.0.102"
cctk = { package = "cosmic-client-toolkit", path = "../cosmic-protocols/client-toolkit" }
cosmic-applets-config = { path = "cosmic-applets-config" }
cosmic-osk-config = { git = "https://github.com/pop-os/cosmic-osk" }
cosmic-protocols = { path = "../cosmic-protocols", default-features = false, features = [
"client",
]}
@ -122,6 +124,12 @@ cosmic-settings-airplane-mode-subscription = { path = "/home/lionel/Projets/COSM
[patch."https://github.com/pop-os/cosmic-text.git"]
cosmic-text = { path = "../cosmic-text" }
# Yoda: certaines crates amont 1.9 ecrivent l'URL avec "//" ; cargo la traite
# comme une source distincte, il faut donc la patcher aussi.
[patch."https://github.com/pop-os/cosmic-protocols//"]
cosmic-protocols = { path = "/home/lionel/Projets/COSMIC/cosmic-protocols" }
cosmic-client-toolkit = { path = "/home/lionel/Projets/COSMIC/cosmic-protocols/client-toolkit" }
# [patch.'https://github.com/pop-os/dbus-settings-bindings']
# cosmic-dbus-networkmanager = { path = "../dbus-settings-bindings/networkmanager" }
# upower_dbus = { path = "../dbus-settings-bindings/upower" }