diff --git a/Cargo.lock b/Cargo.lock index dce2c01..4702a1c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1498,7 +1498,6 @@ dependencies = [ [[package]] name = "cosmic-text" version = "0.19.0" -source = "git+https://forge.aditua.com/leyoda/cosmic-text.git?branch=local%2Fpr-503#63072bbe29a1657d82cd3deb5db45070404ec7a1" dependencies = [ "bitflags 2.11.1", "fontdb", diff --git a/Cargo.toml b/Cargo.toml index 5e4d2c0..d045153 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -151,8 +151,9 @@ tokio = { version = "1", features = ["rt", "macros"] } # since nothing in the dep graph still asks for pop-os/libcosmic.git. # Yoda wayland cut: redirect window_clipboard (x11 gated behind opt-in -# feature) and cosmic-text (PR#503: EAW monospace width fix) to our public -# Forgejo forks. The window_clipboard patch is needed to consolidate the +# feature) to our public Forgejo fork and cosmic-text to the local checkout +# carrying PR#503 plus the EAW monospace width fix. The window_clipboard patch +# is needed to consolidate the # upstream pop-os/libcosmic chain (pulled by cosmic-settings-daemon) onto # the same fork iced uses, otherwise cargo compiles two versions. [patch.'https://github.com/pop-os/window_clipboard.git'] @@ -161,7 +162,7 @@ dnd = { git = "https://forge.aditua.com/leyoda/window_clipboard.git", branch = " mime = { git = "https://forge.aditua.com/leyoda/window_clipboard.git", branch = "yoda-x11-optional" } [patch.'https://github.com/pop-os/cosmic-text.git'] -cosmic-text = { git = "https://forge.aditua.com/leyoda/cosmic-text.git", branch = "local/pr-503" } +cosmic-text = { path = "../cosmic-text" } [workspace] members = ["cosmic-files-applet"]