From a5c0d7a17f637e31b9710607a8992f764eb04a3e Mon Sep 17 00:00:00 2001
From: Lionel DARNIS <lionel@wopr.io>
Date: Sun, 24 May 2026 11:40:51 +0200
Subject: [PATCH] chore: align compositor with local cosmic stack

---
 Cargo.toml                    | 51 ++++++++++++++++++++++++++++-------
 cosmic-comp-config/Cargo.toml |  4 +--
 2 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index f1a04f02..a13c3fb9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,18 +17,18 @@ cosmic-comp-config = { path = "cosmic-comp-config", features = [
     "libdisplay-info",
     "output",
 ] }
-cosmic-config = { git = "https://github.com/pop-os/libcosmic", features = [
+cosmic-config = { path = "../libcosmic/cosmic-config", features = [
     "calloop",
     "macro",
 ] }
-cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", rev = "160b086", default-features = false, features = [
+cosmic-protocols = { path = "../cosmic-protocols", default-features = false, features = [
     "server",
 ] }
-cosmic-settings-config = { git = "https://github.com/pop-os/cosmic-settings-daemon" }
-cosmic-settings-daemon-config = { git = "https://github.com/pop-os/cosmic-settings-daemon", features = [
+cosmic-settings-config = { path = "../cosmic-settings-daemon/config" }
+cosmic-settings-daemon-config = { path = "../cosmic-settings-daemon/cosmic-settings-daemon-config", features = [
     "greeter",
 ] }
-cosmic-text = { git = "https://github.com/pop-os/cosmic-text.git", features = [
+cosmic-text = { git = "https://forge.aditua.com/leyoda/cosmic-text.git", branch = "local/pr-503", features = [
     "shape-run-cache",
 ] }
 libdisplay-info = "0.3.0"
@@ -39,10 +39,14 @@ i18n-embed = { version = "0.16", features = [
     "desktop-requester",
 ] }
 i18n-embed-fl = "0.10"
-iced_tiny_skia = { git = "https://github.com/pop-os/libcosmic" }
+iced_tiny_skia = { path = "../libcosmic/iced/tiny_skia" }
 indexmap = "2.13"
 keyframe = "1.1.1"
-libcosmic = { git = "https://github.com/pop-os/libcosmic", default-features = false }
+cosmic = { package = "libcosmic-yoda", path = "../libcosmic", default-features = false, features = [
+    "tokio",
+    "wayland",
+    "multi-window",
+] }
 libsystemd = { version = "0.7", optional = true }
 log-panics = { version = "2", features = ["with-backtrace"] }
 ordered-float = "5.1"
@@ -138,9 +142,36 @@ inherits = "release"
 [profile.release]
 lto = "fat"
 
-[patch."https://github.com/pop-os/cosmic-protocols"]
-cosmic-protocols = { git = "https://github.com/pop-os//cosmic-protocols", branch = "main" }
-cosmic-client-toolkit = { git = "https://github.com/pop-os//cosmic-protocols", branch = "main" }
+[patch.'https://github.com/pop-os/libcosmic']
+cosmic-config = { path = "../libcosmic/cosmic-config" }
+cosmic-theme = { path = "../libcosmic/cosmic-theme" }
+iced = { path = "../libcosmic/iced" }
+iced_accessibility = { path = "../libcosmic/iced/accessibility" }
+iced_core = { path = "../libcosmic/iced/core" }
+iced_futures = { path = "../libcosmic/iced/futures" }
+iced_graphics = { path = "../libcosmic/iced/graphics" }
+iced_renderer = { path = "../libcosmic/iced/renderer" }
+iced_runtime = { path = "../libcosmic/iced/runtime" }
+iced_tiny_skia = { path = "../libcosmic/iced/tiny_skia" }
+iced_wgpu = { path = "../libcosmic/iced/wgpu" }
+iced_widget = { path = "../libcosmic/iced/widget" }
+iced_winit = { path = "../libcosmic/iced/winit" }
+
+[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 = { path = "../cosmic-settings-daemon/config" }
+cosmic-settings-daemon-config = { path = "../cosmic-settings-daemon/cosmic-settings-daemon-config" }
+
+[patch.'https://github.com/pop-os/cosmic-text.git']
+cosmic-text = { git = "https://forge.aditua.com/leyoda/cosmic-text.git", branch = "local/pr-503" }
+
+[patch.'https://forge.aditua.com/leyoda/window_clipboard.git']
+window_clipboard = { path = "../window_clipboard" }
+dnd = { path = "../window_clipboard/dnd" }
+mime = { path = "../window_clipboard/mime" }
 
 [patch.crates-io]
 smithay = { git = "https://github.com/smithay/smithay.git", rev = "8eb4076" }
diff --git a/cosmic-comp-config/Cargo.toml b/cosmic-comp-config/Cargo.toml
index f01a4bb3..d0225691 100644
--- a/cosmic-comp-config/Cargo.toml
+++ b/cosmic-comp-config/Cargo.toml
@@ -4,8 +4,8 @@ version = "1.0.0"
 edition = "2024"
 
 [dependencies]
-cosmic-config = { git = "https://github.com/pop-os/libcosmic/" }
-cosmic-randr-shell = { git = "https://github.com/pop-os/cosmic-randr/", optional = true }
+cosmic-config = { path = "../../libcosmic/cosmic-config" }
+cosmic-randr-shell = { path = "../../cosmic-randr/shell", optional = true }
 input = "0.10.0"
 libdisplay-info = { version = "0.3.0", optional = true }
 serde = { version = "1", features = ["derive"] }