diff --git a/Cargo.lock b/Cargo.lock index b411ed33..60bae03e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -154,12 +154,6 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - [[package]] name = "arrayvec" version = "0.7.2" @@ -378,56 +372,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "clipboard-win" -version = "4.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362" -dependencies = [ - "error-code", - "str-buf", - "winapi", -] - -[[package]] -name = "clipboard_macos" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "145a7f9e9b89453bc0a5e32d166456405d389cea5b578f57f1274b1397588a95" -dependencies = [ - "objc", - "objc-foundation", - "objc_id", -] - -[[package]] -name = "clipboard_wayland" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f6364a9f7a66f2ac1a1a098aa1c7f6b686f2496c6ac5e5c0d773445df912747" -dependencies = [ - "smithay-clipboard", -] - -[[package]] -name = "clipboard_x11" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "983a7010836ecd04dde2c6d27a0cb56ec5d21572177e782bdcb24a600124e921" -dependencies = [ - "thiserror", - "x11rb 0.9.0", -] - -[[package]] -name = "cmake" -version = "0.1.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" -dependencies = [ - "cc", -] - [[package]] name = "cocoa" version = "0.24.1" @@ -439,7 +383,7 @@ dependencies = [ "cocoa-foundation", "core-foundation", "core-graphics", - "foreign-types 0.3.2", + "foreign-types", "libc", "objc", ] @@ -454,7 +398,7 @@ dependencies = [ "block", "core-foundation", "core-graphics-types", - "foreign-types 0.3.2", + "foreign-types", "libc", "objc", ] @@ -512,7 +456,7 @@ dependencies = [ "bitflags 1.3.2", "core-foundation", "core-graphics-types", - "foreign-types 0.3.2", + "foreign-types", "libc", ] @@ -524,19 +468,7 @@ checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" dependencies = [ "bitflags 1.3.2", "core-foundation", - "foreign-types 0.3.2", - "libc", -] - -[[package]] -name = "core-text" -version = "19.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d74ada66e07c1cefa18f8abfba765b486f250de2e4a999e5727fc0dd4b4a25" -dependencies = [ - "core-foundation", - "core-graphics", - "foreign-types 0.3.2", + "foreign-types", "libc", ] @@ -553,8 +485,6 @@ dependencies = [ "edid-rs", "egui", "glow 0.11.2", - "iced_core 0.9.0 (git+https://github.com/pop-os/libcosmic?rev=31f7e97d5b)", - "iced_renderer", "iced_tiny_skia", "id_tree", "indexmap", @@ -589,12 +519,12 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic?rev=31f7e97d5b#31f7e97d5bf4860be5afd406209eed733f736f04" +source = "git+https://github.com/pop-os/libcosmic?rev=5765053#5765053ad70d7b0fded56fe9e9c73649509a03ae" dependencies = [ "atomicwrites", "cosmic-config-derive", "dirs 5.0.1", - "iced_futures 0.6.0 (git+https://github.com/pop-os/libcosmic?rev=31f7e97d5b)", + "iced_futures", "notify", "ron 0.8.0", "serde", @@ -603,7 +533,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic?rev=31f7e97d5b#31f7e97d5bf4860be5afd406209eed733f736f04" +source = "git+https://github.com/pop-os/libcosmic?rev=5765053#5765053ad70d7b0fded56fe9e9c73649509a03ae" dependencies = [ "quote", "syn 1.0.109", @@ -643,7 +573,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic?rev=31f7e97d5b#31f7e97d5bf4860be5afd406209eed733f736f04" +source = "git+https://github.com/pop-os/libcosmic?rev=5765053#5765053ad70d7b0fded56fe9e9c73649509a03ae" dependencies = [ "anyhow", "cosmic-config", @@ -658,14 +588,9 @@ dependencies = [ [[package]] name = "cosmic-time" version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "269b94889f152389ed39fde8a69a6083ff4ca73993360d2850d5c281e3488c11" +source = "git+https://github.com/pop-os/cosmic-time?rev=35dd0b8#35dd0b8d2c399994b16fe512f4b85d882c13ebdd" dependencies = [ - "iced 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "iced_core 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "iced_futures 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "iced_native", - "iced_style 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libcosmic", ] [[package]] @@ -729,29 +654,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "crossfont" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21fd3add36ea31aba1520aa5288714dd63be506106753226d0eb387a93bc9c45" -dependencies = [ - "cocoa", - "core-foundation", - "core-foundation-sys", - "core-graphics", - "core-text", - "dwrote", - "foreign-types 0.5.0", - "freetype-rs", - "libc", - "log", - "objc", - "once_cell", - "pkg-config", - "servo-fontconfig", - "winapi", -] - [[package]] name = "crunchy" version = "0.2.2" @@ -778,12 +680,6 @@ dependencies = [ "serde", ] -[[package]] -name = "cty" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" - [[package]] name = "d3d12" version = "0.6.0" @@ -795,38 +691,14 @@ dependencies = [ "winapi", ] -[[package]] -name = "darling" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" -dependencies = [ - "darling_core 0.13.4", - "darling_macro 0.13.4", -] - [[package]] name = "darling" version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0558d22a7b463ed0241e993f76f09f30b126687447751a8638587b864e4b3944" dependencies = [ - "darling_core 0.20.1", - "darling_macro 0.20.1", -] - -[[package]] -name = "darling_core" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn 1.0.109", + "darling_core", + "darling_macro", ] [[package]] @@ -843,24 +715,13 @@ dependencies = [ "syn 2.0.18", ] -[[package]] -name = "darling_macro" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" -dependencies = [ - "darling_core 0.13.4", - "quote", - "syn 1.0.109", -] - [[package]] name = "darling_macro" version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a" dependencies = [ - "darling_core 0.20.1", + "darling_core", "quote", "syn 2.0.18", ] @@ -877,7 +738,7 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e8ef033054e131169b8f0f9a7af8f5533a9436fadf3c500ed547f730f07090d" dependencies = [ - "darling 0.20.1", + "darling", "proc-macro2", "quote", "syn 2.0.18", @@ -1009,20 +870,6 @@ dependencies = [ "libc", ] -[[package]] -name = "dwrote" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439a1c2ba5611ad3ed731280541d36d2e9c4ac5e7fb818a27b604bdc5a6aa65b" -dependencies = [ - "lazy_static", - "libc", - "serde", - "serde_derive", - "winapi", - "wio", -] - [[package]] name = "ecolor" version = "0.21.0" @@ -1236,16 +1083,6 @@ dependencies = [ "libc", ] -[[package]] -name = "error-code" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21" -dependencies = [ - "libc", - "str-buf", -] - [[package]] name = "etagere" version = "0.2.7" @@ -1265,16 +1102,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "expat-sys" -version = "2.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658f19728920138342f68408b7cf7644d90d4784353d8ebc32e7e8663dbe45fa" -dependencies = [ - "cmake", - "pkg-config", -] - [[package]] name = "exr" version = "1.6.3" @@ -1402,28 +1229,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" dependencies = [ - "foreign-types-shared 0.1.1", -] - -[[package]] -name = "foreign-types" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" -dependencies = [ - "foreign-types-macros", - "foreign-types-shared 0.3.1", -] - -[[package]] -name = "foreign-types-macros" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.18", + "foreign-types-shared", ] [[package]] @@ -1432,12 +1238,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" -[[package]] -name = "foreign-types-shared" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" - [[package]] name = "fraction" version = "0.13.1" @@ -1461,28 +1261,6 @@ dependencies = [ "xdg", ] -[[package]] -name = "freetype-rs" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74eadec9d0a5c28c54bb9882e54787275152a4e36ce206b45d7451384e5bf5fb" -dependencies = [ - "bitflags 1.3.2", - "freetype-sys", - "libc", -] - -[[package]] -name = "freetype-sys" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a37d4011c0cc628dfa766fcc195454f4b068d7afdc2adfd28861191d866e731a" -dependencies = [ - "cmake", - "libc", - "pkg-config", -] - [[package]] name = "fsevent-sys" version = "4.1.0" @@ -1582,15 +1360,6 @@ dependencies = [ "slab", ] -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - [[package]] name = "gbm" version = "0.12.0" @@ -1705,44 +1474,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "glyph_brush" -version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4edefd123f28a0b1d41ec4a489c2b43020b369180800977801611084f342978d" -dependencies = [ - "glyph_brush_draw_cache", - "glyph_brush_layout", - "ordered-float", - "rustc-hash", - "twox-hash", -] - -[[package]] -name = "glyph_brush_draw_cache" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6010675390f6889e09a21e2c8b575b3ee25667ea8237a8d59423f73cb8c28610" -dependencies = [ - "ab_glyph", - "crossbeam-channel", - "crossbeam-deque", - "linked-hash-map", - "rayon", - "rustc-hash", -] - -[[package]] -name = "glyph_brush_layout" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc32c2334f00ca5ac3695c5009ae35da21da8c62d255b5b96d56e2597a637a38" -dependencies = [ - "ab_glyph", - "approx 0.5.1", - "xi-unicode", -] - [[package]] name = "glyphon" version = "0.2.0" @@ -1751,7 +1482,7 @@ dependencies = [ "cosmic-text", "etagere", "lru", - "wgpu 0.16.1", + "wgpu", ] [[package]] @@ -1843,21 +1574,6 @@ dependencies = [ "ahash 0.8.3", ] -[[package]] -name = "hassle-rs" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90601c6189668c7345fc53842cb3f3a3d872203d523be1b3cb44a36a3e62fb85" -dependencies = [ - "bitflags 1.3.2", - "com-rs", - "libc", - "libloading 0.7.4", - "thiserror", - "widestring 0.5.1", - "winapi", -] - [[package]] name = "hassle-rs" version = "0.10.0" @@ -1869,7 +1585,7 @@ dependencies = [ "libc", "libloading 0.7.4", "thiserror", - "widestring 1.0.2", + "widestring", "winapi", ] @@ -1915,25 +1631,10 @@ dependencies = [ [[package]] name = "iced" version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efbddf356d01e9d41cd394a9d04d62bfd89650a30f12fda5839cabb8c4591c88" +source = "git+https://github.com/pop-os/libcosmic?rev=5765053#5765053ad70d7b0fded56fe9e9c73649509a03ae" dependencies = [ - "iced_core 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "iced_futures 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "iced_graphics 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "iced_native", - "iced_wgpu 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", - "iced_winit", - "thiserror", -] - -[[package]] -name = "iced" -version = "0.9.0" -source = "git+https://github.com/pop-os/libcosmic?rev=31f7e97d5b#31f7e97d5bf4860be5afd406209eed733f736f04" -dependencies = [ - "iced_core 0.9.0 (git+https://github.com/pop-os/libcosmic?rev=31f7e97d5b)", - "iced_futures 0.6.0 (git+https://github.com/pop-os/libcosmic?rev=31f7e97d5b)", + "iced_core", + "iced_futures", "iced_renderer", "iced_widget", "image", @@ -1943,18 +1644,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11e1942e28dedee756cc27e67e7a838cdc1e59fb6bf9627ec9f709ab3b135782" -dependencies = [ - "bitflags 1.3.2", - "instant", - "palette", -] - -[[package]] -name = "iced_core" -version = "0.9.0" -source = "git+https://github.com/pop-os/libcosmic?rev=31f7e97d5b#31f7e97d5bf4860be5afd406209eed733f736f04" +source = "git+https://github.com/pop-os/libcosmic?rev=5765053#5765053ad70d7b0fded56fe9e9c73649509a03ae" dependencies = [ "bitflags 1.3.2", "instant", @@ -1967,115 +1657,61 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "215d51fa4f70dbb63775d7141243c4d98d4d525d8949695601f8fbac7dcbc04e" +source = "git+https://github.com/pop-os/libcosmic?rev=5765053#5765053ad70d7b0fded56fe9e9c73649509a03ae" dependencies = [ "futures", + "iced_core", "log", "tokio", "wasm-bindgen-futures", "wasm-timer", ] -[[package]] -name = "iced_futures" -version = "0.6.0" -source = "git+https://github.com/pop-os/libcosmic?rev=31f7e97d5b#31f7e97d5bf4860be5afd406209eed733f736f04" -dependencies = [ - "futures", - "iced_core 0.9.0 (git+https://github.com/pop-os/libcosmic?rev=31f7e97d5b)", - "log", - "wasm-bindgen-futures", - "wasm-timer", -] - [[package]] name = "iced_graphics" version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "338a6aff7db906537074ad0fe8b720cfdb9512cdfea43c628c76bd1cf50fdcc0" +source = "git+https://github.com/pop-os/libcosmic?rev=5765053#5765053ad70d7b0fded56fe9e9c73649509a03ae" dependencies = [ "bitflags 1.3.2", "bytemuck", "glam", - "iced_native", - "iced_style 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log", - "raw-window-handle 0.5.2", - "thiserror", -] - -[[package]] -name = "iced_graphics" -version = "0.8.0" -source = "git+https://github.com/pop-os/libcosmic?rev=31f7e97d5b#31f7e97d5bf4860be5afd406209eed733f736f04" -dependencies = [ - "bitflags 1.3.2", - "bytemuck", - "glam", - "iced_core 0.9.0 (git+https://github.com/pop-os/libcosmic?rev=31f7e97d5b)", + "iced_core", "image", "kamadak-exif", "log", - "raw-window-handle 0.5.2", + "raw-window-handle", "thiserror", "tiny-skia 0.9.1", ] -[[package]] -name = "iced_native" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d012eb06da490fe46a695b39721c20da9643f35cf2ecb9d30618fdeb96170616" -dependencies = [ - "iced_core 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "iced_futures 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "iced_style 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "num-traits", - "thiserror", - "twox-hash", - "unicode-segmentation", -] - [[package]] name = "iced_renderer" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic?rev=31f7e97d5b#31f7e97d5bf4860be5afd406209eed733f736f04" +source = "git+https://github.com/pop-os/libcosmic?rev=5765053#5765053ad70d7b0fded56fe9e9c73649509a03ae" dependencies = [ - "iced_graphics 0.8.0 (git+https://github.com/pop-os/libcosmic?rev=31f7e97d5b)", + "iced_graphics", "iced_tiny_skia", - "iced_wgpu 0.10.0 (git+https://github.com/pop-os/libcosmic?rev=31f7e97d5b)", - "raw-window-handle 0.5.2", + "iced_wgpu", + "raw-window-handle", "thiserror", ] [[package]] name = "iced_runtime" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic?rev=31f7e97d5b#31f7e97d5bf4860be5afd406209eed733f736f04" +source = "git+https://github.com/pop-os/libcosmic?rev=5765053#5765053ad70d7b0fded56fe9e9c73649509a03ae" dependencies = [ - "iced_core 0.9.0 (git+https://github.com/pop-os/libcosmic?rev=31f7e97d5b)", - "iced_futures 0.6.0 (git+https://github.com/pop-os/libcosmic?rev=31f7e97d5b)", + "iced_core", + "iced_futures", "thiserror", ] [[package]] name = "iced_style" version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e37333dc2991201140302cd0d4cea051bd37ca3671d5008ec85df86d232ff30" +source = "git+https://github.com/pop-os/libcosmic?rev=5765053#5765053ad70d7b0fded56fe9e9c73649509a03ae" dependencies = [ - "iced_core 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "once_cell", - "palette", -] - -[[package]] -name = "iced_style" -version = "0.8.0" -source = "git+https://github.com/pop-os/libcosmic?rev=31f7e97d5b#31f7e97d5bf4860be5afd406209eed733f736f04" -dependencies = [ - "iced_core 0.9.0 (git+https://github.com/pop-os/libcosmic?rev=31f7e97d5b)", + "iced_core", "once_cell", "palette", ] @@ -2083,14 +1719,14 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic?rev=31f7e97d5b#31f7e97d5bf4860be5afd406209eed733f736f04" +source = "git+https://github.com/pop-os/libcosmic?rev=5765053#5765053ad70d7b0fded56fe9e9c73649509a03ae" dependencies = [ "bytemuck", "cosmic-text", - "iced_graphics 0.8.0 (git+https://github.com/pop-os/libcosmic?rev=31f7e97d5b)", + "iced_graphics", "kurbo 0.9.5", "log", - "raw-window-handle 0.5.2", + "raw-window-handle", "resvg 0.32.0", "rustc-hash", "softbuffer", @@ -2101,28 +1737,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478803c56061f567ce5ddf223b20d11d3c118cc46bb0d0552370dc65cdc4cb9c" -dependencies = [ - "bitflags 1.3.2", - "bytemuck", - "encase", - "futures", - "glam", - "glyph_brush", - "guillotiere", - "iced_graphics 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "iced_native", - "log", - "raw-window-handle 0.5.2", - "wgpu 0.15.1", - "wgpu_glyph", -] - -[[package]] -name = "iced_wgpu" -version = "0.10.0" -source = "git+https://github.com/pop-os/libcosmic?rev=31f7e97d5b#31f7e97d5bf4860be5afd406209eed733f736f04" +source = "git+https://github.com/pop-os/libcosmic?rev=5765053#5765053ad70d7b0fded56fe9e9c73649509a03ae" dependencies = [ "bitflags 1.3.2", "bytemuck", @@ -2131,47 +1746,30 @@ dependencies = [ "glam", "glyphon", "guillotiere", - "iced_graphics 0.8.0 (git+https://github.com/pop-os/libcosmic?rev=31f7e97d5b)", + "iced_graphics", "log", "once_cell", - "raw-window-handle 0.5.2", + "raw-window-handle", "resvg 0.32.0", "rustc-hash", "twox-hash", - "wgpu 0.16.1", + "wgpu", ] [[package]] name = "iced_widget" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic?rev=31f7e97d5b#31f7e97d5bf4860be5afd406209eed733f736f04" +source = "git+https://github.com/pop-os/libcosmic?rev=5765053#5765053ad70d7b0fded56fe9e9c73649509a03ae" dependencies = [ "iced_renderer", "iced_runtime", - "iced_style 0.8.0 (git+https://github.com/pop-os/libcosmic?rev=31f7e97d5b)", + "iced_style", "num-traits", "ouroboros 0.13.0", "thiserror", "unicode-segmentation", ] -[[package]] -name = "iced_winit" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a59ea3a85149a6a1f9e92b6c740ce90f04e5c7d848cfd05742336863fceb955" -dependencies = [ - "iced_futures 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "iced_graphics 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "iced_native", - "log", - "thiserror", - "web-sys", - "winapi", - "window_clipboard", - "winit 0.27.5", -] - [[package]] name = "id_tree" version = "1.8.0" @@ -2384,7 +1982,7 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a53776d271cfb873b17c618af0298445c88afc52837f3e948fa3fafd131f449" dependencies = [ - "arrayvec 0.7.2", + "arrayvec", ] [[package]] @@ -2393,7 +1991,7 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" dependencies = [ - "arrayvec 0.7.2", + "arrayvec", ] [[package]] @@ -2417,7 +2015,7 @@ checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic?rev=31f7e97d5b#31f7e97d5bf4860be5afd406209eed733f736f04" +source = "git+https://github.com/pop-os/libcosmic?rev=5765053#5765053ad70d7b0fded56fe9e9c73649509a03ae" dependencies = [ "apply", "cosmic-config", @@ -2425,15 +2023,18 @@ dependencies = [ "derive_setters", "fraction", "freedesktop-icons", - "iced 0.9.0 (git+https://github.com/pop-os/libcosmic?rev=31f7e97d5b)", - "iced_core 0.9.0 (git+https://github.com/pop-os/libcosmic?rev=31f7e97d5b)", + "iced", + "iced_core", + "iced_futures", + "iced_renderer", "iced_runtime", - "iced_style 0.8.0 (git+https://github.com/pop-os/libcosmic?rev=31f7e97d5b)", + "iced_style", "iced_tiny_skia", "iced_widget", "lazy_static", "palette", "slotmap", + "tokio", ] [[package]] @@ -2510,12 +2111,6 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - [[package]] name = "linux-raw-sys" version = "0.3.8" @@ -2626,7 +2221,7 @@ dependencies = [ "bitflags 1.3.2", "block", "core-graphics-types", - "foreign-types 0.3.2", + "foreign-types", "log", "objc", ] @@ -2674,26 +2269,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b" -[[package]] -name = "naga" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c3d4269bcb7d50121097702fde1afb75f4ea8083aeb7a55688dcf289a853271" -dependencies = [ - "bit-set", - "bitflags 1.3.2", - "codespan-reporting", - "hexf-parse", - "indexmap", - "log", - "num-traits", - "rustc-hash", - "spirv", - "termcolor", - "thiserror", - "unicode-xid", -] - [[package]] name = "naga" version = "0.12.2" @@ -2739,7 +2314,7 @@ dependencies = [ "jni-sys", "ndk-sys", "num_enum", - "raw-window-handle 0.5.2", + "raw-window-handle", "thiserror", ] @@ -2749,35 +2324,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" -[[package]] -name = "ndk-glue" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0434fabdd2c15e0aab768ca31d5b7b333717f03cf02037d5a0a3ff3c278ed67f" -dependencies = [ - "libc", - "log", - "ndk", - "ndk-context", - "ndk-macro", - "ndk-sys", - "once_cell", - "parking_lot 0.12.1", -] - -[[package]] -name = "ndk-macro" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c" -dependencies = [ - "darling 0.13.4", - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "ndk-sys" version = "0.4.1+23.1.7779620" @@ -2787,19 +2333,6 @@ dependencies = [ "jni-sys", ] -[[package]] -name = "nix" -version = "0.22.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4916f159ed8e5de0082076562152a76b7a1f64a01fd9d1e0fea002c37624faf" -dependencies = [ - "bitflags 1.3.2", - "cc", - "cfg-if", - "libc", - "memoffset 0.6.5", -] - [[package]] name = "nix" version = "0.23.2" @@ -3013,17 +2546,6 @@ dependencies = [ "objc_exception", ] -[[package]] -name = "objc-foundation" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" -dependencies = [ - "block", - "objc", - "objc_id", -] - [[package]] name = "objc-sys" version = "0.2.0-beta.2" @@ -3059,15 +2581,6 @@ dependencies = [ "cc", ] -[[package]] -name = "objc_id" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" -dependencies = [ - "objc", -] - [[package]] name = "object" version = "0.30.3" @@ -3525,25 +3038,6 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b9283c6b06096b47afc7109834fdedab891175bb5241ee5d4f7d2546549f263" -[[package]] -name = "raw-window-handle" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28f55143d0548dad60bb4fbdc835a3d7ac6acc3324506450c5fdd6e42903a76" -dependencies = [ - "libc", - "raw-window-handle 0.4.3", -] - -[[package]] -name = "raw-window-handle" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b800beb9b6e7d2df1fe337c9e3d04e3af22a124460fb4c30fcc22c9117cefb41" -dependencies = [ - "cty", -] - [[package]] name = "raw-window-handle" version = "0.5.2" @@ -3830,15 +3324,6 @@ version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" -[[package]] -name = "safe_arch" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ff3d6d9696af502cc3110dacce942840fb06ff4514cad92236ecc455f2ce05" -dependencies = [ - "bytemuck", -] - [[package]] name = "same-file" version = "1.0.6" @@ -3866,18 +3351,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" -[[package]] -name = "sctk-adwaita" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61270629cc6b4d77ec1907db1033d5c2e1a404c412743621981a871dc9c12339" -dependencies = [ - "crossfont", - "log", - "smithay-client-toolkit", - "tiny-skia 0.7.0", -] - [[package]] name = "sendfd" version = "0.4.3" @@ -3918,27 +3391,6 @@ dependencies = [ "serde", ] -[[package]] -name = "servo-fontconfig" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7e3e22fe5fd73d04ebf0daa049d3efe3eae55369ce38ab16d07ddd9ac5c217c" -dependencies = [ - "libc", - "servo-fontconfig-sys", -] - -[[package]] -name = "servo-fontconfig-sys" -version = "5.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36b879db9892dfa40f95da1c38a835d41634b825fbd8c4c418093d53c24b388" -dependencies = [ - "expat-sys", - "freetype-sys", - "pkg-config", -] - [[package]] name = "sha2" version = "0.10.6" @@ -4052,8 +3504,8 @@ dependencies = [ "wayland-protocols-wlr", "wayland-server", "wayland-sys 0.30.1", - "winit 0.28.6", - "x11rb 0.11.1", + "winit", + "x11rb", "xkbcommon 0.5.0", ] @@ -4076,16 +3528,6 @@ dependencies = [ "wayland-protocols 0.29.5", ] -[[package]] -name = "smithay-clipboard" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a345c870a1fae0b1b779085e81b51e614767c239e93503588e54c5b17f4b0e8" -dependencies = [ - "smithay-client-toolkit", - "wayland-client 0.29.5", -] - [[package]] name = "smithay-egui" version = "0.1.0" @@ -4118,11 +3560,11 @@ dependencies = [ "cocoa", "core-graphics", "fastrand", - "foreign-types 0.3.2", + "foreign-types", "log", "nix 0.26.2", "objc", - "raw-window-handle 0.5.2", + "raw-window-handle", "redox_syscall 0.3.5", "thiserror", "wasm-bindgen", @@ -4132,7 +3574,7 @@ dependencies = [ "web-sys", "windows-sys 0.42.0", "x11-dl", - "x11rb 0.11.1", + "x11rb", ] [[package]] @@ -4166,12 +3608,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -[[package]] -name = "str-buf" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" - [[package]] name = "strict-num" version = "0.1.1" @@ -4360,21 +3796,6 @@ dependencies = [ "time-core", ] -[[package]] -name = "tiny-skia" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642680569bb895b16e4b9d181c60be1ed136fa0c9c7f11d004daf053ba89bf82" -dependencies = [ - "arrayref", - "arrayvec 0.5.2", - "bytemuck", - "cfg-if", - "png", - "safe_arch", - "tiny-skia-path 0.7.0", -] - [[package]] name = "tiny-skia" version = "0.8.4" @@ -4382,7 +3803,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df8493a203431061e901613751931f047d1971337153f96d0e5e363d6dbf6a67" dependencies = [ "arrayref", - "arrayvec 0.7.2", + "arrayvec", "bytemuck", "cfg-if", "png", @@ -4396,7 +3817,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce2986c82f77818c7b9144c70818fdde98db15308e329ae2f7204d767808fd3c" dependencies = [ "arrayref", - "arrayvec 0.7.2", + "arrayvec", "bytemuck", "cfg-if", "log", @@ -4404,16 +3825,6 @@ dependencies = [ "tiny-skia-path 0.9.0", ] -[[package]] -name = "tiny-skia-path" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c114d32f0c2ee43d585367cb013dfaba967ab9f62b90d9af0d696e955e70fa6c" -dependencies = [ - "arrayref", - "bytemuck", -] - [[package]] name = "tiny-skia-path" version = "0.8.4" @@ -5070,75 +4481,28 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" -[[package]] -name = "wgpu" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d745a1b6d91d85c33defbb29f0eee0450e1d2614d987e14bf6baf26009d132d7" -dependencies = [ - "arrayvec 0.7.2", - "cfg-if", - "js-sys", - "log", - "naga 0.11.1", - "parking_lot 0.12.1", - "profiling", - "raw-window-handle 0.5.2", - "smallvec", - "static_assertions", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "wgpu-core 0.15.1", - "wgpu-hal 0.15.4", - "wgpu-types 0.15.2", -] - [[package]] name = "wgpu" version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3059ea4ddec41ca14f356833e2af65e7e38c0a8f91273867ed526fb9bafcca95" dependencies = [ - "arrayvec 0.7.2", + "arrayvec", "cfg-if", "js-sys", "log", - "naga 0.12.2", + "naga", "parking_lot 0.12.1", "profiling", - "raw-window-handle 0.5.2", + "raw-window-handle", "smallvec", "static_assertions", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "wgpu-core 0.16.1", - "wgpu-hal 0.16.0", - "wgpu-types 0.16.0", -] - -[[package]] -name = "wgpu-core" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7131408d940e335792645a98f03639573b0480e9e2e7cddbbab74f7c6d9f3fff" -dependencies = [ - "arrayvec 0.7.2", - "bit-vec", - "bitflags 1.3.2", - "codespan-reporting", - "fxhash", - "log", - "naga 0.11.1", - "parking_lot 0.12.1", - "profiling", - "raw-window-handle 0.5.2", - "smallvec", - "thiserror", - "web-sys", - "wgpu-hal 0.15.4", - "wgpu-types 0.15.2", + "wgpu-core", + "wgpu-hal", + "wgpu-types", ] [[package]] @@ -5147,63 +4511,21 @@ version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f478237b4bf0d5b70a39898a66fa67ca3a007d79f2520485b8b0c3dfc46f8c2" dependencies = [ - "arrayvec 0.7.2", + "arrayvec", "bit-vec", "bitflags 2.3.1", "codespan-reporting", "log", - "naga 0.12.2", + "naga", "parking_lot 0.12.1", "profiling", - "raw-window-handle 0.5.2", + "raw-window-handle", "rustc-hash", "smallvec", "thiserror", "web-sys", - "wgpu-hal 0.16.0", - "wgpu-types 0.16.0", -] - -[[package]] -name = "wgpu-hal" -version = "0.15.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdcf61a283adc744bb5453dd88ea91f3f86d5ca6b027661c6c73c7734ae0288b" -dependencies = [ - "android_system_properties", - "arrayvec 0.7.2", - "ash", - "bit-set", - "bitflags 1.3.2", - "block", - "core-graphics-types", - "d3d12", - "foreign-types 0.3.2", - "fxhash", - "glow 0.12.2", - "gpu-alloc", - "gpu-allocator", - "gpu-descriptor", - "hassle-rs 0.9.0", - "js-sys", - "khronos-egl", - "libc", - "libloading 0.7.4", - "log", - "metal", - "naga 0.11.1", - "objc", - "parking_lot 0.12.1", - "profiling", - "range-alloc", - "raw-window-handle 0.5.2", - "renderdoc-sys 0.7.1", - "smallvec", - "thiserror", - "wasm-bindgen", - "web-sys", - "wgpu-types 0.15.2", - "winapi", + "wgpu-hal", + "wgpu-types", ] [[package]] @@ -5213,52 +4535,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41af2ea7d87bd41ad0a37146252d5f7c26490209f47f544b2ee3b3ff34c7732e" dependencies = [ "android_system_properties", - "arrayvec 0.7.2", + "arrayvec", "ash", "bit-set", "bitflags 2.3.1", "block", "core-graphics-types", "d3d12", - "foreign-types 0.3.2", + "foreign-types", "glow 0.12.2", "gpu-alloc", "gpu-allocator", "gpu-descriptor", - "hassle-rs 0.10.0", + "hassle-rs", "js-sys", "khronos-egl", "libc", "libloading 0.8.0", "log", "metal", - "naga 0.12.2", + "naga", "objc", "parking_lot 0.12.1", "profiling", "range-alloc", - "raw-window-handle 0.5.2", + "raw-window-handle", "renderdoc-sys 1.0.0", "rustc-hash", "smallvec", "thiserror", "wasm-bindgen", "web-sys", - "wgpu-types 0.16.0", + "wgpu-types", "winapi", ] -[[package]] -name = "wgpu-types" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32444e121b0bd00cb02c0de32fde457a9491bd44e03e7a5db6df9b1da2f6f110" -dependencies = [ - "bitflags 1.3.2", - "js-sys", - "web-sys", -] - [[package]] name = "wgpu-types" version = "0.16.0" @@ -5270,24 +4581,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "wgpu_glyph" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e25440d5f32ec39de49c57c15c2d3f9133a7939b069b5ad07e5afd8b78fb8adc" -dependencies = [ - "bytemuck", - "glyph_brush", - "log", - "wgpu 0.15.1", -] - -[[package]] -name = "widestring" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983" - [[package]] name = "widestring" version = "1.0.2" @@ -5334,20 +4627,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "window_clipboard" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "015dd4474dc6aa96fe19aae3a24587a088bd90331dba5a5cc60fb3a180234c4d" -dependencies = [ - "clipboard-win", - "clipboard_macos", - "clipboard_wayland", - "clipboard_x11", - "raw-window-handle 0.3.4", - "thiserror", -] - [[package]] name = "windows" version = "0.44.0" @@ -5357,19 +4636,6 @@ dependencies = [ "windows-targets 0.42.2", ] -[[package]] -name = "windows-sys" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" -dependencies = [ - "windows_aarch64_msvc 0.36.1", - "windows_i686_gnu 0.36.1", - "windows_i686_msvc 0.36.1", - "windows_x86_64_gnu 0.36.1", - "windows_x86_64_msvc 0.36.1", -] - [[package]] name = "windows-sys" version = "0.42.0" @@ -5445,12 +4711,6 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" -[[package]] -name = "windows_aarch64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" - [[package]] name = "windows_aarch64_msvc" version = "0.42.2" @@ -5463,12 +4723,6 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" -[[package]] -name = "windows_i686_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" - [[package]] name = "windows_i686_gnu" version = "0.42.2" @@ -5481,12 +4735,6 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" -[[package]] -name = "windows_i686_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" - [[package]] name = "windows_i686_msvc" version = "0.42.2" @@ -5499,12 +4747,6 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" -[[package]] -name = "windows_x86_64_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" - [[package]] name = "windows_x86_64_gnu" version = "0.42.2" @@ -5529,12 +4771,6 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" -[[package]] -name = "windows_x86_64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" - [[package]] name = "windows_x86_64_msvc" version = "0.42.2" @@ -5547,39 +4783,6 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" -[[package]] -name = "winit" -version = "0.27.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb796d6fbd86b2fd896c9471e6f04d39d750076ebe5680a3958f00f5ab97657c" -dependencies = [ - "bitflags 1.3.2", - "cocoa", - "core-foundation", - "core-graphics", - "dispatch", - "instant", - "libc", - "log", - "mio", - "ndk", - "ndk-glue", - "objc", - "once_cell", - "parking_lot 0.12.1", - "percent-encoding", - "raw-window-handle 0.4.3", - "raw-window-handle 0.5.2", - "sctk-adwaita", - "smithay-client-toolkit", - "wasm-bindgen", - "wayland-client 0.29.5", - "wayland-protocols 0.29.5", - "web-sys", - "windows-sys 0.36.1", - "x11-dl", -] - [[package]] name = "winit" version = "0.28.6" @@ -5601,7 +4804,7 @@ dependencies = [ "once_cell", "orbclient", "percent-encoding", - "raw-window-handle 0.5.2", + "raw-window-handle", "redox_syscall 0.3.5", "smithay-client-toolkit", "wasm-bindgen", @@ -5643,18 +4846,6 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "x11rb" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e99be55648b3ae2a52342f9a870c0e138709a3493261ce9b469afe6e4df6d8a" -dependencies = [ - "gethostname", - "nix 0.22.3", - "winapi", - "winapi-wsapoll", -] - [[package]] name = "x11rb" version = "0.11.1" @@ -5698,12 +4889,6 @@ dependencies = [ "home", ] -[[package]] -name = "xi-unicode" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a" - [[package]] name = "xkbcommon" version = "0.4.1" diff --git a/Cargo.toml b/Cargo.toml index 02900343..73a1ba88 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,10 +30,8 @@ libsystemd = { version = "0.5", optional = true } wayland-backend = "0.1.0" wayland-scanner = "0.30.0" cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", branch = "main", default-features = false, features = ["server"] } -libcosmic = { git = "https://github.com/pop-os/libcosmic", rev = "31f7e97d5b", default-features = false, features = ["tiny_skia"] } -iced_core = { git = "https://github.com/pop-os/libcosmic", rev = "31f7e97d5b" } -iced_renderer = { git = "https://github.com/pop-os/libcosmic", rev = "31f7e97d5b" } -iced_tiny_skia = { git = "https://github.com/pop-os/libcosmic", rev = "31f7e97d5b" } +libcosmic = { git = "https://github.com/pop-os/libcosmic", rev = "5765053", default-features = false, features = ["tiny_skia"] } +iced_tiny_skia = { git = "https://github.com/pop-os/libcosmic", rev = "5765053" } tiny-skia = "0.9" ordered-float = "3.0" glow = "0.11.2" @@ -42,7 +40,7 @@ tracing-journald = "0.3.0" tracing = { version = "0.1.37", features = ["max_level_debug", "release_max_level_info"] } puffin = { version = "0.14.3", optional = true } puffin_egui = { version = "0.21.0", optional = true } -cosmic-time = "0.2.0" +cosmic-time = { git = "https://github.com/pop-os/cosmic-time", rev = "35dd0b8", default-features = false, features = ["libcosmic"] } [dependencies.id_tree] git = "https://github.com/Drakulix/id-tree.git" diff --git a/src/shell/element/stack.rs b/src/shell/element/stack.rs index 5e0bd728..615743f6 100644 --- a/src/shell/element/stack.rs +++ b/src/shell/element/stack.rs @@ -5,7 +5,7 @@ use crate::{ wayland::handlers::screencopy::ScreencopySessions, }; use calloop::LoopHandle; -use cosmic::Element; +use cosmic::{iced_core::Color, Element}; use cosmic_protocols::screencopy::v1::server::zcosmic_screencopy_session_v1::InputType; use smithay::{ backend::{ @@ -311,8 +311,8 @@ impl Program for CosmicStackInternal { mask.clone().unwrap() } - fn background_color(&self) -> iced_core::Color { - iced_core::Color { + fn background_color(&self) -> Color { + Color { r: 0.1176, g: 0.1176, b: 0.1176, diff --git a/src/shell/element/window.rs b/src/shell/element/window.rs index e25f76fd..2047efc8 100644 --- a/src/shell/element/window.rs +++ b/src/shell/element/window.rs @@ -12,7 +12,7 @@ use crate::{ wayland::handlers::screencopy::ScreencopySessions, }; use calloop::LoopHandle; -use cosmic::iced::Command; +use cosmic::{iced::Command, iced_core::Color}; use cosmic_protocols::screencopy::v1::server::zcosmic_screencopy_session_v1::InputType; use smithay::{ backend::{ @@ -258,16 +258,16 @@ impl Program for CosmicWindowInternal { mask.clone().unwrap() } - fn background_color(&self) -> iced_core::Color { + fn background_color(&self) -> Color { if self.window.is_activated() { - iced_core::Color { + Color { r: 0.1176, g: 0.1176, b: 0.1176, a: 1.0, } } else { - iced_core::Color { + Color { r: 0.153, g: 0.153, b: 0.153, diff --git a/src/utils/iced.rs b/src/utils/iced.rs index 93266f44..9698c759 100644 --- a/src/utils/iced.rs +++ b/src/utils/iced.rs @@ -13,6 +13,8 @@ use cosmic::{ window::{Event as WindowEvent, Id}, Command, Point as IcedPoint, Rectangle as IcedRectangle, Size as IcedSize, }, + iced_core::{clipboard::Null as NullClipboard, renderer::Style, Color}, + iced_renderer::Backend as BackendWrapper, iced_runtime::{ command::Action, program::{Program as IcedProgram, State}, @@ -20,8 +22,6 @@ use cosmic::{ }, Renderer as IcedRenderer, Theme, }; -use iced_core::{renderer::Style, Color}; -use iced_renderer::Backend as BackendWrapper; use iced_tiny_skia::{ graphics::{damage, Primitive, Viewport}, Backend, @@ -279,7 +279,7 @@ impl IcedElementInternal

{ &Style { text_color: self.theme.cosmic().on_bg_color().into(), }, - &mut iced_core::clipboard::Null, + &mut NullClipboard, &mut self.debug, ) .1