From a40b1e9a1a1e68faa4ee7cadfc61d7e832192f7a Mon Sep 17 00:00:00 2001 From: Michael Aaron Murphy Date: Wed, 20 Mar 2024 02:54:21 +0100 Subject: [PATCH] chore(cargo): update dependencies --- Cargo.lock | 366 ++++++++++++++++++++++--- app/Cargo.toml | 4 +- app/src/pages/desktop/dock/mod.rs | 4 +- app/src/pages/desktop/options.rs | 3 +- app/src/pages/desktop/panel/inner.rs | 2 +- app/src/pages/desktop/wallpaper/mod.rs | 3 +- app/src/pages/desktop/workspaces.rs | 3 +- app/src/pages/display/graphics.rs | 3 +- app/src/pages/display/mod.rs | 3 +- app/src/pages/input/keyboard/mod.rs | 2 +- app/src/pages/input/mouse.rs | 3 +- app/src/pages/time/date.rs | 2 +- pages/wallpapers/Cargo.toml | 2 +- 13 files changed, 334 insertions(+), 66 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 960ff4d..ab8f814 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -73,9 +73,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -86,6 +86,12 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" +[[package]] +name = "aligned-vec" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1" + [[package]] name = "allocator-api2" version = "0.2.16" @@ -182,12 +188,29 @@ dependencies = [ "num-traits", ] +[[package]] +name = "arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" + [[package]] name = "arc-swap" version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b3d0060af21e8d11a926981cc00c6c1541aa91dd64b9f881985c3da1094425f" +[[package]] +name = "arg_enum_proc_macro" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.53", +] + [[package]] name = "arrayref" version = "0.3.7" @@ -335,7 +358,7 @@ dependencies = [ "futures-lite 2.3.0", "parking", "polling 3.5.0", - "rustix 0.38.31", + "rustix 0.38.32", "slab", "tracing", "windows-sys 0.52.0", @@ -374,7 +397,7 @@ dependencies = [ "cfg-if", "event-listener 3.1.0", "futures-lite 1.13.0", - "rustix 0.38.31", + "rustix 0.38.32", "windows-sys 0.48.0", ] @@ -401,7 +424,7 @@ dependencies = [ "cfg-if", "futures-core", "futures-io", - "rustix 0.38.31", + "rustix 0.38.32", "signal-hook-registry", "slab", "windows-sys 0.48.0", @@ -447,7 +470,7 @@ name = "atomicwrites" version = "0.4.2" source = "git+https://github.com/jackpot51/rust-atomicwrites#043ab4859d53ffd3d55334685303d8df39c9f768" dependencies = [ - "rustix 0.38.31", + "rustix 0.38.32", "tempfile", "windows-sys 0.48.0", ] @@ -506,6 +529,29 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +[[package]] +name = "av1-grain" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6678909d8c5d46a42abcf571271e15fdbc0a225e3646cf23762cd415046c78bf" +dependencies = [ + "anyhow", + "arrayvec", + "log", + "nom", + "num-rational", + "v_frame", +] + +[[package]] +name = "avif-serialize" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "876c75a42f6364451a033496a14c44bffe41f5f4a8236f697391f11024e596d2" +dependencies = [ + "arrayvec", +] + [[package]] name = "backtrace" version = "0.3.69" @@ -563,6 +609,12 @@ dependencies = [ "serde", ] +[[package]] +name = "bitstream-io" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06c9989a51171e2e81038ab168b6ae22886fe9ded214430dbb4f41c28cf176da" + [[package]] name = "bitvec" version = "1.0.1" @@ -630,6 +682,12 @@ dependencies = [ "syn_derive", ] +[[package]] +name = "built" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d17f4d6e4dc36d1a02fbedc2753a096848e7c1b0772f7654eab8e2c927dd53" + [[package]] name = "bumpalo" version = "3.15.4" @@ -730,7 +788,7 @@ dependencies = [ "bitflags 2.5.0", "log", "polling 3.5.0", - "rustix 0.38.31", + "rustix 0.38.32", "slab", "thiserror", ] @@ -742,7 +800,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" dependencies = [ "calloop", - "rustix 0.38.31", + "rustix 0.38.32", "wayland-backend", "wayland-client", ] @@ -752,6 +810,10 @@ name = "cc" version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" +dependencies = [ + "jobserver", + "libc", +] [[package]] name = "cfb" @@ -1114,7 +1176,7 @@ dependencies = [ "colorgrad", "cosmic-config", "derive_setters", - "image", + "image 0.24.9", "ron", "serde", "tracing", @@ -1143,7 +1205,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#d02a4fefff319a3bd20936f9be30c4913bf49bab" +source = "git+https://github.com/pop-os/libcosmic#1575aa267cc5cd69ac65cfbe09fc7c4212d18e3a" dependencies = [ "atomicwrites", "calloop", @@ -1161,7 +1223,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#d02a4fefff319a3bd20936f9be30c4913bf49bab" +source = "git+https://github.com/pop-os/libcosmic#1575aa267cc5cd69ac65cfbe09fc7c4212d18e3a" dependencies = [ "quote", "syn 1.0.109", @@ -1211,7 +1273,6 @@ name = "cosmic-settings" version = "0.1.0" dependencies = [ "anyhow", - "apply", "ashpd 0.7.0", "async-channel", "clap", @@ -1233,11 +1294,10 @@ dependencies = [ "generator", "i18n-embed", "i18n-embed-fl", - "image", + "image 0.25.0", "itertools", "itoa", "libcosmic", - "log", "notify", "once_cell", "regex", @@ -1299,7 +1359,7 @@ dependencies = [ "freedesktop-icons", "futures-lite 2.3.0", "futures-util", - "image", + "image 0.25.0", "infer", "tokio", "tracing", @@ -1330,7 +1390,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#d02a4fefff319a3bd20936f9be30c4913bf49bab" +source = "git+https://github.com/pop-os/libcosmic#1575aa267cc5cd69ac65cfbe09fc7c4212d18e3a" dependencies = [ "almost", "cosmic-config", @@ -1632,7 +1692,7 @@ dependencies = [ "bytemuck", "drm-ffi", "drm-fourcc", - "rustix 0.38.31", + "rustix 0.38.32", ] [[package]] @@ -1642,7 +1702,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41334f8405792483e32ad05fbb9c5680ff4e84491883d2947a4757dc54cb2ac6" dependencies = [ "drm-sys", - "rustix 0.38.31", + "rustix 0.38.32", ] [[package]] @@ -2653,7 +2713,7 @@ dependencies = [ [[package]] name = "iced" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#d02a4fefff319a3bd20936f9be30c4913bf49bab" +source = "git+https://github.com/pop-os/libcosmic#1575aa267cc5cd69ac65cfbe09fc7c4212d18e3a" dependencies = [ "iced_accessibility", "iced_core", @@ -2661,7 +2721,7 @@ dependencies = [ "iced_renderer", "iced_sctk", "iced_widget", - "image", + "image 0.24.9", "thiserror", "window_clipboard", ] @@ -2669,7 +2729,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#d02a4fefff319a3bd20936f9be30c4913bf49bab" +source = "git+https://github.com/pop-os/libcosmic#1575aa267cc5cd69ac65cfbe09fc7c4212d18e3a" dependencies = [ "accesskit", "accesskit_unix", @@ -2678,7 +2738,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#d02a4fefff319a3bd20936f9be30c4913bf49bab" +source = "git+https://github.com/pop-os/libcosmic#1575aa267cc5cd69ac65cfbe09fc7c4212d18e3a" dependencies = [ "bitflags 1.3.2", "iced_accessibility", @@ -2698,7 +2758,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#d02a4fefff319a3bd20936f9be30c4913bf49bab" +source = "git+https://github.com/pop-os/libcosmic#1575aa267cc5cd69ac65cfbe09fc7c4212d18e3a" dependencies = [ "futures", "iced_core", @@ -2711,7 +2771,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#d02a4fefff319a3bd20936f9be30c4913bf49bab" +source = "git+https://github.com/pop-os/libcosmic#1575aa267cc5cd69ac65cfbe09fc7c4212d18e3a" dependencies = [ "bitflags 1.3.2", "bytemuck", @@ -2720,7 +2780,7 @@ dependencies = [ "half", "iced_core", "iced_futures", - "image", + "image 0.24.9", "kamadak-exif", "log", "lyon_path", @@ -2735,7 +2795,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#d02a4fefff319a3bd20936f9be30c4913bf49bab" +source = "git+https://github.com/pop-os/libcosmic#1575aa267cc5cd69ac65cfbe09fc7c4212d18e3a" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2747,7 +2807,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#d02a4fefff319a3bd20936f9be30c4913bf49bab" +source = "git+https://github.com/pop-os/libcosmic#1575aa267cc5cd69ac65cfbe09fc7c4212d18e3a" dependencies = [ "iced_accessibility", "iced_core", @@ -2760,7 +2820,7 @@ dependencies = [ [[package]] name = "iced_sctk" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#d02a4fefff319a3bd20936f9be30c4913bf49bab" +source = "git+https://github.com/pop-os/libcosmic#1575aa267cc5cd69ac65cfbe09fc7c4212d18e3a" dependencies = [ "enum-repr", "float-cmp", @@ -2786,7 +2846,7 @@ dependencies = [ [[package]] name = "iced_style" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#d02a4fefff319a3bd20936f9be30c4913bf49bab" +source = "git+https://github.com/pop-os/libcosmic#1575aa267cc5cd69ac65cfbe09fc7c4212d18e3a" dependencies = [ "iced_core", "once_cell", @@ -2796,7 +2856,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#d02a4fefff319a3bd20936f9be30c4913bf49bab" +source = "git+https://github.com/pop-os/libcosmic#1575aa267cc5cd69ac65cfbe09fc7c4212d18e3a" dependencies = [ "bytemuck", "cosmic-text", @@ -2813,7 +2873,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#d02a4fefff319a3bd20936f9be30c4913bf49bab" +source = "git+https://github.com/pop-os/libcosmic#1575aa267cc5cd69ac65cfbe09fc7c4212d18e3a" dependencies = [ "bitflags 1.3.2", "bytemuck", @@ -2832,7 +2892,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#d02a4fefff319a3bd20936f9be30c4913bf49bab" +source = "git+https://github.com/pop-os/libcosmic#1575aa267cc5cd69ac65cfbe09fc7c4212d18e3a" dependencies = [ "iced_renderer", "iced_runtime", @@ -2984,12 +3044,51 @@ dependencies = [ "tiff", ] +[[package]] +name = "image" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9b4f005360d32e9325029b38ba47ebd7a56f3316df09249368939562d518645" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "exr", + "gif 0.13.1", + "image-webp", + "num-traits", + "png", + "qoi", + "ravif", + "rayon", + "rgb", + "tiff", + "zune-core", + "zune-jpeg", +] + +[[package]] +name = "image-webp" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a84a25dcae3ac487bc24ef280f9e20c79c9b1a3e5e32cbed3041d1c514aa87c" +dependencies = [ + "byteorder", + "thiserror", +] + [[package]] name = "imagesize" version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" +[[package]] +name = "imgref" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126" + [[package]] name = "indenter" version = "0.3.3" @@ -3064,6 +3163,17 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "interpolate_name" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.53", +] + [[package]] name = "intl-memoizer" version = "0.5.1" @@ -3115,6 +3225,15 @@ version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +[[package]] +name = "jobserver" +version = "0.1.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" +dependencies = [ + "libc", +] + [[package]] name = "jpeg-decoder" version = "0.3.1" @@ -3229,7 +3348,7 @@ checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#d02a4fefff319a3bd20936f9be30c4913bf49bab" +source = "git+https://github.com/pop-os/libcosmic#1575aa267cc5cd69ac65cfbe09fc7c4212d18e3a" dependencies = [ "apply", "ashpd 0.7.0", @@ -3266,6 +3385,17 @@ dependencies = [ "zbus", ] +[[package]] +name = "libfuzzer-sys" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a96cfd5557eb82f2b83fed4955246c988d331975a002961b07c81584d107e7f7" +dependencies = [ + "arbitrary", + "cc", + "once_cell", +] + [[package]] name = "libloading" version = "0.7.4" @@ -3366,6 +3496,15 @@ version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +[[package]] +name = "loop9" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fae87c125b03c1d2c0150c90365d7d6bcc53fb73a9acaef207d2d065860f062" +dependencies = [ + "imgref", +] + [[package]] name = "lru" version = "0.12.3" @@ -3436,6 +3575,16 @@ dependencies = [ "libc", ] +[[package]] +name = "maybe-rayon" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519" +dependencies = [ + "cfg-if", + "rayon", +] + [[package]] name = "memchr" version = "2.7.1" @@ -3578,6 +3727,12 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "new_debug_unreachable" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" + [[package]] name = "nix" version = "0.26.4" @@ -3600,6 +3755,12 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "noop_proc_macro" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" + [[package]] name = "notify" version = "6.1.1" @@ -3672,6 +3833,17 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.53", +] + [[package]] name = "num-integer" version = "0.1.46" @@ -4057,7 +4229,7 @@ dependencies = [ "cfg-if", "concurrent-queue", "pin-project-lite", - "rustix 0.38.31", + "rustix 0.38.32", "tracing", "windows-sys 0.52.0", ] @@ -4131,6 +4303,19 @@ name = "profiling" version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58" +dependencies = [ + "profiling-procmacros", +] + +[[package]] +name = "profiling-procmacros" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" +dependencies = [ + "quote", + "syn 2.0.53", +] [[package]] name = "ptr_meta" @@ -4161,6 +4346,12 @@ dependencies = [ "bytemuck", ] +[[package]] +name = "quick-error" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" + [[package]] name = "quick-xml" version = "0.31.0" @@ -4227,6 +4418,56 @@ version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f60fcc7d6849342eff22c4350c8b9a989ee8ceabc4b481253e8946b9fe83d684" +[[package]] +name = "rav1e" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd87ce80a7665b1cce111f8a16c1f3929f6547ce91ade6addf4ec86a8dda5ce9" +dependencies = [ + "arbitrary", + "arg_enum_proc_macro", + "arrayvec", + "av1-grain", + "bitstream-io", + "built", + "cfg-if", + "interpolate_name", + "itertools", + "libc", + "libfuzzer-sys", + "log", + "maybe-rayon", + "new_debug_unreachable", + "noop_proc_macro", + "num-derive", + "num-traits", + "once_cell", + "paste", + "profiling", + "rand", + "rand_chacha", + "simd_helpers", + "system-deps", + "thiserror", + "v_frame", + "wasm-bindgen", +] + +[[package]] +name = "ravif" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc13288f5ab39e6d7c9d501759712e6969fcc9734220846fc9ed26cae2cc4234" +dependencies = [ + "avif-serialize", + "imgref", + "loop9", + "quick-error", + "rav1e", + "rayon", + "rgb", +] + [[package]] name = "raw-window-handle" version = "0.5.2" @@ -4532,9 +4773,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.31" +version = "0.38.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" dependencies = [ "bitflags 2.5.0", "errno", @@ -4711,6 +4952,15 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" +[[package]] +name = "simd_helpers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95890f873bec569a0362c235787f3aca6e1e887302ba4840839bcc6459c42da6" +dependencies = [ + "quote", +] + [[package]] name = "simdutf8" version = "0.1.4" @@ -4770,7 +5020,7 @@ dependencies = [ "log", "memmap2 0.9.4", "pkg-config", - "rustix 0.38.31", + "rustix 0.38.32", "thiserror", "wayland-backend", "wayland-client", @@ -4796,7 +5046,7 @@ dependencies = [ "libc", "log", "memmap2 0.9.4", - "rustix 0.38.31", + "rustix 0.38.32", "thiserror", "wayland-backend", "wayland-client", @@ -4866,7 +5116,7 @@ dependencies = [ "objc", "raw-window-handle 0.6.0", "redox_syscall 0.4.1", - "rustix 0.38.31", + "rustix 0.38.32", "tiny-xlib", "wasm-bindgen", "wayland-backend", @@ -5102,7 +5352,7 @@ checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", "fastrand 2.0.1", - "rustix 0.38.31", + "rustix 0.38.32", "windows-sys 0.52.0", ] @@ -5616,6 +5866,17 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +[[package]] +name = "v_frame" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6f32aaa24bacd11e488aa9ba66369c7cd514885742c9fe08cfe85884db3e92b" +dependencies = [ + "aligned-vec", + "num-traits", + "wasm-bindgen", +] + [[package]] name = "valuable" version = "0.1.0" @@ -5745,7 +6006,7 @@ checksum = "9d50fa61ce90d76474c87f5fc002828d81b32677340112b4ef08079a9d459a40" dependencies = [ "cc", "downcast-rs", - "rustix 0.38.31", + "rustix 0.38.32", "scoped-tls", "smallvec", "wayland-sys", @@ -5758,7 +6019,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f" dependencies = [ "bitflags 2.5.0", - "rustix 0.38.31", + "rustix 0.38.32", "wayland-backend", "wayland-scanner", ] @@ -5780,7 +6041,7 @@ version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71ce5fa868dd13d11a0d04c5e2e65726d0897be8de247c0c5a65886e283231ba" dependencies = [ - "rustix 0.38.31", + "rustix 0.38.32", "wayland-client", "xcursor", ] @@ -5832,7 +6093,7 @@ dependencies = [ "bitflags 2.5.0", "downcast-rs", "io-lifetimes 2.0.3", - "rustix 0.38.31", + "rustix 0.38.32", "wayland-backend", "wayland-scanner", ] @@ -6232,7 +6493,7 @@ dependencies = [ "libc", "libloading 0.8.3", "once_cell", - "rustix 0.38.31", + "rustix 0.38.32", "x11rb-protocol", ] @@ -6501,6 +6762,12 @@ dependencies = [ "syn 2.0.53", ] +[[package]] +name = "zune-core" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" + [[package]] name = "zune-inflate" version = "0.2.54" @@ -6510,6 +6777,15 @@ dependencies = [ "simd-adler32", ] +[[package]] +name = "zune-jpeg" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec866b44a2a1fd6133d363f073ca1b179f438f99e7e5bfb1e33f7181facfe448" +dependencies = [ + "zune-core", +] + [[package]] name = "zvariant" version = "3.15.2" diff --git a/app/Cargo.toml b/app/Cargo.toml index c6d2ba7..2595bad 100644 --- a/app/Cargo.toml +++ b/app/Cargo.toml @@ -6,7 +6,6 @@ license = "GPL-3.0" rust-version = "1.65.0" [dependencies] -apply = "0.3.0" async-channel = "2.1.1" color-eyre = "0.6.2" cosmic-bg-config = { workspace = true } @@ -33,12 +32,11 @@ cosmic-comp-config = { workspace = true } cosmic-panel-config = { workspace = true } tracing = "0.1.40" tracing-subscriber = "0.3.18" -log = "0.4" url = "2.5.0" freedesktop-desktop-entry = "0.5.0" notify = "6.1.1" anyhow = "1.0" -image = "0.24.8" +image = "0.25" serde = { version = "1.0.196", features = ["derive"] } ashpd = { version = "0.7", default-features = false } ron = "0.8" diff --git a/app/src/pages/desktop/dock/mod.rs b/app/src/pages/desktop/dock/mod.rs index 2a3cf53..599734f 100644 --- a/app/src/pages/desktop/dock/mod.rs +++ b/app/src/pages/desktop/dock/mod.rs @@ -1,6 +1,6 @@ use std::collections::HashMap; -use apply::Apply; +use cosmic::Apply; use cosmic::{ cosmic_config::{ConfigSet, CosmicConfigEntry}, widget::{settings, text, toggler}, @@ -8,8 +8,8 @@ use cosmic::{ }; use cosmic_panel_config::{CosmicPanelConfig, CosmicPanelContainerConfig}; use cosmic_settings_page::{self as page, section, Section}; -use log::error; use slotmap::SlotMap; +use tracing::error; use crate::pages::desktop::panel::inner::{ add_panel, behavior_and_position, configuration, reset_button, style, diff --git a/app/src/pages/desktop/options.rs b/app/src/pages/desktop/options.rs index 9d73bcf..7cc43d6 100644 --- a/app/src/pages/desktop/options.rs +++ b/app/src/pages/desktop/options.rs @@ -2,12 +2,11 @@ // SPDX-License-Identifier: GPL-3.0-only use super::Message; -use apply::Apply; use cosmic::{ iced::Length, theme, widget::{button, container, horizontal_space, icon, row, settings, toggler}, - Element, + Apply, Element, }; use cosmic_settings_page::Section; diff --git a/app/src/pages/desktop/panel/inner.rs b/app/src/pages/desktop/panel/inner.rs index 2e384ea..8855801 100644 --- a/app/src/pages/desktop/panel/inner.rs +++ b/app/src/pages/desktop/panel/inner.rs @@ -9,7 +9,7 @@ use cosmic::{ Element, }; -use apply::Apply; +use cosmic::Apply; use cosmic_panel_config::{ AutoHide, CosmicPanelBackground, CosmicPanelConfig, CosmicPanelContainerConfig, CosmicPanelOuput, PanelAnchor, PanelSize, diff --git a/app/src/pages/desktop/wallpaper/mod.rs b/app/src/pages/desktop/wallpaper/mod.rs index a938c7b..a15e2ab 100644 --- a/app/src/pages/desktop/wallpaper/mod.rs +++ b/app/src/pages/desktop/wallpaper/mod.rs @@ -14,8 +14,7 @@ use std::{ sync::Arc, }; -use apply::Apply; -use cosmic::{command, Command}; +use cosmic::{command, Apply, Command}; use cosmic::{ dialog::file_chooser, widget::{ diff --git a/app/src/pages/desktop/workspaces.rs b/app/src/pages/desktop/workspaces.rs index 22051fe..97ff824 100644 --- a/app/src/pages/desktop/workspaces.rs +++ b/app/src/pages/desktop/workspaces.rs @@ -3,12 +3,11 @@ // TODO make settings work -use apply::Apply; use cosmic::widget::settings; use cosmic::{ cosmic_config::{self, ConfigGet, ConfigSet}, widget::radio, - Element, + Apply, Element, }; use cosmic_comp_config::workspace::{WorkspaceConfig, WorkspaceLayout, WorkspaceMode}; use cosmic_settings_page::Section; diff --git a/app/src/pages/display/graphics.rs b/app/src/pages/display/graphics.rs index 37dc6be..83935b7 100644 --- a/app/src/pages/display/graphics.rs +++ b/app/src/pages/display/graphics.rs @@ -3,11 +3,10 @@ use super::{Message, NightLight}; use crate::pages; -use apply::Apply; use cosmic::iced_core::{Alignment, Length, Padding}; use cosmic::prelude::CollectionWidget; use cosmic::widget::{button, column, icon, list_column, row, toggler}; -use cosmic::{Command, Element}; +use cosmic::{Apply, Command, Element}; use std::sync::Arc; pub const INTEGRATED: &str = "integrated"; diff --git a/app/src/pages/display/mod.rs b/app/src/pages/display/mod.rs index aa2db3f..05a9f0b 100644 --- a/app/src/pages/display/mod.rs +++ b/app/src/pages/display/mod.rs @@ -6,14 +6,13 @@ pub mod graphics; pub mod text; use crate::{app, pages}; -use apply::Apply; use arrangement::Arrangement; use cosmic::iced::{Alignment, Length}; use cosmic::iced_widget::scrollable::{Direction, Properties, RelativeOffset}; use cosmic::widget::{ column, container, dropdown, list_column, segmented_button, tab_bar, toggler, }; -use cosmic::{command, Command, Element}; +use cosmic::{command, Apply, Command, Element}; use cosmic_randr_shell::{List, Output, OutputKey, Transform}; use cosmic_settings_page::{self as page, section, Section}; use slotmap::{Key, SlotMap}; diff --git a/app/src/pages/input/keyboard/mod.rs b/app/src/pages/input/keyboard/mod.rs index 3370f53..072e7c1 100644 --- a/app/src/pages/input/keyboard/mod.rs +++ b/app/src/pages/input/keyboard/mod.rs @@ -1,4 +1,3 @@ -use apply::Apply; use cosmic::{ iced::{ self, @@ -8,6 +7,7 @@ use cosmic::{ iced_core::Border, iced_style, theme, widget::{button, container, icon, radio, settings}, + Apply, }; use cosmic_settings_page::{self as page, section, Section}; use once_cell::sync::Lazy; diff --git a/app/src/pages/input/mouse.rs b/app/src/pages/input/mouse.rs index a64d5b1..a9f9635 100644 --- a/app/src/pages/input/mouse.rs +++ b/app/src/pages/input/mouse.rs @@ -1,7 +1,6 @@ -use apply::Apply; use cosmic::iced::Alignment; use cosmic::widget::{self, row, settings, text}; -use cosmic::Element; +use cosmic::{Apply, Element}; use cosmic_comp_config::input::AccelProfile; use cosmic_settings_page::Section; use cosmic_settings_page::{self as page, section}; diff --git a/app/src/pages/time/date.rs b/app/src/pages/time/date.rs index 004508c..2900d47 100644 --- a/app/src/pages/time/date.rs +++ b/app/src/pages/time/date.rs @@ -1,10 +1,10 @@ // Copyright 2023 System76 // SPDX-License-Identifier: GPL-3.0-only -use apply::Apply; use cosmic::{ iced::{widget::horizontal_space, Length}, widget::settings, + Apply, }; use cosmic_settings_page::Section; use cosmic_settings_page::{self as page, section}; diff --git a/pages/wallpapers/Cargo.toml b/pages/wallpapers/Cargo.toml index c7dac5c..73a9000 100644 --- a/pages/wallpapers/Cargo.toml +++ b/pages/wallpapers/Cargo.toml @@ -13,7 +13,7 @@ dirs = "5.0.1" freedesktop-icons = "0.2.5" futures-lite = "2.2.0" futures-util = "0.3.30" -image = "0.24.8" +image = "0.25.0" infer = "0.15.0" tokio = { version = "1.35.1", features = ["sync"] } tracing = "0.1.40"