leyoda
553c05e2f0
Fresh rewiring from upstream master (78644a3) — the previous attempt on051f4f9was 137 commits behind and hit API drift (cosmic::iced_futures, Subscription::run_with_id). Upstream master uses the newer API (cosmic::iced::stream + Subscription::run_with) which our libcosmic-yoda already supports. Yoda wiring: - [workspace.dependencies.libcosmic] (git pop-os) -> libcosmic-yoda { path, wayland } - cosmic-config + iced_winit workspace deps -> path to libcosmic-yoda submodule - [patch.pop-os/libcosmic] redirects transitive cosmic-config + cosmic-theme + iced_futures + iced_winit to our local paths so the graph resolves to a single copy (cosmic-bg/comp/idle/panel configs unify cleanly against master) - subscriptions/sound + page + cosmic-settings inner Cargo.toml: libcosmic -> libcosmic-yoda (workspace + direct variants) - winit feature dropped from libcosmic-yoda deps (our fork is Wayland-only) Cherry-picked from leyoda/local/window-controls-position @52ce463: - cosmic-settings/src/pages/desktop/window_management.rs — macOS toggle UI - i18n/en + fr/cosmic_settings.ftl — translations Installed at /usr/bin/cosmic-settings (yoda build, 78 MB). Pre-yoda pacman version kept at /usr/bin/cosmic-settings.pre-yoda-fork.
101 lines
3.6 KiB
TOML
101 lines
3.6 KiB
TOML
[workspace]
|
|
members = ["cosmic-settings", "crates/*", "page", "pages/*", "subscriptions/*"]
|
|
default-members = ["cosmic-settings"]
|
|
resolver = "3"
|
|
|
|
[workspace.package]
|
|
rust-version = "1.93"
|
|
|
|
[workspace.dependencies]
|
|
cosmic-randr = { path = "../cosmic-randr/lib" }
|
|
tokio = { version = "1.49.0", features = ["macros"] }
|
|
# Yoda fork: direct path dep on iced_winit in libcosmic-yoda's submodule.
|
|
iced_winit = { path = "/home/lionel/Projets/COSMIC/libcosmic/iced/winit", default-features = false }
|
|
|
|
# Yoda fork — libcosmic-yoda by path, replaces upstream git dep.
|
|
[workspace.dependencies.libcosmic-yoda]
|
|
features = [
|
|
"dbus-config",
|
|
"desktop",
|
|
"multi-window",
|
|
"wayland",
|
|
"tokio",
|
|
"qr_code",
|
|
]
|
|
path = "/home/lionel/Projets/COSMIC/libcosmic"
|
|
|
|
[workspace.dependencies.cosmic-config]
|
|
path = "/home/lionel/Projets/COSMIC/libcosmic/cosmic-config"
|
|
|
|
[workspace.dependencies.cosmic-bg-config]
|
|
path = "../cosmic-bg/config"
|
|
|
|
[workspace.dependencies.cosmic-comp-config]
|
|
path = "../cosmic-comp/cosmic-comp-config"
|
|
features = ["output"]
|
|
|
|
[workspace.dependencies.cosmic-idle-config]
|
|
path = "../cosmic-idle/cosmic-idle-config"
|
|
|
|
[workspace.dependencies.cosmic-panel-config]
|
|
path = "../cosmic-panel/cosmic-panel-config"
|
|
|
|
[workspace.dependencies.cosmic-randr-shell]
|
|
path = "../cosmic-randr/shell"
|
|
|
|
[workspace.dependencies.sctk]
|
|
version = "0.20"
|
|
package = "smithay-client-toolkit"
|
|
|
|
[profile.dev]
|
|
opt-level = 3
|
|
lto = "off"
|
|
|
|
[profile.release]
|
|
opt-level = 3
|
|
lto = "thin"
|
|
panic = "abort"
|
|
|
|
[profile.release-with-debug]
|
|
inherits = "release"
|
|
lto = "off"
|
|
debug = true
|
|
|
|
# [patch.'https://github.com/pop-os/cosmic-text']
|
|
# cosmic-text = { git = "https://github.com/pop-os/cosmic-text//", rev = "b017d7c" }
|
|
|
|
[patch.'https://github.com/pop-os/cosmic-protocols']
|
|
cosmic-protocols = { path = "../cosmic-protocols" }
|
|
cosmic-client-toolkit = { path = "../cosmic-protocols/client-toolkit" }
|
|
|
|
# [patch.'https://github.com/pop-os/cosmic-settings-daemon']
|
|
# cosmic-settings-config = { git = "https://github.com/pop-os/cosmic-settings-daemon//", branch = "input_nobuild" }
|
|
|
|
# Yoda fork: redirect every transitive dep that asks for pop-os/libcosmic
|
|
# (cosmic-bg-config, cosmic-comp-config, cosmic-idle-config, cosmic-panel-config,
|
|
# cosmic-settings-config, cosmic-settings-daemon-config) to our local paths so
|
|
# the whole graph resolves against a single cosmic-config / cosmic-theme / iced_*.
|
|
[patch.'https://github.com/pop-os/libcosmic']
|
|
cosmic-config = { path = "/home/lionel/Projets/COSMIC/libcosmic/cosmic-config" }
|
|
cosmic-theme = { path = "/home/lionel/Projets/COSMIC/libcosmic/cosmic-theme" }
|
|
iced_futures = { path = "/home/lionel/Projets/COSMIC/libcosmic/iced/futures" }
|
|
iced_winit = { path = "/home/lionel/Projets/COSMIC/libcosmic/iced/winit" }
|
|
|
|
[patch.'https://github.com/pop-os/cosmic-text.git']
|
|
cosmic-text = { path = "../cosmic-text" }
|
|
|
|
# Yoda wayland cut v5: redirect window_clipboard to the local fork
|
|
# (x11 gated behind opt-in feature).
|
|
[patch.'https://forge.aditua.com/leyoda/window_clipboard.git']
|
|
window_clipboard = { path = "/home/lionel/Projets/COSMIC/window_clipboard" }
|
|
dnd = { path = "/home/lionel/Projets/COSMIC/window_clipboard/dnd" }
|
|
mime = { path = "/home/lionel/Projets/COSMIC/window_clipboard/mime" }
|
|
|
|
# [patch.'https://github.com/pop-os/dbus-settings-bindings']
|
|
# cosmic-dbus-networkmanager = { path = "../dbus-settings-bindings/networkmanager" }
|
|
# upower_dbus = { path = "../dbus-settings-bindings/upower" }
|
|
# nm-secret-agent-manager = { git = "https://github.com/pop-os/dbus-settings-bindings//", branch = "nm-secret-agent" }
|
|
|
|
[patch.crates-io]
|
|
atspi = { git = "https://github.com/wash2/atspi" }
|
|
atspi-common = { git = "https://github.com/wash2/atspi" }
|