From 5359ceb0f866c4052b37b7089b9bcf8f95788225 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Tue, 20 Dec 2022 09:08:16 -0700 Subject: [PATCH] Update to new iced, use swbuf instead of softbuffer --- Cargo.toml | 8 ++++---- examples/cosmic/Cargo.toml | 2 +- iced | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 01ca803b..eee2849d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,7 +9,7 @@ name = "cosmic" [features] default = ["wayland"] debug = ["iced/debug"] -softbuffer = ["iced/softbuffer", "iced_softbuffer"] +swbuf = ["iced/swbuf", "iced_swbuf"] wayland = ["iced/wayland", "iced_glow"] wgpu = ["iced/wgpu", "iced_wgpu"] tokio = ["iced/tokio"] @@ -23,7 +23,7 @@ derive_setters = "0.1.5" lazy_static = "1.4.0" palette = "0.6.1" cosmic-panel-config = {git = "https://github.com/pop-os/cosmic-panel", default-features = false, optional = true } -sctk = { package = "smithay-client-toolkit", git = "https://github.com/Smithay/client-toolkit", optional = true, rev = "f1d9c3e" } +sctk = { package = "smithay-client-toolkit", git = "https://github.com/Smithay/client-toolkit", optional = true, rev = "73346019952f82ec7e4d4d15f5d66841b54e8b61" } [dependencies.cosmic-theme] git = "https://github.com/pop-os/cosmic-theme.git" @@ -42,8 +42,8 @@ path = "iced/lazy" [dependencies.iced_native] path = "iced/native" -[dependencies.iced_softbuffer] -path = "iced/softbuffer" +[dependencies.iced_swbuf] +path = "iced/swbuf" optional = true [dependencies.iced_style] diff --git a/examples/cosmic/Cargo.toml b/examples/cosmic/Cargo.toml index 4fa3b35b..ad7981c2 100644 --- a/examples/cosmic/Cargo.toml +++ b/examples/cosmic/Cargo.toml @@ -6,4 +6,4 @@ edition = "2021" publish = false [dependencies] -libcosmic = { path = "../..", default-features = false, features = ["debug", "softbuffer", "winit"] } +libcosmic = { path = "../..", default-features = false, features = ["debug", "swbuf", "winit"] } diff --git a/iced b/iced index 79267843..53a84da3 160000 --- a/iced +++ b/iced @@ -1 +1 @@ -Subproject commit 79267843e03a5b016a8d3abf8b961279fee43818 +Subproject commit 53a84da301fc418680a26ab3672325abb7edbc52