leyoda
8d1d873918
Dep chain audit showed winit, iced_winit and iced_tiny_skia all had
"x11" in their default features. Even though our Wayland-only build
doesn't use any X11 code path, the defaults were propagating through
cargo feature unification — winit-x11, tiny-xlib, x11-dl, etc. were
all being linked.
Fix, at the dep declaration level:
- [dependencies.iced_winit] default-features = false + wayland/wayland-dlopen
- [dependencies.iced_tiny_skia] default-features = false + wayland
- iced submodule's workspace winit = { ..., default-features = false }
Result on cosmic-yoterm binary:
- size: 55.4 MB -> 53.8 MB (-1.6 MB, ~3%)
- winit symbols: 2151 -> 1340 (-811)
- x11 symbols: 1526 -> 503 (-1023)
Remaining x11 footprint (~500 symbols):
- clipboard_x11 / x11rb: window_clipboard pulls both x11 + wayland
backends unconditionally on unix targets. Would need forking
window_clipboard to gate x11 behind a feature.
- tiny-xlib / as-raw-xcb-connection: low-level window-handle bindings
pulled by wgpu/softbuffer even when no X11 windows ever exist.
Dead code at runtime, probably best left alone until wgpu/raw-window-handle
upstream make these optional.
268 lines
7.3 KiB
TOML
268 lines
7.3 KiB
TOML
[package]
|
|
# Yoda fork: hard-renamed. Every consumer (leyoda/cosmic-files fork + each
|
|
# leyoda/cosmic-* app) depends directly on `libcosmic-yoda` by path, bypassing
|
|
# pop-os/libcosmic entirely. No [patch] shenanigans needed — transitive deps
|
|
# that used to ask for `libcosmic` are replaced by deps on our forks that ask
|
|
# for `libcosmic-yoda`.
|
|
name = "libcosmic-yoda"
|
|
version = "0.1.0-yoda.2"
|
|
edition = "2024"
|
|
rust-version = "1.90"
|
|
|
|
[lib]
|
|
name = "cosmic"
|
|
|
|
[features]
|
|
default = [
|
|
"tokio",
|
|
"a11y",
|
|
"dbus-config",
|
|
"wayland",
|
|
"multi-window",
|
|
]
|
|
advanced-shaping = ["iced/advanced-shaping"]
|
|
# Accessibility support
|
|
a11y = ["iced/a11y", "iced_accessibility"]
|
|
# Enable about widget
|
|
about = []
|
|
# Builds support for animated images
|
|
animated-image = [
|
|
"dep:async-fs",
|
|
"image/gif",
|
|
"image/webp",
|
|
"image/png",
|
|
"tokio?/io-util",
|
|
"tokio?/fs",
|
|
]
|
|
# XXX autosize should not be used on winit windows unless dialogs
|
|
autosize = []
|
|
applet = [
|
|
"autosize",
|
|
"wayland",
|
|
"tokio",
|
|
"cosmic-panel-config",
|
|
"ron",
|
|
"multi-window",
|
|
]
|
|
applet-token = ["applet"]
|
|
# Use the cosmic-settings-daemon for config handling on Linux targets
|
|
dbus-config = []
|
|
# Debug features
|
|
debug = ["iced/debug"]
|
|
# Enables pipewire support in ashpd, if ashpd is enabled
|
|
pipewire = ["ashpd?/pipewire"]
|
|
# Enables process spawning helper
|
|
process = ["dep:libc", "dep:rustix"]
|
|
# Use rfd for file dialogs
|
|
rfd = ["dep:rfd"]
|
|
# Enables desktop files helpers
|
|
desktop = [
|
|
"process",
|
|
"dep:cosmic-settings-config",
|
|
"dep:freedesktop-desktop-entry",
|
|
"dep:image-extras",
|
|
"dep:mime",
|
|
"dep:shlex",
|
|
"tokio?/io-util",
|
|
"tokio?/net",
|
|
]
|
|
# Enables launching desktop files inside systemd scopes
|
|
desktop-systemd-scope = ["desktop", "dep:zbus"]
|
|
# Enables keycode serialization
|
|
serde-keycode = ["iced_core/serde"]
|
|
# Prevents multiple separate process instances.
|
|
single-instance = ["zbus/blocking-api", "ron"]
|
|
# smol async runtime
|
|
smol = ["dep:smol", "iced/smol", "zbus?/async-io", "rfd?/async-std"]
|
|
tokio = [
|
|
"dep:tokio",
|
|
"ashpd?/tokio",
|
|
"iced/tokio",
|
|
"rfd?/tokio",
|
|
"zbus?/tokio",
|
|
"cosmic-config/tokio",
|
|
]
|
|
# Tokio async runtime
|
|
# Wayland window support (yoda fork is Wayland-only; always active in default).
|
|
# We still need iced/winit because pop-os/iced hosts the runtime dispatcher
|
|
# (`iced_winit as shell`) there — the name is a misnomer, it's the same crate
|
|
# that provides both the winit path AND the sctk/cctk wayland path.
|
|
wayland = [
|
|
"ashpd?/wayland",
|
|
"autosize",
|
|
"iced/winit",
|
|
"iced/wayland",
|
|
"iced_winit/wayland",
|
|
"iced_runtime/cctk",
|
|
"iced_winit/cctk",
|
|
"iced_wgpu/cctk",
|
|
"iced/cctk",
|
|
"dep:iced_winit",
|
|
"dep:cctk",
|
|
"surface-message",
|
|
]
|
|
surface-message = []
|
|
# multi-window support
|
|
multi-window = []
|
|
# Render with wgpu
|
|
wgpu = ["iced/wgpu", "iced_wgpu"]
|
|
# Compat stubs — kept empty so upstream deps (cosmic-files, cosmic-text, …)
|
|
# that still ask for `winit` / `x11` features resolve cleanly against the
|
|
# yoda fork. Activating them has no effect: no code is gated on these.
|
|
winit = []
|
|
x11 = []
|
|
# Enables XDG portal integrations
|
|
xdg-portal = ["ashpd"]
|
|
qr_code = ["iced/qr_code"]
|
|
markdown = ["iced/markdown"]
|
|
highlighter = ["iced/highlighter"]
|
|
async-std = [
|
|
"dep:async-std",
|
|
"ashpd?/async-std",
|
|
"rfd?/async-std",
|
|
"zbus?/async-io",
|
|
"iced/async-std",
|
|
]
|
|
|
|
[dependencies]
|
|
apply = "0.3.0"
|
|
ashpd = { version = "0.12.3", default-features = false, optional = true }
|
|
async-fs = { version = "2.2", optional = true }
|
|
async-std = { version = "1.13", optional = true }
|
|
auto_enums = "0.8.8"
|
|
cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit", rev = "160b086", optional = true }
|
|
jiff = "0.2"
|
|
cosmic-config = { path = "cosmic-config" }
|
|
cosmic-settings-config = { git = "https://github.com/pop-os/cosmic-settings-daemon", optional = true }
|
|
# Internationalization
|
|
i18n-embed = { version = "0.16.0", features = [
|
|
"fluent-system",
|
|
"desktop-requester",
|
|
] }
|
|
i18n-embed-fl = "0.10"
|
|
rust-embed = "8.11.0"
|
|
css-color = "0.2.8"
|
|
derive_setters = "0.1.9"
|
|
futures = "0.3"
|
|
image = { version = "0.25.10", default-features = false, features = [
|
|
"ico",
|
|
"jpeg",
|
|
"png",
|
|
] }
|
|
image-extras = { version = "0.1.0", default-features = false, features = [
|
|
"xpm",
|
|
"xbm",
|
|
], optional = true }
|
|
libc = { version = "0.2.183", optional = true }
|
|
log = "0.4"
|
|
mime = { version = "0.3.17", optional = true }
|
|
palette = "0.7.6"
|
|
rfd = { version = "0.16.0", default-features = false, features = [
|
|
"xdg-portal",
|
|
], optional = true }
|
|
rustix = { version = "1.1", features = ["pipe", "process"], optional = true }
|
|
serde = { version = "1.0.228", features = ["derive"] }
|
|
slotmap = "1.1.1"
|
|
smol = { version = "2.0.2", optional = true }
|
|
thiserror = "2.0.18"
|
|
taffy = { version = "0.9.2", features = ["grid"] }
|
|
tokio = { version = "1.50.0", optional = true }
|
|
tracing = "0.1.44"
|
|
unicode-segmentation = "1.12"
|
|
url = "2.5.8"
|
|
zbus = { version = "5.14.0", default-features = false, optional = true }
|
|
float-cmp = "0.10.0"
|
|
|
|
# Enable DBus feature on Linux targets
|
|
[target.'cfg(target_os = "linux")'.dependencies]
|
|
cosmic-config = { path = "cosmic-config", features = ["dbus"] }
|
|
cosmic-settings-daemon = { git = "https://github.com/pop-os/dbus-settings-bindings" }
|
|
zbus = { version = "5.14.0", default-features = false }
|
|
|
|
[target.'cfg(all(unix, not(target_os = "macos")))'.dependencies]
|
|
freedesktop-icons = { package = "cosmic-freedesktop-icons", git = "https://github.com/pop-os/freedesktop-icons" }
|
|
freedesktop-desktop-entry = { version = "0.8.1", optional = true }
|
|
shlex = { version = "1.3.0", optional = true }
|
|
|
|
[target.'cfg(any(not(unix), target_os = "macos"))'.dependencies]
|
|
# Used to embed bundled icons for non-unix platforms.
|
|
phf = { version = "0.13.1", features = ["macros"] }
|
|
|
|
[dependencies.cosmic-theme]
|
|
path = "cosmic-theme"
|
|
|
|
[dependencies.iced]
|
|
path = "./iced"
|
|
default-features = false
|
|
features = [
|
|
"advanced",
|
|
"image-without-codecs",
|
|
"lazy",
|
|
"svg",
|
|
"web-colors",
|
|
"tiny-skia",
|
|
]
|
|
|
|
[dependencies.iced_runtime]
|
|
path = "./iced/runtime"
|
|
|
|
[dependencies.iced_renderer]
|
|
path = "./iced/renderer"
|
|
|
|
[dependencies.iced_core]
|
|
path = "./iced/core"
|
|
features = ["serde"]
|
|
|
|
[dependencies.iced_widget]
|
|
path = "./iced/widget"
|
|
features = ["canvas"]
|
|
|
|
[dependencies.iced_futures]
|
|
path = "./iced/futures"
|
|
|
|
[dependencies.iced_accessibility]
|
|
path = "./iced/accessibility"
|
|
optional = true
|
|
|
|
[dependencies.iced_tiny_skia]
|
|
path = "./iced/tiny_skia"
|
|
# Yoda: drop the x11 default → softbuffer no longer pulls tiny-xlib/x11-dl/etc.
|
|
default-features = false
|
|
features = ["wayland"]
|
|
|
|
[dependencies.iced_winit]
|
|
path = "./iced/winit"
|
|
optional = true
|
|
# Yoda: drop the x11 default → winit won't pull winit-x11/tiny-xlib/x11-dl.
|
|
# Keep wayland + wayland-dlopen (default behaviour minus x11).
|
|
default-features = false
|
|
features = ["wayland", "wayland-dlopen"]
|
|
|
|
[dependencies.iced_wgpu]
|
|
path = "./iced/wgpu"
|
|
optional = true
|
|
|
|
[dependencies.cosmic-panel-config]
|
|
git = "https://github.com/pop-os/cosmic-panel"
|
|
# path = "../cosmic-panel/cosmic-panel-config"
|
|
optional = true
|
|
|
|
[dependencies.ron]
|
|
version = "0.12"
|
|
optional = true
|
|
|
|
[workspace]
|
|
members = [
|
|
"cosmic-config",
|
|
"cosmic-config-derive",
|
|
"cosmic-theme",
|
|
]
|
|
# 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]
|
|
dirs = "6.0.0"
|
|
|
|
[dev-dependencies]
|
|
tempfile = "3.27.0"
|