From 8cbe5de137c5b13a0ad0be88d87af3a82aaab9ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vuka=C5=A1in=20Vojinovi=C4=87?= <150025636+git-f0x@users.noreply.github.com> Date: Wed, 3 Sep 2025 17:13:25 +0200 Subject: [PATCH] chore: fix build --- Cargo.lock | 41 ++++++----------------------------------- Cargo.toml | 6 ++++-- 2 files changed, 10 insertions(+), 37 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b88652b4..8feb7926 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1444,7 +1444,7 @@ dependencies = [ "bitflags 2.9.4", "cosmic-protocols", "libc", - "smithay-client-toolkit 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", + "smithay-client-toolkit 0.20.0", "wayland-client", "wayland-protocols", ] @@ -1561,12 +1561,12 @@ dependencies = [ [[package]] name = "cosmic-panel-config" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-panel#9adf94ebefc7dba5e58dd051e6efa87d058d11aa" +source = "git+https://github.com/pop-os/cosmic-panel#f0e2d217c6cbfb656ffbcfc03be28191ccf42468" dependencies = [ "anyhow", "cosmic-config", "serde", - "smithay-client-toolkit 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", + "smithay-client-toolkit 0.20.0", "tracing", "wayland-protocols-wlr", "xdg-shell-wrapper-config", @@ -1589,7 +1589,7 @@ dependencies = [ [[package]] name = "cosmic-settings-config" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-settings-daemon#b725543b2834e5aa82dded3c73f3be65e18bd83e" +source = "git+https://github.com/pop-os/cosmic-settings-daemon#6d45dbeaade7689ad2241f818fb1c6336ebe2bc2" dependencies = [ "cosmic-config", "ron", @@ -1626,7 +1626,7 @@ dependencies = [ "num-traits", "pipewire", "rustix 1.0.8", - "smithay-client-toolkit 0.20.0 (git+https://github.com/smithay/client-toolkit/)", + "smithay-client-toolkit 0.20.0", "thiserror 2.0.16", "tokio", "tokio-stream", @@ -6136,35 +6136,6 @@ dependencies = [ "xkeysym", ] -[[package]] -name = "smithay-client-toolkit" -version = "0.20.0" -source = "git+https://github.com/smithay/client-toolkit/#8a0b33616145b38c7f989f8e468d57e69a2a6748" -dependencies = [ - "bitflags 2.9.4", - "bytemuck", - "calloop 0.14.3", - "calloop-wayland-source 0.4.0", - "cursor-icon", - "libc", - "log", - "memmap2 0.9.8", - "pkg-config", - "rustix 1.0.8", - "thiserror 2.0.16", - "wayland-backend", - "wayland-client", - "wayland-csd-frame", - "wayland-cursor", - "wayland-protocols", - "wayland-protocols-experimental", - "wayland-protocols-misc", - "wayland-protocols-wlr", - "wayland-scanner", - "xkbcommon 0.8.0", - "xkeysym", -] - [[package]] name = "smithay-clipboard" version = "0.8.0" @@ -7996,7 +7967,7 @@ dependencies = [ [[package]] name = "xdg-shell-wrapper-config" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-panel#9adf94ebefc7dba5e58dd051e6efa87d058d11aa" +source = "git+https://github.com/pop-os/cosmic-panel#f0e2d217c6cbfb656ffbcfc03be28191ccf42468" dependencies = [ "serde", "wayland-protocols-wlr", diff --git a/Cargo.toml b/Cargo.toml index 68f298ab..54d73149 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,11 +26,10 @@ resolver = "3" [workspace.dependencies] anyhow = "1.0.99" cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit", rev = "6254f50" } -sctk = { package = "smithay-client-toolkit", version = "0.20.0" } cosmic-applets-config = { path = "cosmic-applets-config" } cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", default-features = false, features = [ "client", -], rev = "1425bd4" } +], rev = "6254f50" } cosmic-settings-subscriptions = { git = "https://github.com/pop-os/cosmic-settings-subscriptions" } cosmic-time = { git = "https://github.com/pop-os/cosmic-time", default-features = false } @@ -81,6 +80,9 @@ ignored = ["libcosmic"] # winit = { git = "https://github.com/rust-windowing/winit.git", rev = "241b7a80bba96c91fa3901729cd5dec66abb9be4" } # winit = { path = "../winit" } +[patch."https://github.com/smithay/client-toolkit.git"] +sctk = { package = "smithay-client-toolkit", version = "0.20.0" } + [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" }