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
|
|
@ -133,7 +133,7 @@ pub use dbus_activation::DbusActivation;
|
|||
#[cfg(feature = "desktop")]
|
||||
pub mod desktop;
|
||||
|
||||
#[cfg(any(feature = "xdg-portal", feature = "rfd"))]
|
||||
#[cfg(any(xdg_portal, feature = "rfd"))]
|
||||
pub mod dialog;
|
||||
|
||||
pub mod executor;
|
||||
|
|
@ -170,7 +170,7 @@ pub(crate) mod malloc;
|
|||
pub mod process;
|
||||
|
||||
#[doc(inline)]
|
||||
#[cfg(all(feature = "wayland", target_os = "linux"))]
|
||||
#[cfg(wayland_platform)]
|
||||
pub use cctk;
|
||||
|
||||
pub mod surface;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue