leyoda/cosmic-edit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

yoda: rewire onto libcosmic-yoda + leyoda/cosmic-files paths

Browse source 
- 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:
Lionel DARNIS 2026-04-23 15:43:04 +02:00 • committed by Lionel DARNIS
parent 2600c6d38a
commit 6effc415e1
1 changed files with 9 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Cargo.toml
View file

@ -33,7 +33,7 @@ i18n-embed-fl = "0.10"
rust-embed = "8" rust-embed = "8"
[dependencies.cosmic-files] [dependencies.cosmic-files]
git = "https://github.com/pop-os/cosmic-files.git" path = "../cosmic-files"
default-features = false default-features = false
[dependencies.cosmic-syntax-theme] [dependencies.cosmic-syntax-theme]
@ -43,11 +43,12 @@ git = "https://github.com/pop-os/cosmic-syntax-theme.git"
version = "0.19" version = "0.19"
features = ["syntect", "vi"] features = ["syntect", "vi"]
[dependencies.libcosmic] # Yoda fork.
git = "https://github.com/pop-os/libcosmic.git" [dependencies.libcosmic-yoda]
path = "../libcosmic"
default-features = false default-features = false
#TODO: a11y feature crashes file choser dialog #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] [target.'cfg(unix)'.dependencies]
fork = "0.2" fork = "0.2"
@ -57,10 +58,10 @@ xdgen = "0.1"
[features] [features]
default = ["dbus-config", "gvfs", "wgpu", "wayland"] default = ["dbus-config", "gvfs", "wgpu", "wayland"]
dbus-config = ["libcosmic/dbus-config"] dbus-config = ["libcosmic-yoda/dbus-config"]
gvfs = ["cosmic-files/gvfs"] gvfs = ["cosmic-files/gvfs"]
wgpu = ["libcosmic/wgpu", "cosmic-files/wgpu"] wgpu = ["libcosmic-yoda/wgpu", "cosmic-files/wgpu"]
wayland = ["libcosmic/wayland", "cosmic-files/wayland"] wayland = ["libcosmic-yoda/wayland", "cosmic-files/wayland"]
[profile.release-with-debug] [profile.release-with-debug]
inherits = "release" inherits = "release"
@ -70,9 +71,4 @@ debug = true
onig = { git = "https://github.com/rust-onig/rust-onig.git", branch = "main" } 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" } onig_sys = { git = "https://github.com/rust-onig/rust-onig.git", branch = "main" }
[patch.'https://github.com/pop-os/libcosmic'] # Yoda: [patch] block for libcosmic removed — direct path deps now.
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" }