diff --git a/Cargo.lock b/Cargo.lock index ed08df2d..e654c1cf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -856,7 +856,7 @@ dependencies = [ "futures-lite", "image", "rayon", - "smithay-client-toolkit 0.17.0 (git+https://github.com/pop-os/client-toolkit?tag=themed-pointer)", + "smithay-client-toolkit 0.17.0", "tokio", "tracing", "wayland-client 0.30.2", @@ -2169,7 +2169,7 @@ dependencies = [ "instant", "log", "palette", - "smithay-client-toolkit 0.17.0 (git+https://github.com/smithay/client-toolkit?rev=f49df45)", + "smithay-client-toolkit 0.17.0", "thiserror", "twox-hash", ] @@ -2225,7 +2225,7 @@ dependencies = [ "iced_accessibility", "iced_core", "iced_futures", - "smithay-client-toolkit 0.17.0 (git+https://github.com/smithay/client-toolkit?rev=f49df45)", + "smithay-client-toolkit 0.17.0", "thiserror", ] @@ -2244,7 +2244,7 @@ dependencies = [ "itertools 0.10.5", "lazy_static", "raw-window-handle 0.5.2", - "smithay-client-toolkit 0.17.0 (git+https://github.com/smithay/client-toolkit?rev=f49df45)", + "smithay-client-toolkit 0.17.0", "smithay-clipboard", "thiserror", "tracing", @@ -2312,7 +2312,7 @@ dependencies = [ "iced_style", "num-traits", "ouroboros", - "smithay-client-toolkit 0.17.0 (git+https://github.com/smithay/client-toolkit?rev=f49df45)", + "smithay-client-toolkit 0.17.0", "thiserror", "unicode-segmentation", ] @@ -2697,7 +2697,7 @@ dependencies = [ "lazy_static", "palette", "slotmap", - "smithay-client-toolkit 0.17.0 (git+https://github.com/smithay/client-toolkit?rev=f49df45)", + "smithay-client-toolkit 0.17.0", "thiserror", "tokio", "tracing", @@ -4148,31 +4148,7 @@ dependencies = [ [[package]] name = "smithay-client-toolkit" version = "0.17.0" -source = "git+https://github.com/pop-os/client-toolkit?tag=themed-pointer#fd15dd954bc5f0c78d079aeda7b11194a682bbff" -dependencies = [ - "bitflags 1.3.2", - "calloop", - "cursor-icon", - "dlib", - "lazy_static", - "log", - "memmap2 0.5.10", - "nix 0.26.4", - "pkg-config", - "thiserror", - "wayland-backend", - "wayland-client 0.30.2", - "wayland-cursor 0.30.0", - "wayland-protocols 0.30.1", - "wayland-protocols-wlr", - "wayland-scanner 0.30.1", - "xkbcommon", -] - -[[package]] -name = "smithay-client-toolkit" -version = "0.17.0" -source = "git+https://github.com/smithay/client-toolkit?rev=f49df45#f49df457aa0dd33d505c212bafab407257cb83f8" +source = "git+https://github.com/smithay/client-toolkit//?rev=f49df45#f49df457aa0dd33d505c212bafab407257cb83f8" dependencies = [ "bitflags 1.3.2", "bytemuck", diff --git a/Cargo.toml b/Cargo.toml index 3dcd12ca..cbf247ca 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,6 +28,9 @@ git = "https://github.com/pop-os/cosmic-panel" # libcosmic = { git = "https://github.com/pop-os/libcosmic?rev=master", branch = "improv" } # cosmic-config = { git = "https://github.com/pop-os/libcosmic?rev=master", branch = "improv" } +[patch."https://github.com/Smithay/client-toolkit"] +sctk = { git = "https://github.com/smithay/client-toolkit//", package = "smithay-client-toolkit", rev = "f49df45"} + [profile.release] opt-level = 3 lto = "thin" diff --git a/pages/desktop/Cargo.toml b/pages/desktop/Cargo.toml index d705015f..8fdd3bb9 100644 --- a/pages/desktop/Cargo.toml +++ b/pages/desktop/Cargo.toml @@ -13,7 +13,7 @@ freedesktop-icons = "0.2.3" futures-lite = "1.13.0" image = "0.24.6" rayon = "1.7.0" -sctk = { package = "smithay-client-toolkit", git = "https://github.com/pop-os/client-toolkit", tag = "themed-pointer"} +sctk = { git = "https://github.com/smithay/client-toolkit/", package = "smithay-client-toolkit", rev = "f49df45"} tokio = { version = "1.28.0", features = ["sync"] } tracing = "0.1.37" wayland-client = "0.30.1"