From 48a6ec042f119df4262b7ca76978620ec76bd903 Mon Sep 17 00:00:00 2001 From: Michael Aaron Murphy Date: Wed, 8 May 2024 17:37:22 +0200 Subject: [PATCH] fix(cargo): patch override cosmic-protocols --- Cargo.lock | 19 +++---------------- Cargo.toml | 3 +++ 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9890ed4..50dc001 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1208,7 +1208,7 @@ name = "cosmic-client-toolkit" version = "0.1.0" source = "git+https://github.com/pop-os/cosmic-protocols?rev=e4e6f8c#e4e6f8ca4d7c239c02a8cdfd48a74cb0969425eb" dependencies = [ - "cosmic-protocols 0.1.0 (git+https://github.com/pop-os/cosmic-protocols?rev=e4e6f8c)", + "cosmic-protocols", "libc", "smithay-client-toolkit", "wayland-client", @@ -1272,20 +1272,7 @@ dependencies = [ [[package]] name = "cosmic-protocols" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-protocols?rev=e4e6f8c#e4e6f8ca4d7c239c02a8cdfd48a74cb0969425eb" -dependencies = [ - "bitflags 2.5.0", - "wayland-backend", - "wayland-client", - "wayland-protocols", - "wayland-scanner", - "wayland-server", -] - -[[package]] -name = "cosmic-protocols" -version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-protocols.git#1316f9e1148ec65351471d8a046ffc82171b066e" +source = "git+https://github.com/pop-os/cosmic-protocols//?rev=1316f9e#1316f9e1148ec65351471d8a046ffc82171b066e" dependencies = [ "bitflags 2.5.0", "wayland-backend", @@ -1301,7 +1288,7 @@ name = "cosmic-randr" version = "0.1.0" source = "git+https://github.com/pop-os/cosmic-randr#8ad117e7c57848f113fbc87986e91209f2262b5a" dependencies = [ - "cosmic-protocols 0.1.0 (git+https://github.com/pop-os/cosmic-protocols.git)", + "cosmic-protocols", "futures-lite 2.3.0", "indexmap", "tachyonix", diff --git a/Cargo.toml b/Cargo.toml index a5403ad..7648869 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -40,6 +40,9 @@ opt-level = 3 [patch.'https://github.com/smithay/client-toolkit/'] smithay-client-toolkit = { git = "https://github.com/smithay/client-toolkit//", rev = "3bed072" } +[patch.'https://github.com/pop-os/cosmic-protocols'] +cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols//", rev = "1316f9e"} + # For development and testing purposes # [patch.'https://github.com/pop-os/libcosmic'] # libcosmic = { git = "https://github.com/pop-os/libcosmic//", branch = "theme-export-gtk" }