From 8870851f815a949dc7a2e8dc85abf316e39cd845 Mon Sep 17 00:00:00 2001
From: Ashley Wulber <ashley@system76.com>
Date: Wed, 17 Jul 2024 08:54:34 -0400
Subject: [PATCH] cleanup

---
 Cargo.lock                     | 46 ++++++++++++++++++++++++++--------
 Cargo.toml                     | 25 ++----------------
 cosmic-applet-power/Cargo.toml |  1 -
 3 files changed, 38 insertions(+), 34 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a2913454..6da49857 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1069,7 +1069,6 @@ dependencies = [
  "once_cell",
  "rust-embed 8.5.0",
  "rustix 0.38.34",
- "tokio",
  "tracing",
  "tracing-log",
  "tracing-subscriber",
@@ -1177,7 +1176,7 @@ source = "git+https://github.com/pop-os/cosmic-protocols?rev=c8d3a1c#c8d3a1c3d40
 dependencies = [
  "cosmic-protocols",
  "libc",
- "smithay-client-toolkit",
+ "smithay-client-toolkit 0.19.2",
  "wayland-client",
 ]
 
@@ -1280,7 +1279,7 @@ dependencies = [
  "cosmic-config",
  "ron",
  "serde",
- "smithay-client-toolkit",
+ "smithay-client-toolkit 0.18.0",
  "tracing",
  "wayland-protocols-wlr 0.2.0",
  "xdg-shell-wrapper-config",
@@ -1781,7 +1780,7 @@ dependencies = [
  "bitflags 2.6.0",
  "mime 0.1.0",
  "raw-window-handle",
- "smithay-client-toolkit",
+ "smithay-client-toolkit 0.19.2",
  "smithay-clipboard",
 ]
 
@@ -2814,7 +2813,7 @@ dependencies = [
  "palette",
  "raw-window-handle",
  "serde",
- "smithay-client-toolkit",
+ "smithay-client-toolkit 0.19.2",
  "smol_str",
  "thiserror",
  "web-time",
@@ -2880,7 +2879,7 @@ dependencies = [
  "iced_accessibility",
  "iced_core",
  "iced_futures",
- "smithay-client-toolkit",
+ "smithay-client-toolkit 0.19.2",
  "thiserror",
  "window_clipboard",
 ]
@@ -2900,7 +2899,7 @@ dependencies = [
  "itertools 0.12.1",
  "lazy_static",
  "raw-window-handle",
- "smithay-client-toolkit",
+ "smithay-client-toolkit 0.19.2",
  "thiserror",
  "tracing",
  "wayland-backend",
@@ -2957,7 +2956,7 @@ dependencies = [
  "raw-window-handle",
  "resvg",
  "rustix 0.38.34",
- "smithay-client-toolkit",
+ "smithay-client-toolkit 0.19.2",
  "tiny-xlib",
  "wayland-backend",
  "wayland-client",
@@ -2978,7 +2977,7 @@ dependencies = [
  "iced_style",
  "num-traits",
  "ouroboros",
- "smithay-client-toolkit",
+ "smithay-client-toolkit 0.19.2",
  "thiserror",
  "unicode-segmentation",
  "window_clipboard",
@@ -5328,6 +5327,33 @@ version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
+[[package]]
+name = "smithay-client-toolkit"
+version = "0.18.0"
+source = "git+https://github.com/smithay/client-toolkit?rev=3bed072#3bed072b966022f5f929d12f3aff089b1ace980b"
+dependencies = [
+ "bitflags 2.6.0",
+ "bytemuck",
+ "calloop",
+ "calloop-wayland-source",
+ "cursor-icon",
+ "libc",
+ "log",
+ "memmap2 0.9.4",
+ "pkg-config",
+ "rustix 0.38.34",
+ "thiserror",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-csd-frame",
+ "wayland-cursor",
+ "wayland-protocols 0.31.2",
+ "wayland-protocols-wlr 0.2.0",
+ "wayland-scanner",
+ "xkbcommon",
+ "xkeysym",
+]
+
 [[package]]
 name = "smithay-client-toolkit"
 version = "0.19.2"
@@ -5363,7 +5389,7 @@ source = "git+https://github.com/pop-os/smithay-clipboard?tag=pop-dnd-5#d099e82a
 dependencies = [
  "libc",
  "raw-window-handle",
- "smithay-client-toolkit",
+ "smithay-client-toolkit 0.19.2",
  "wayland-backend",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index ebebb584..9ab2ee5a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -40,7 +40,7 @@ i18n-embed = { version = "0.14.1", features = [
     "desktop-requester",
 ] }
 i18n-embed-fl = "0.8"
-libcosmic = { git = "https://github.com/pop-os/libcosmic", features = [
+libcosmic = { git = "https://github.com/pop-os/libcosmic", default-features = false, features = [
     "applet",
     "applet-token",
     "tokio",
@@ -60,31 +60,10 @@ serde = { version = "1.0.152", features = ["derive"] }
 freedesktop-desktop-entry = "0.6.1"
 
 [profile.release]
-# lto = "fat"
-opt-level = 1
+lto = "fat"
 
 [workspace.metadata.cargo-machete]
 ignored = ["libcosmic"]
 # [patch."https://github.com/pop-os/libcosmic"]
 # cosmic-config = { git = "https://github.com/pop-os/libcosmic//" }
 # libcosmic = { git = "https://github.com/pop-os/libcosmic//" }
-
-[patch."https://github.com/Smithay/client-toolkit"]
-sctk = { package = "smithay-client-toolkit", version = "0.19.2" }
-# [patch.'https://github.com/pop-os/libcosmic']
-# libcosmic = { git = "https://github.com/pop-os/libcosmic//" }
-# cosmic-config = { git = "https://github.com/pop-os/libcosmic//" }
-# cosmic-theme = { git = "https://github.com/pop-os/libcosmic//" }
-# cosmic-time = { git = "https://github.com/pop-os/cosmic-time", default-features = false, features = [
-#     "libcosmic",
-#     "once_cell",
-# ] }
-# iced_futures = { git = "https://github.com/pop-os/libcosmic//" }
-# libcosmic = { path = "../libcosmic" }
-# cosmic-config = { path = "../libcosmic/cosmic-config" }
-# cosmic-theme = { path = "../libcosmic/cosmic-theme" }
-# iced = { path = "../libcosmic/iced" }
-# cosmic-time = { path = "../cosmic-time", default-features = false, features = [
-#     "libcosmic",
-#     "once_cell",
-# ] }
diff --git a/cosmic-applet-power/Cargo.toml b/cosmic-applet-power/Cargo.toml
index 5a8251be..2fffa0de 100644
--- a/cosmic-applet-power/Cargo.toml
+++ b/cosmic-applet-power/Cargo.toml
@@ -16,4 +16,3 @@ tracing-log.workspace = true
 tracing-subscriber.workspace = true
 tracing.workspace = true
 zbus.workspace = true
-tokio = { version = "1.36.0", features = ["sync", "macros"] }