Merge upstream/master (COSMIC 1.6) into main
Aligne le fork sur epoch-1.6.0 (63 commits amont) en preservant les 19 commits yoda. Resolutions notables : - les cfg `all(feature = "wayland", target_os = "linux")` deviennent l alias `wayland_platform` introduit en amont ; il exclut winit comme le faisait le patch yoda45eaaf16, l intention est donc preservee ; - les features iced `cctk` ont ete renommees `wayland` en amont, la feature `wayland` locale est adaptee ; `winit` reste un marqueur vide et `iced/winit` est liste explicitement ; - cctk/ashpd gardent leurs chemins locaux dans la section conditionnelle unix introduite en amont ; - la garde anti-crashc0b653f5(context_menu non assigne) est conservee par-dessus la nouvelle structure amont ; - traductions ca/oc restaurees depuis amont. Le submodule iced suit (merge + correctif du cfg cctk residuel). Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
commit
9535ada4d0
60 changed files with 3187 additions and 1528 deletions
26
Cargo.toml
26
Cargo.toml
|
|
@ -74,6 +74,7 @@ serde-keycode = ["iced_core/serde"]
|
|||
single-instance = ["zbus/blocking-api", "ron"]
|
||||
# smol async runtime
|
||||
smol = ["dep:smol", "iced/smol", "zbus?/async-io", "rfd?/async-std"]
|
||||
# Tokio async runtime
|
||||
tokio = [
|
||||
"dep:tokio",
|
||||
"ashpd?/tokio",
|
||||
|
|
@ -87,19 +88,22 @@ tokio = [
|
|||
# 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.
|
||||
# COSMIC 1.5/1.6 renamed the iced `cctk` features to `wayland`; the local
|
||||
# `winit` feature stays empty in this fork, so iced/winit is listed explicitly
|
||||
# instead of going through it.
|
||||
wayland = [
|
||||
"ashpd?/wayland",
|
||||
"autosize",
|
||||
"multi-window",
|
||||
"surface-message",
|
||||
"winit",
|
||||
"iced/winit",
|
||||
"iced/wayland",
|
||||
"iced_winit/wayland",
|
||||
"iced_runtime/cctk",
|
||||
"iced_winit/cctk",
|
||||
"iced_wgpu/cctk",
|
||||
"iced/cctk",
|
||||
"iced_runtime/wayland",
|
||||
"iced_wgpu/wayland",
|
||||
"dep:iced_winit",
|
||||
"dep:cctk",
|
||||
"surface-message",
|
||||
]
|
||||
surface-message = []
|
||||
# multi-window support
|
||||
|
|
@ -126,11 +130,9 @@ 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 = { workspace = true, optional = true }
|
||||
auto_enums = "0.8.8"
|
||||
cctk = { path = "../cosmic-protocols/client-toolkit", package = "cosmic-client-toolkit", optional = true }
|
||||
jiff = "0.2"
|
||||
cosmic-config = { path = "cosmic-config" }
|
||||
cosmic-settings-config = { path = "../cosmic-settings-daemon/config", optional = true }
|
||||
|
|
@ -176,7 +178,9 @@ ron = { workspace = true, optional = true }
|
|||
enumflags2 = "0.7.12"
|
||||
|
||||
# Enable DBus feature on Linux targets
|
||||
[target.'cfg(target_os = "linux")'.dependencies]
|
||||
[target.'cfg(all(unix, not(any(target_os = "redox", target_family = "wasm", target_os = "android", target_vendor = "apple"))))'.dependencies]
|
||||
cctk = { path = "../cosmic-protocols/client-toolkit", package = "cosmic-client-toolkit", optional = true }
|
||||
ashpd = { version = "0.12.3", default-features = false, optional = true }
|
||||
cosmic-config = { path = "cosmic-config", features = ["dbus"] }
|
||||
cosmic-settings-daemon = { path = "../dbus-settings-bindings/cosmic-settings-daemon" }
|
||||
zbus = { version = "5.14.0", default-features = false }
|
||||
|
|
@ -302,3 +306,9 @@ opt-level = 3
|
|||
|
||||
[dev-dependencies]
|
||||
tempfile = "3.27.0"
|
||||
|
||||
[workspace.package]
|
||||
edition = "2024"
|
||||
|
||||
[build-dependencies]
|
||||
build_helpers = { path = "./iced/build_helpers" }
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue