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
27
Cargo.lock
generated
27
Cargo.lock
generated
|
|
@ -1391,7 +1391,6 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "cosmic-config"
|
||||
version = "1.0.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67"
|
||||
dependencies = [
|
||||
"atomicwrites",
|
||||
"cosmic-config-derive",
|
||||
|
|
@ -1412,7 +1411,6 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "cosmic-config-derive"
|
||||
version = "1.0.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67"
|
||||
dependencies = [
|
||||
"quote",
|
||||
"syn 2.0.117",
|
||||
|
|
@ -1588,7 +1586,7 @@ dependencies = [
|
|||
"itertools 0.14.0",
|
||||
"itoa",
|
||||
"jiff",
|
||||
"libcosmic",
|
||||
"libcosmic-yoda",
|
||||
"locale1",
|
||||
"locales-rs",
|
||||
"mime 0.3.17",
|
||||
|
|
@ -1737,7 +1735,7 @@ version = "1.0.7"
|
|||
dependencies = [
|
||||
"derive_setters",
|
||||
"downcast-rs 2.0.2",
|
||||
"libcosmic",
|
||||
"libcosmic-yoda",
|
||||
"regex",
|
||||
"slab",
|
||||
"slotmap",
|
||||
|
|
@ -1762,7 +1760,7 @@ dependencies = [
|
|||
"cosmic-pipewire",
|
||||
"futures",
|
||||
"intmap",
|
||||
"libcosmic",
|
||||
"libcosmic-yoda",
|
||||
"numtoa",
|
||||
"rustix 1.1.4",
|
||||
"tokio",
|
||||
|
|
@ -1827,7 +1825,6 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "cosmic-theme"
|
||||
version = "1.0.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67"
|
||||
dependencies = [
|
||||
"almost",
|
||||
"configparser",
|
||||
|
|
@ -3250,7 +3247,6 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "iced"
|
||||
version = "0.14.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67"
|
||||
dependencies = [
|
||||
"dnd",
|
||||
"iced_accessibility",
|
||||
|
|
@ -3271,7 +3267,6 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "iced_accessibility"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67"
|
||||
dependencies = [
|
||||
"accesskit",
|
||||
"accesskit_winit",
|
||||
|
|
@ -3280,7 +3275,6 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "iced_core"
|
||||
version = "0.14.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67"
|
||||
dependencies = [
|
||||
"bitflags 2.11.1",
|
||||
"bytes",
|
||||
|
|
@ -3305,7 +3299,6 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "iced_debug"
|
||||
version = "0.14.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67"
|
||||
dependencies = [
|
||||
"iced_core",
|
||||
"iced_futures",
|
||||
|
|
@ -3315,7 +3308,6 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "iced_futures"
|
||||
version = "0.14.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67"
|
||||
dependencies = [
|
||||
"futures",
|
||||
"iced_core",
|
||||
|
|
@ -3329,7 +3321,6 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "iced_graphics"
|
||||
version = "0.14.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67"
|
||||
dependencies = [
|
||||
"bitflags 2.11.1",
|
||||
"bytemuck",
|
||||
|
|
@ -3350,7 +3341,6 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "iced_program"
|
||||
version = "0.14.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67"
|
||||
dependencies = [
|
||||
"iced_graphics",
|
||||
"iced_runtime",
|
||||
|
|
@ -3359,7 +3349,6 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "iced_renderer"
|
||||
version = "0.14.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67"
|
||||
dependencies = [
|
||||
"iced_graphics",
|
||||
"iced_tiny_skia",
|
||||
|
|
@ -3371,7 +3360,6 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "iced_runtime"
|
||||
version = "0.14.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67"
|
||||
dependencies = [
|
||||
"bytes",
|
||||
"cosmic-client-toolkit",
|
||||
|
|
@ -3387,7 +3375,6 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "iced_tiny_skia"
|
||||
version = "0.14.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67"
|
||||
dependencies = [
|
||||
"bytemuck",
|
||||
"cosmic-text",
|
||||
|
|
@ -3404,7 +3391,6 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "iced_wgpu"
|
||||
version = "0.14.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67"
|
||||
dependencies = [
|
||||
"as-raw-xcb-connection",
|
||||
"bitflags 2.11.1",
|
||||
|
|
@ -3435,7 +3421,6 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "iced_widget"
|
||||
version = "0.14.2"
|
||||
source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67"
|
||||
dependencies = [
|
||||
"cosmic-client-toolkit",
|
||||
"dnd",
|
||||
|
|
@ -3455,7 +3440,6 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "iced_winit"
|
||||
version = "0.14.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67"
|
||||
dependencies = [
|
||||
"cosmic-client-toolkit",
|
||||
"cursor-icon",
|
||||
|
|
@ -4565,9 +4549,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
checksum = "52ff2c0fe9bc6cb6b14a0592c2ff4fa9ceb83eea9db979b0487cd054946a2b8f"
|
||||
|
||||
[[package]]
|
||||
name = "libcosmic"
|
||||
version = "1.0.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#c423ad1bfc25057922406c687f2ddc75ead5ab67"
|
||||
name = "libcosmic-yoda"
|
||||
version = "0.1.0-yoda"
|
||||
dependencies = [
|
||||
"apply",
|
||||
"ashpd 0.12.3",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue