From 3eab6a9a9d1ac238c29c304b7f4c9861b44e239e Mon Sep 17 00:00:00 2001
From: Ashley Wulber <ashley@system76.com>
Date: Fri, 8 Dec 2023 16:19:59 -0500
Subject: [PATCH] chore: add sctk patch

---
 Cargo.lock                                    | 24 +++----------------
 Cargo.toml                                    |  2 ++
 .../src/components/app.rs                     |  2 +-
 3 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 44ee45aa..e7b6523f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4862,7 +4862,7 @@ dependencies = [
  "ab_glyph",
  "log",
  "memmap2 0.5.10",
- "smithay-client-toolkit 0.16.1 (git+https://github.com/pop-os/client-toolkit?branch=wayland-resize)",
+ "smithay-client-toolkit 0.16.1",
  "tiny-skia 0.8.4",
 ]
 
@@ -5033,24 +5033,6 @@ version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
-[[package]]
-name = "smithay-client-toolkit"
-version = "0.16.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "870427e30b8f2cbe64bf43ec4b86e88fe39b0a84b3f15efd9c9c2d020bc86eb9"
-dependencies = [
- "bitflags 1.3.2",
- "dlib",
- "lazy_static",
- "log",
- "memmap2 0.5.10",
- "nix 0.24.3",
- "pkg-config",
- "wayland-client 0.29.5",
- "wayland-cursor 0.29.5",
- "wayland-protocols 0.29.5",
-]
-
 [[package]]
 name = "smithay-client-toolkit"
 version = "0.16.1"
@@ -5102,7 +5084,7 @@ version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0a345c870a1fae0b1b779085e81b51e614767c239e93503588e54c5b17f4b0e8"
 dependencies = [
- "smithay-client-toolkit 0.16.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smithay-client-toolkit 0.16.1",
  "wayland-client 0.29.5",
 ]
 
@@ -6675,7 +6657,7 @@ dependencies = [
  "raw-window-handle",
  "redox_syscall 0.3.5",
  "sctk-adwaita",
- "smithay-client-toolkit 0.16.1 (git+https://github.com/pop-os/client-toolkit?branch=wayland-resize)",
+ "smithay-client-toolkit 0.16.1",
  "wasm-bindgen",
  "wayland-client 0.29.5",
  "wayland-commons",
diff --git a/Cargo.toml b/Cargo.toml
index 443e79ff..e2e86b2d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -48,3 +48,5 @@ lto = "thin"
 # cosmic-config = { path = "../libcosmic/cosmic-config" }
 [patch."https://github.com/Smithay/client-toolkit"]
 sctk = { git = "https://github.com/smithay/client-toolkit//", package = "smithay-client-toolkit", rev = "e63ab5f" }
+[patch.crates-io]
+sctk = { package = "smithay-client-toolkit", git = "https://github.com/pop-os/client-toolkit", branch = "wayland-resize" }
diff --git a/cosmic-applet-workspaces/src/components/app.rs b/cosmic-applet-workspaces/src/components/app.rs
index 2e03b504..94f892e2 100644
--- a/cosmic-applet-workspaces/src/components/app.rs
+++ b/cosmic-applet-workspaces/src/components/app.rs
@@ -3,7 +3,7 @@ use cosmic::iced::alignment::{Horizontal, Vertical};
 use cosmic::iced::event;
 use cosmic::iced::mouse::{self, ScrollDelta};
 use cosmic::iced::widget::{button, column, container, row, text};
-use cosmic::iced::{subscription, Event::Mouse, Length, Subscription};
+use cosmic::iced::{Event::Mouse, Length, Subscription};
 use cosmic::iced_core::Background;
 use cosmic::iced_style::application;
 use cosmic::{applet::cosmic_panel_config::PanelAnchor, font::FONT_BOLD, Command};