yoda: fork pivot — Wayland-only + ungate winit + soft-fork libcosmic-yoda (squashed)
Squash of 7 yoda commits forming the fork pivot: -255cf7ccrename: libcosmic -> libcosmic-yoda (fork 0.1.0-yoda) -8701aa31feat(yoda): Wayland-only cut — drop winit and x11 features -6736a596yoda: soft-fork pivot — keep Cargo name 'libcosmic' for dep unification -3e23d087yoda: re-apply hard rename — libcosmic -> libcosmic-yoda (0.1.0-yoda) -aec3eb61yoda: ungate remaining winit+wayland combined cfgs -8ab7b158yoda-v2: color_picker Theme ref + context_menu/menu ungate winit -8d1d8739yoda: drop x11 defaults on iced_winit + iced_tiny_skia
This commit is contained in:
parent
10422b8f4a
commit
e3dcdf1fce
101 changed files with 77 additions and 98 deletions
51
Cargo.toml
51
Cargo.toml
|
|
@ -1,6 +1,11 @@
|
|||
[package]
|
||||
name = "libcosmic"
|
||||
version = "1.0.0"
|
||||
# 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.93"
|
||||
|
||||
|
|
@ -9,12 +14,10 @@ name = "cosmic"
|
|||
|
||||
[features]
|
||||
default = [
|
||||
"winit",
|
||||
"tokio",
|
||||
"a11y",
|
||||
"dbus-config",
|
||||
"x11",
|
||||
"iced-wayland",
|
||||
"wayland",
|
||||
"multi-window",
|
||||
]
|
||||
advanced-shaping = ["iced/advanced-shaping"]
|
||||
|
|
@ -35,7 +38,6 @@ animated-image = [
|
|||
autosize = []
|
||||
applet = [
|
||||
"autosize",
|
||||
"winit",
|
||||
"wayland",
|
||||
"tokio",
|
||||
"cosmic-panel-config",
|
||||
|
|
@ -81,32 +83,34 @@ tokio = [
|
|||
"cosmic-config/tokio",
|
||||
]
|
||||
# Tokio async runtime
|
||||
# Wayland window support
|
||||
iced-wayland = [
|
||||
# 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",
|
||||
"surface-message",
|
||||
]
|
||||
wayland = [
|
||||
"iced-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"]
|
||||
# X11 window support via winit
|
||||
winit = ["iced/winit", "iced_winit"]
|
||||
winit_debug = ["winit", "debug"]
|
||||
winit_tokio = ["winit", "tokio"]
|
||||
winit_wgpu = ["winit", "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"]
|
||||
|
|
@ -119,7 +123,6 @@ async-std = [
|
|||
"zbus?/async-io",
|
||||
"iced/async-std",
|
||||
]
|
||||
x11 = ["iced/x11", "iced_winit/x11"]
|
||||
|
||||
[dependencies]
|
||||
apply = "0.3.0"
|
||||
|
|
@ -224,10 +227,17 @@ 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"
|
||||
|
|
@ -243,9 +253,10 @@ members = [
|
|||
"cosmic-config",
|
||||
"cosmic-config-derive",
|
||||
"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]
|
||||
async-std = "1.13"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue