feat(yoda): Wayland-only cut — drop winit and x11 features
Part of the yoda fork direction: libcosmic-yoda is Wayland-only going forward. Cargo.toml changes: - default features: remove winit, x11, iced-wayland, multi-window -> add wayland - applet feature: remove winit dep - merge iced-wayland into wayland (simpler feature graph) - remove winit, winit_debug, winit_tokio, winit_wgpu, x11, iced-wayland features - keep iced_winit dep (it's a misnomer — also hosts the wayland/cctk runtime) Workspace: - examples/* excluded (many depend on winit/x11) — revisited in a later phase Behavior: - Library builds clean in release with default features (cargo check + cargo build --release --lib OK) - 58 lines in src/ gated on feature "winit" become unreachable (dead-code warnings — cleanup deferred) - 108 lines gated on feature "wayland" now always active via default --all-features is known-broken because tokio/async-std/smol are mutually exclusive — this is pre-existing, not a Phase 2 regression.
This commit is contained in:
parent
255cf7cc0b
commit
8701aa31d8
1 changed files with 7 additions and 18 deletions
25
Cargo.toml
25
Cargo.toml
|
|
@ -9,12 +9,10 @@ name = "cosmic"
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
default = [
|
default = [
|
||||||
"winit",
|
|
||||||
"tokio",
|
"tokio",
|
||||||
"a11y",
|
"a11y",
|
||||||
"dbus-config",
|
"dbus-config",
|
||||||
"x11",
|
"wayland",
|
||||||
"iced-wayland",
|
|
||||||
"multi-window",
|
"multi-window",
|
||||||
]
|
]
|
||||||
advanced-shaping = ["iced/advanced-shaping"]
|
advanced-shaping = ["iced/advanced-shaping"]
|
||||||
|
|
@ -35,7 +33,6 @@ animated-image = [
|
||||||
autosize = []
|
autosize = []
|
||||||
applet = [
|
applet = [
|
||||||
"autosize",
|
"autosize",
|
||||||
"winit",
|
|
||||||
"wayland",
|
"wayland",
|
||||||
"tokio",
|
"tokio",
|
||||||
"cosmic-panel-config",
|
"cosmic-panel-config",
|
||||||
|
|
@ -81,32 +78,24 @@ tokio = [
|
||||||
"cosmic-config/tokio",
|
"cosmic-config/tokio",
|
||||||
]
|
]
|
||||||
# Tokio async runtime
|
# Tokio async runtime
|
||||||
# Wayland window support
|
# Wayland window support (yoda fork is Wayland-only; this feature is always active in default)
|
||||||
iced-wayland = [
|
wayland = [
|
||||||
"ashpd?/wayland",
|
"ashpd?/wayland",
|
||||||
"autosize",
|
"autosize",
|
||||||
"iced/wayland",
|
"iced/wayland",
|
||||||
"iced_winit/wayland",
|
"iced_winit/wayland",
|
||||||
"surface-message",
|
|
||||||
]
|
|
||||||
wayland = [
|
|
||||||
"iced-wayland",
|
|
||||||
"iced_runtime/cctk",
|
"iced_runtime/cctk",
|
||||||
"iced_winit/cctk",
|
"iced_winit/cctk",
|
||||||
"iced_wgpu/cctk",
|
"iced_wgpu/cctk",
|
||||||
"iced/cctk",
|
"iced/cctk",
|
||||||
"dep:cctk",
|
"dep:cctk",
|
||||||
|
"surface-message",
|
||||||
]
|
]
|
||||||
surface-message = []
|
surface-message = []
|
||||||
# multi-window support
|
# multi-window support
|
||||||
multi-window = []
|
multi-window = []
|
||||||
# Render with wgpu
|
# Render with wgpu
|
||||||
wgpu = ["iced/wgpu", "iced_wgpu"]
|
wgpu = ["iced/wgpu", "iced_wgpu"]
|
||||||
# X11 window support via winit
|
|
||||||
winit = ["iced/winit", "iced_winit"]
|
|
||||||
winit_debug = ["winit", "debug"]
|
|
||||||
winit_tokio = ["winit", "tokio"]
|
|
||||||
winit_wgpu = ["winit", "wgpu"]
|
|
||||||
# Enables XDG portal integrations
|
# Enables XDG portal integrations
|
||||||
xdg-portal = ["ashpd"]
|
xdg-portal = ["ashpd"]
|
||||||
qr_code = ["iced/qr_code"]
|
qr_code = ["iced/qr_code"]
|
||||||
|
|
@ -119,7 +108,6 @@ async-std = [
|
||||||
"zbus?/async-io",
|
"zbus?/async-io",
|
||||||
"iced/async-std",
|
"iced/async-std",
|
||||||
]
|
]
|
||||||
x11 = ["iced/x11", "iced_winit/x11"]
|
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
apply = "0.3.0"
|
apply = "0.3.0"
|
||||||
|
|
@ -246,9 +234,10 @@ members = [
|
||||||
"cosmic-config",
|
"cosmic-config",
|
||||||
"cosmic-config-derive",
|
"cosmic-config-derive",
|
||||||
"cosmic-theme",
|
"cosmic-theme",
|
||||||
"examples/*",
|
|
||||||
]
|
]
|
||||||
exclude = ["iced"]
|
# examples/* excluded — many depend on the removed winit/x11 features.
|
||||||
|
# They will be revisited and adapted in a later phase.
|
||||||
|
exclude = ["iced", "examples"]
|
||||||
|
|
||||||
[workspace.dependencies]
|
[workspace.dependencies]
|
||||||
dirs = "6.0.0"
|
dirs = "6.0.0"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue