yoda: rebase onto libcosmic-yoda via path deps + macOS controls toggle
Fresh rewiring from upstream master (78644a3) — the previous attempt on051f4f9was 137 commits behind and hit API drift (cosmic::iced_futures, Subscription::run_with_id). Upstream master uses the newer API (cosmic::iced::stream + Subscription::run_with) which our libcosmic-yoda already supports. Yoda wiring: - [workspace.dependencies.libcosmic] (git pop-os) -> libcosmic-yoda { path, wayland } - cosmic-config + iced_winit workspace deps -> path to libcosmic-yoda submodule - [patch.pop-os/libcosmic] redirects transitive cosmic-config + cosmic-theme + iced_futures + iced_winit to our local paths so the graph resolves to a single copy (cosmic-bg/comp/idle/panel configs unify cleanly against master) - subscriptions/sound + page + cosmic-settings inner Cargo.toml: libcosmic -> libcosmic-yoda (workspace + direct variants) - winit feature dropped from libcosmic-yoda deps (our fork is Wayland-only) Cherry-picked from leyoda/local/window-controls-position @52ce463: - cosmic-settings/src/pages/desktop/window_management.rs — macOS toggle UI - i18n/en + fr/cosmic_settings.ftl — translations Installed at /usr/bin/cosmic-settings (yoda build, 78 MB). Pre-yoda pacman version kept at /usr/bin/cosmic-settings.pre-yoda-fork.
This commit is contained in:
parent
78644a32e3
commit
999e2ba4e5
8 changed files with 54 additions and 49 deletions
|
|
@ -10,7 +10,7 @@ publish = true
|
|||
cosmic-pipewire = { path = "../../crates/cosmic-pipewire" }
|
||||
futures = "0.3.32"
|
||||
intmap = "3.1.3"
|
||||
libcosmic = { git = "https://github.com/pop-os/libcosmic", default-features = false }
|
||||
libcosmic-yoda = { path = "/home/lionel/Devels/libcosmic", default-features = false }
|
||||
numtoa = "1.0.0-alpha1"
|
||||
rustix = "1.1.3"
|
||||
tokio = { version = "1.49.0", features = ["process", "rt", "time"] }
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue