yoda: rewire onto libcosmic-yoda + leyoda/cosmic-files paths
- libcosmic git dep replaced by libcosmic-yoda = { path = ../libcosmic }
- cosmic-files git dep replaced by path = ../cosmic-files (leyoda fork)
- winit feature dropped from libcosmic-yoda deps, wayland added
- feature refs libcosmic/* -> libcosmic-yoda/*
- [patch] block for pop-os/libcosmic removed
Installed at /usr/bin/cosmic-edit. Pre-yoda binary kept as
/usr/bin/cosmic-edit.pre-yoda-fork.
This commit is contained in:
parent
8f906d1762
commit
6acd0a3704
2 changed files with 46 additions and 289 deletions
22
Cargo.toml
22
Cargo.toml
|
|
@ -33,7 +33,7 @@ i18n-embed-fl = "0.10"
|
|||
rust-embed = "8"
|
||||
|
||||
[dependencies.cosmic-files]
|
||||
git = "https://github.com/pop-os/cosmic-files.git"
|
||||
path = "../cosmic-files"
|
||||
default-features = false
|
||||
|
||||
[dependencies.cosmic-syntax-theme]
|
||||
|
|
@ -43,11 +43,12 @@ git = "https://github.com/pop-os/cosmic-syntax-theme.git"
|
|||
git = "https://github.com/pop-os/cosmic-text.git"
|
||||
features = ["syntect", "vi"]
|
||||
|
||||
[dependencies.libcosmic]
|
||||
git = "https://github.com/pop-os/libcosmic.git"
|
||||
# Yoda fork.
|
||||
[dependencies.libcosmic-yoda]
|
||||
path = "../libcosmic"
|
||||
default-features = false
|
||||
#TODO: a11y feature crashes file choser dialog
|
||||
features = ["about", "multi-window", "tokio", "winit", "surface-message"]
|
||||
features = ["about", "multi-window", "tokio", "wayland", "surface-message"]
|
||||
|
||||
[target.'cfg(unix)'.dependencies]
|
||||
fork = "0.2"
|
||||
|
|
@ -57,10 +58,10 @@ xdgen = "0.1"
|
|||
|
||||
[features]
|
||||
default = ["dbus-config", "gvfs", "wgpu", "wayland"]
|
||||
dbus-config = ["libcosmic/dbus-config"]
|
||||
dbus-config = ["libcosmic-yoda/dbus-config"]
|
||||
gvfs = ["cosmic-files/gvfs"]
|
||||
wgpu = ["libcosmic/wgpu", "cosmic-files/wgpu"]
|
||||
wayland = ["libcosmic/wayland", "cosmic-files/wayland"]
|
||||
wgpu = ["libcosmic-yoda/wgpu", "cosmic-files/wgpu"]
|
||||
wayland = ["libcosmic-yoda/wayland", "cosmic-files/wayland"]
|
||||
|
||||
[profile.release-with-debug]
|
||||
inherits = "release"
|
||||
|
|
@ -70,9 +71,4 @@ debug = true
|
|||
onig = { git = "https://github.com/rust-onig/rust-onig.git", branch = "main" }
|
||||
onig_sys = { git = "https://github.com/rust-onig/rust-onig.git", branch = "main" }
|
||||
|
||||
[patch.'https://github.com/pop-os/libcosmic']
|
||||
libcosmic = { path = "../libcosmic" }
|
||||
cosmic-config = { path = "../libcosmic/cosmic-config" }
|
||||
cosmic-theme = { path = "../libcosmic/cosmic-theme" }
|
||||
iced_futures = { path = "../libcosmic/iced/futures" }
|
||||
iced_winit = { path = "../libcosmic/iced/winit" }
|
||||
# Yoda: [patch] block for libcosmic removed — direct path deps now.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue