From 542d9432117452213f64b409d32130d024b2ea65 Mon Sep 17 00:00:00 2001
From: Lionel DARNIS <lionel@wopr.io>
Date: Fri, 31 Jul 2026 12:14:30 +0200
Subject: [PATCH] chore: normalize the libcosmic-yoda dependency idiom

Key the local libcosmic fork as `cosmic` with `package =
"libcosmic-yoda"` rather than keying it by package name, so every repo
in the local stack declares it the same way. The extern name stays
`cosmic` either way, so no source change is needed; the feature strings
move with the key.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
---
 Cargo.lock | 57 ++++++++++++++++++++++++++++++++++++++++--------------
 Cargo.toml |  9 +++++----
 2 files changed, 48 insertions(+), 18 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b5d7071..8ad46b4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1314,7 +1314,20 @@ name = "cosmic-client-toolkit"
 version = "0.2.0"
 dependencies = [
  "bitflags 2.13.0",
- "cosmic-protocols",
+ "cosmic-protocols 0.2.0",
+ "libc",
+ "smithay-client-toolkit",
+ "wayland-client",
+ "wayland-protocols",
+]
+
+[[package]]
+name = "cosmic-client-toolkit"
+version = "0.2.0"
+source = "git+https://github.com/pop-os/cosmic-protocols?rev=c253ec1#c253ec1d6804afbcdf250f5cc37ae1194bba7bd2"
+dependencies = [
+ "bitflags 2.13.0",
+ "cosmic-protocols 0.2.0 (git+https://github.com/pop-os/cosmic-protocols?rev=c253ec1)",
  "libc",
  "smithay-client-toolkit",
  "wayland-client",
@@ -1351,7 +1364,7 @@ dependencies = [
 
 [[package]]
 name = "cosmic-edit"
-version = "1.2.0"
+version = "1.3.0"
 dependencies = [
  "cosmic-files",
  "cosmic-syntax-theme",
@@ -1382,13 +1395,13 @@ dependencies = [
 
 [[package]]
 name = "cosmic-files"
-version = "1.0.14"
+version = "1.3.0"
 dependencies = [
  "anyhow",
  "atomic_float",
  "bstr",
  "compio",
- "cosmic-client-toolkit",
+ "cosmic-client-toolkit 0.2.0 (git+https://github.com/pop-os/cosmic-protocols?rev=c253ec1)",
  "dirs 6.0.0",
  "filetime",
  "flate2",
@@ -1422,6 +1435,7 @@ dependencies = [
  "rust-embed",
  "rustc-hash 2.1.2",
  "serde",
+ "sha2 0.10.9",
  "shlex 1.3.0",
  "slotmap",
  "tar",
@@ -1466,6 +1480,20 @@ dependencies = [
  "wayland-server",
 ]
 
+[[package]]
+name = "cosmic-protocols"
+version = "0.2.0"
+source = "git+https://github.com/pop-os/cosmic-protocols?rev=c253ec1#c253ec1d6804afbcdf250f5cc37ae1194bba7bd2"
+dependencies = [
+ "bitflags 2.13.0",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-protocols",
+ "wayland-protocols-wlr",
+ "wayland-scanner",
+ "wayland-server",
+]
+
 [[package]]
 name = "cosmic-settings-daemon"
 version = "0.1.1-yoda.1"
@@ -3094,7 +3122,7 @@ version = "0.14.0"
 dependencies = [
  "bitflags 2.13.0",
  "bytes",
- "cosmic-client-toolkit",
+ "cosmic-client-toolkit 0.2.0",
  "dnd",
  "glam",
  "lilt",
@@ -3178,7 +3206,7 @@ name = "iced_runtime"
 version = "0.14.0"
 dependencies = [
  "bytes",
- "cosmic-client-toolkit",
+ "cosmic-client-toolkit 0.2.0",
  "dnd",
  "iced_core",
  "iced_futures",
@@ -3209,7 +3237,7 @@ version = "0.14.0"
 dependencies = [
  "bitflags 2.13.0",
  "bytemuck",
- "cosmic-client-toolkit",
+ "cosmic-client-toolkit 0.2.0",
  "cryoglyph",
  "futures",
  "glam",
@@ -3234,7 +3262,7 @@ dependencies = [
 name = "iced_widget"
 version = "0.14.2"
 dependencies = [
- "cosmic-client-toolkit",
+ "cosmic-client-toolkit 0.2.0",
  "dnd",
  "iced_renderer",
  "iced_runtime",
@@ -3251,7 +3279,7 @@ dependencies = [
 name = "iced_winit"
 version = "0.14.0"
 dependencies = [
- "cosmic-client-toolkit",
+ "cosmic-client-toolkit 0.2.0",
  "cursor-icon",
  "dnd",
  "iced_debug",
@@ -4321,7 +4349,7 @@ dependencies = [
  "apply",
  "ashpd 0.12.3",
  "auto_enums",
- "cosmic-client-toolkit",
+ "cosmic-client-toolkit 0.2.0",
  "cosmic-config",
  "cosmic-freedesktop-icons",
  "cosmic-settings-daemon",
@@ -7237,14 +7265,15 @@ dependencies = [
 
 [[package]]
 name = "trash"
-version = "5.2.2"
-source = "git+https://github.com/jackpot51/trash-rs.git?branch=cosmic#a225f753a88e722aeeb27bb2fb00144739911035"
+version = "5.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7602e0c7d66ec2d92a8c917219fbc7894039efa2063b9064260110828a356f46"
 dependencies = [
  "chrono",
  "libc",
  "log",
- "objc2 0.5.2",
- "objc2-foundation 0.2.2",
+ "objc2 0.6.4",
+ "objc2-foundation 0.3.2",
  "once_cell",
  "percent-encoding",
  "scopeguard",
diff --git a/Cargo.toml b/Cargo.toml
index bf9eb1d..728f8c7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -44,7 +44,8 @@ version = "0.19"
 features = ["syntect", "vi"]
 
 # Yoda fork.
-[dependencies.libcosmic-yoda]
+[dependencies.cosmic]
+package = "libcosmic-yoda"
 path = "../libcosmic"
 default-features = false
 #TODO: a11y feature crashes file choser dialog
@@ -58,10 +59,10 @@ xdgen = "0.1"
 
 [features]
 default = ["dbus-config", "gvfs", "wgpu", "wayland"]
-dbus-config = ["libcosmic-yoda/dbus-config"]
+dbus-config = ["cosmic/dbus-config"]
 gvfs = ["cosmic-files/gvfs"]
-wgpu = ["libcosmic-yoda/wgpu", "cosmic-files/wgpu"]
-wayland = ["libcosmic-yoda/wayland", "cosmic-files/wayland"]
+wgpu = ["cosmic/wgpu", "cosmic-files/wgpu"]
+wayland = ["cosmic/wayland", "cosmic-files/wayland"]
 
 [profile.release-with-debug]
 inherits = "release"