diff --git a/.zed/settings.json b/.zed/settings.json new file mode 100644 index 0000000..2cc7b98 --- /dev/null +++ b/.zed/settings.json @@ -0,0 +1,15 @@ +{ + "format_on_save": "on", + "lsp": { + "rust-analyzer": { + "initialization_options": { + "check": { + "command": "clippy", + }, + "rustfmt": { + "extraArgs": ["+nightly"], + }, + }, + }, + }, +} diff --git a/Cargo.lock b/Cargo.lock index 759b54d..59b1f00 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -21,7 +21,7 @@ checksum = "366ffbaa4442f4684d91e2cd7c5ea7c4ed8add41959a31447066e279e432b618" [[package]] name = "accesskit" version = "0.22.0" -source = "git+https://github.com/wash2/accesskit?rev=6c20249#6c20249d3b9fd45e7002efad9f6b6171a9257912" +source = "git+https://github.com/wash2/accesskit?tag=cosmic-0.14#f0599eed5f18111228266fe3f28991cc48b5964f" dependencies = [ "uuid", ] @@ -29,7 +29,7 @@ dependencies = [ [[package]] name = "accesskit_atspi_common" version = "0.15.0" -source = "git+https://github.com/wash2/accesskit?rev=6c20249#6c20249d3b9fd45e7002efad9f6b6171a9257912" +source = "git+https://github.com/wash2/accesskit?tag=cosmic-0.14#f0599eed5f18111228266fe3f28991cc48b5964f" dependencies = [ "accesskit", "accesskit_consumer", @@ -41,7 +41,7 @@ dependencies = [ [[package]] name = "accesskit_consumer" version = "0.32.0" -source = "git+https://github.com/wash2/accesskit?rev=6c20249#6c20249d3b9fd45e7002efad9f6b6171a9257912" +source = "git+https://github.com/wash2/accesskit?tag=cosmic-0.14#f0599eed5f18111228266fe3f28991cc48b5964f" dependencies = [ "accesskit", "hashbrown 0.16.1", @@ -50,7 +50,7 @@ dependencies = [ [[package]] name = "accesskit_macos" version = "0.23.0" -source = "git+https://github.com/wash2/accesskit?rev=6c20249#6c20249d3b9fd45e7002efad9f6b6171a9257912" +source = "git+https://github.com/wash2/accesskit?tag=cosmic-0.14#f0599eed5f18111228266fe3f28991cc48b5964f" dependencies = [ "accesskit", "accesskit_consumer", @@ -63,7 +63,7 @@ dependencies = [ [[package]] name = "accesskit_unix" version = "0.18.0" -source = "git+https://github.com/wash2/accesskit?rev=6c20249#6c20249d3b9fd45e7002efad9f6b6171a9257912" +source = "git+https://github.com/wash2/accesskit?tag=cosmic-0.14#f0599eed5f18111228266fe3f28991cc48b5964f" dependencies = [ "accesskit", "accesskit_atspi_common", @@ -78,7 +78,7 @@ dependencies = [ [[package]] name = "accesskit_windows" version = "0.30.0" -source = "git+https://github.com/wash2/accesskit?rev=6c20249#6c20249d3b9fd45e7002efad9f6b6171a9257912" +source = "git+https://github.com/wash2/accesskit?tag=cosmic-0.14#f0599eed5f18111228266fe3f28991cc48b5964f" dependencies = [ "accesskit", "accesskit_consumer", @@ -91,7 +91,7 @@ dependencies = [ [[package]] name = "accesskit_winit" version = "0.30.0" -source = "git+https://github.com/wash2/accesskit?rev=6c20249#6c20249d3b9fd45e7002efad9f6b6171a9257912" +source = "git+https://github.com/wash2/accesskit?tag=cosmic-0.14#f0599eed5f18111228266fe3f28991cc48b5964f" dependencies = [ "accesskit", "accesskit_macos", @@ -131,9 +131,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.5" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c982642fa9e8606056828ee9a8505737230110bb1099153c79efe865c59d12ba" +checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" dependencies = [ "memchr", ] @@ -162,21 +162,6 @@ dependencies = [ "equator", ] -[[package]] -name = "alloc-no-stdlib" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" - -[[package]] -name = "alloc-stdlib" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e76a019e91224d279006ff972f1e984179a6e9feb050adba6ce8274aef23195" -dependencies = [ - "alloc-no-stdlib", -] - [[package]] name = "allocator-api2" version = "0.2.21" @@ -196,7 +181,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f2a1bb052857d5dd49572219344a7332b31b76405648eabac5bc68978251bcd" dependencies = [ "android-properties", - "bitflags 2.13.2", + "bitflags 2.11.1", "cc", "jni", "libc", @@ -205,7 +190,7 @@ dependencies = [ "ndk-context", "ndk-sys", "num_enum", - "thiserror 2.0.20", + "thiserror 2.0.18", ] [[package]] @@ -216,18 +201,18 @@ checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" [[package]] name = "android_system_properties" -version = "0.1.6" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae221649c9976a6f6c56ae1facf410f3ddb33cc661c4b7b61020a912d4237fbc" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" dependencies = [ "libc", ] [[package]] name = "anyhow" -version = "1.0.104" +version = "1.0.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "330a5ed07fa54e4702c9d6c4174f74427fc0ef6e214bbd677ae50a5099946470" +checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c" [[package]] name = "apply" @@ -252,9 +237,9 @@ checksum = "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1" [[package]] name = "arc-swap" -version = "1.9.2" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c049c0be4daef0b145cb3555416b3b8ef5b7888a38aea1a3a155801fe7b0810b" +checksum = "6a3a1fd6f75306b68087b831f025c712524bcb19aad54e557b1129cfa0a2b207" dependencies = [ "rustversion", ] @@ -267,7 +252,7 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" dependencies = [ "proc-macro2", "quote", - "syn 2.0.119", + "syn 2.0.117", ] [[package]] @@ -278,9 +263,9 @@ checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" [[package]] name = "arrayvec" -version = "0.7.8" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3fb67a6e08acf24fdeccbac2cb6ac4305825bd1f117462e0e6f2f193345ad56" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "as-slice" @@ -309,7 +294,7 @@ dependencies = [ "enumflags2", "futures-channel", "futures-util", - "rand 0.9.5", + "rand 0.9.4", "raw-window-handle", "serde", "serde_repr", @@ -327,7 +312,7 @@ dependencies = [ "enumflags2", "futures-channel", "futures-util", - "rand 0.9.5", + "rand 0.9.4", "serde", "serde_repr", "tokio", @@ -442,7 +427,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.119", + "syn 2.0.117", ] [[package]] @@ -471,13 +456,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.92" +version = "0.1.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82f6aeea286b8eb4dd3431a1be1b59d290ace00f5bfd8e2a159bc2a05e2c1667" +checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" dependencies = [ "proc-macro2", "quote", - "syn 3.0.5", + "syn 2.0.117", ] [[package]] @@ -535,34 +520,21 @@ dependencies = [ [[package]] name = "auto_enums" -version = "0.8.10" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3091d68264354f211516b91dce6f71046e444fab1867716035f736667243affb" +checksum = "65398a2893f41bce5c9259f6e1a4f03fbae40637c1bdc755b4f387f48c613b03" dependencies = [ "derive_utils", "proc-macro2", "quote", - "syn 3.0.5", + "syn 2.0.117", ] [[package]] name = "autocfg" -version = "1.5.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53" - -[[package]] -name = "av-data" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fca67ba5d317924c02180c576157afd54babe48a76ebc66ce6d34bb8ba08308e" -dependencies = [ - "byte-slice-cast", - "bytes", - "num-derive", - "num-rational", - "num-traits", -] +checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "av-scenechange" @@ -579,7 +551,7 @@ dependencies = [ "num-traits", "pastey", "rayon", - "thiserror 2.0.20", + "thiserror 2.0.18", "v_frame", "y4m", ] @@ -616,7 +588,7 @@ dependencies = [ "addr2line", "cfg-if", "libc", - "miniz_oxide 0.8.9", + "miniz_oxide", "object", "rustc-demangle", "windows-link 0.2.1", @@ -628,12 +600,6 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" -[[package]] -name = "base64" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac07cdecf99051d9a5238b80f35af32cdeba5b336e55d957b318b50137e18da5" - [[package]] name = "basic-toml" version = "0.1.10" @@ -649,7 +615,7 @@ version = "0.69.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "cexpr", "clang-sys", "itertools 0.12.1", @@ -659,8 +625,8 @@ dependencies = [ "quote", "regex", "rustc-hash 1.1.0", - "shlex 1.3.0", - "syn 2.0.119", + "shlex", + "syn 2.0.117", ] [[package]] @@ -692,22 +658,13 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.13.2" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ded4057c258ba199e2d26386d3af3780957ecaee6c4ef4041c6b4b8b97c0b06" +checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3" dependencies = [ "serde_core", ] -[[package]] -name = "bitreader" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "886559b1e163d56c765bc3a985febb4eee8009f625244511d8ee3c432e08c066" -dependencies = [ - "cfg-if", -] - [[package]] name = "bitstream-io" version = "4.10.0" @@ -725,11 +682,11 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" [[package]] name = "block-buffer" -version = "0.12.1" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2f6c7dbe95a6ed67ad9f18e57daf93a2f034c524b99fd2b76d18fdfeb6660aa" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ - "hybrid-array", + "generic-array", ] [[package]] @@ -752,9 +709,9 @@ dependencies = [ [[package]] name = "blocking" -version = "1.7.0" +version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a70e4329df6cb94385eed412ec92375c3cdd8a6e502493d1229b6414e4036dfa" +checksum = "e83f8d02be6967315521be875afa792a316e28d57b5a2d401897e2a7921b7f21" dependencies = [ "async-channel", "async-task", @@ -765,42 +722,23 @@ dependencies = [ [[package]] name = "borsh" -version = "1.8.1" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "553c5d846a6ba5150c65e3b1b8ec073bcf1abc20f9b7220de384a4443ea4e20a" +checksum = "cfd1e3f8955a5d7de9fab72fc8373fade9fb8a703968cb200ae3dc6cf08e185a" dependencies = [ "bytes", "cfg_aliases", ] -[[package]] -name = "brotli-decompressor" -version = "5.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a32acac15fe1967bc3986b2a6347dffc965602354ea6f450ad07e8bfd253583" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", -] - -[[package]] -name = "bs58" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4" -dependencies = [ - "tinyvec", -] - [[package]] name = "bstr" -version = "1.13.1" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb31b46c14244e20ee9984b11bf5c992b91fb6939fea616e3512c8baecdbe5f" +checksum = "63044e1ae8e69f3b5a92c736ca6269b8d12fa7efe39bf34ddb06d102cf0e2cab" dependencies = [ "memchr", "regex-automata", - "serde_core", + "serde", ] [[package]] @@ -812,24 +750,17 @@ dependencies = [ "num-traits", ] -[[package]] -name = "build_helpers" -version = "0.14.0" -dependencies = [ - "cfg_aliases", -] - [[package]] name = "built" -version = "0.8.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c0e531d93d39c34eef561e929e8a7f86d77a5af08aac4f6d6e39976c51858e9" +checksum = "f4ad8f11f288f48ca24471bbd51ac257aaeaaa07adae295591266b792902ae64" [[package]] name = "bumpalo" -version = "3.20.3" +version = "3.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649" +checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb" [[package]] name = "by_address" @@ -837,38 +768,26 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64fa3c856b712db6612c019f14756e64e4bcea13337a6b33b696333a9eaa2d06" -[[package]] -name = "byte-slice-cast" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7575182f7272186991736b70173b0ea045398f984bf5ebbb3804736ce1330c9d" - [[package]] name = "bytemuck" -version = "1.25.2" +version = "1.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95832e849adfb21180ccb6826a99da14e5d266ae5c2e668e1602cf234f153797" +checksum = "c8efb64bd706a16a1bdde310ae86b351e4d21550d98d056f22f8a7f7a2183fec" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.12.1" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a1f896587b6f2c069c73d2f0913e2d590c3990285cd2f0b6aa02b786b4c679c" +checksum = "f9abbd1bc6865053c427f7198e6af43bfdedc55ab791faed4fbd361d789575ff" dependencies = [ "proc-macro2", "quote", - "syn 3.0.5", + "syn 2.0.117", ] -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - [[package]] name = "byteorder-lite" version = "0.1.0" @@ -877,9 +796,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" [[package]] name = "bytes" -version = "1.12.1" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04" +checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33" [[package]] name = "calendrical_calculations" @@ -897,7 +816,7 @@ version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4dbf9978365bac10f54d1d4b04f7ce4427e51f71d61f2fe15e3fed5166474df7" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "polling", "rustix 1.1.4", "slab", @@ -918,14 +837,14 @@ dependencies = [ [[package]] name = "cc" -version = "1.4.6" +version = "1.2.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3eb0f42d6c360dc3f8a821f6bf2fdea7f72bfd36b3076eb0e6d1e9e0752fff4" +checksum = "d16d90359e986641506914ba71350897565610e87ce0ad9e6f28569db3dd5c6d" dependencies = [ "find-msvc-tools", "jobserver", "libc", - "shlex 2.0.1", + "shlex", ] [[package]] @@ -937,16 +856,6 @@ dependencies = [ "nom 7.1.3", ] -[[package]] -name = "cfg-expr" -version = "0.20.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe4ece8474b5f766c63426647e7b4b316b67431ade1036a8313cee24a03ae917" -dependencies = [ - "smallvec", - "target-lexicon", -] - [[package]] name = "cfg-if" version = "1.0.4" @@ -955,15 +864,15 @@ checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" [[package]] name = "cfg_aliases" -version = "0.2.2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f079e83a288787bcd14a6aea84cee5c87a67c5a3e660c30f557a3d24761b3527" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "chrono" -version = "0.4.45" +version = "0.4.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aa79e62e7697b8e29b513a68abacf485adcd1fe8284a4316c5ae868e6633327" +checksum = "c673075a2e0e5f4a1dde27ce9dee1ea4558c7ffe648f576438a20ca1d2acc4b0" dependencies = [ "iana-time-zone", "num-traits", @@ -973,9 +882,9 @@ dependencies = [ [[package]] name = "clang-sys" -version = "1.9.1" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "157a8ba7b480713b56f4c09fd13fc3e0a22a5dfab8097ba61cbc5feef950788a" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" dependencies = [ "glob", "libc", @@ -983,9 +892,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "1.1.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c133bc6a41be0d194c306b5506d15e6feeea7b1d6604bd3f8310dfb2ca96486" +checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9" [[package]] name = "clipboard-win" @@ -1090,9 +999,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "combine" -version = "4.6.8" +version = "4.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfc320937d09e6de266b31b9afb480f197d7a861be86be7cb2ea7e5d1bfffc5e" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" dependencies = [ "bytes", "memchr", @@ -1109,15 +1018,9 @@ dependencies = [ [[package]] name = "configparser" -version = "3.3.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "031ad3d167622974ed636505ae4556267ed4aa2aea0464122fa6bc9698a32825" - -[[package]] -name = "const-oid" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c" +checksum = "e57e3272f0190c3f1584272d613719ba5fc7df7f4942fe542e63d949cf3a649b" [[package]] name = "core-foundation" @@ -1175,7 +1078,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "core-foundation 0.10.1", "libc", ] @@ -1191,7 +1094,7 @@ dependencies = [ [[package]] name = "cosmic-applets-config" -version = "1.9.0" +version = "1.3.0" dependencies = [ "cosmic-config", "serde", @@ -1212,7 +1115,7 @@ dependencies = [ name = "cosmic-client-toolkit" version = "0.2.0" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "cosmic-protocols", "libc", "smithay-client-toolkit", @@ -1227,7 +1130,7 @@ dependencies = [ "cosmic-config", "cosmic-randr-shell", "input", - "ron 0.12.2", + "ron 0.12.1", "serde", "tracing", ] @@ -1245,7 +1148,7 @@ dependencies = [ "iced_futures", "known-folders", "notify", - "ron 0.12.2", + "ron 0.12.1", "serde", "tokio", "tracing", @@ -1258,7 +1161,7 @@ name = "cosmic-config-derive" version = "1.0.0" dependencies = [ "quote", - "syn 2.0.119", + "syn 2.0.117", ] [[package]] @@ -1273,7 +1176,7 @@ dependencies = [ name = "cosmic-dbus-networkmanager" version = "0.1.0" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "derive_builder", "jiff", "procfs", @@ -1288,8 +1191,8 @@ dependencies = [ "bstr", "btoi", "memchr", - "memmap2 0.9.11", - "thiserror 2.0.20", + "memmap2 0.9.10", + "thiserror 2.0.18", "tracing", "xdg", ] @@ -1310,14 +1213,12 @@ dependencies = [ "cosmic-dbus-networkmanager", "cosmic-greeter-config", "cosmic-greeter-daemon", - "cosmic-osk-config", "cosmic-protocols", "cosmic-randr-shell", "cosmic-settings-a11y-manager-subscription", "cosmic-settings-accessibility-subscription", "cosmic-settings-daemon-config", "dirs", - "enumflags2", "futures-util", "greetd_ipc", "i18n-embed", @@ -1326,15 +1227,14 @@ dependencies = [ "image", "jiff", "jiff-icu", - "jxl-oxide", "kdl", "libcosmic-yoda", "logind-zbus", "pam-client", "pwd", - "ron 0.12.2", + "ron 0.12.1", "rust-embed", - "shlex 1.3.0", + "shlex", "timedate-zbus", "tokio", "tracing", @@ -1372,7 +1272,7 @@ dependencies = [ "libc", "nix", "pwd", - "ron 0.12.2", + "ron 0.12.1", "serde", "tokio", "tracing", @@ -1381,22 +1281,13 @@ dependencies = [ "whitespace-conf", "xdg", "zbus", - "zbus_systemd", -] - -[[package]] -name = "cosmic-osk-config" -version = "0.1.0" -dependencies = [ - "cosmic-config", - "serde", ] [[package]] name = "cosmic-protocols" version = "0.2.0" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "wayland-backend", "wayland-client", "wayland-protocols", @@ -1411,12 +1302,12 @@ version = "1.3.0" dependencies = [ "kdl", "slotmap", - "thiserror 2.0.20", + "thiserror 2.0.18", ] [[package]] name = "cosmic-settings-a11y-manager-subscription" -version = "1.9.0" +version = "1.0.7" dependencies = [ "cosmic-protocols", "iced_futures", @@ -1429,7 +1320,7 @@ dependencies = [ [[package]] name = "cosmic-settings-accessibility-subscription" -version = "1.9.0" +version = "1.0.7" dependencies = [ "cosmic-dbus-a11y", "futures", @@ -1441,7 +1332,7 @@ dependencies = [ [[package]] name = "cosmic-settings-config" -version = "1.9.0" +version = "0.1.0" dependencies = [ "cosmic-config", "ron 0.11.0", @@ -1460,7 +1351,7 @@ dependencies = [ [[package]] name = "cosmic-settings-daemon-config" -version = "1.9.0" +version = "0.1.0" dependencies = [ "cosmic-config", "cosmic-theme", @@ -1471,15 +1362,15 @@ dependencies = [ name = "cosmic-text" version = "0.19.0" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "fontdb", "harfrust", "linebender_resource_handle", "log", "rangemap", - "rustc-hash 2.1.3", + "rustc-hash 2.1.2", "self_cell", - "skrifa 0.40.0", + "skrifa", "smol_str", "swash", "sys-locale", @@ -1501,35 +1392,35 @@ dependencies = [ "dirs", "hex_color", "palette", - "ron 0.12.2", + "ron 0.12.1", "serde", "serde_json", - "thiserror 2.0.20", + "thiserror 2.0.18", ] [[package]] name = "cpufeatures" -version = "0.3.1" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca28b0ae3115b884660db4118d803791fd6756b6e88f39c0f3f7859060d7566" +checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" dependencies = [ "libc", ] [[package]] name = "crc32fast" -version = "1.5.2" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01a7799fd6b852db0e61728dde9a204c423b44d689dbd432522543614b490e78" +checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" dependencies = [ "cfg-if", ] [[package]] name = "crossbeam-deque" -version = "0.8.8" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622f3fc73690be383c7214310406f28a90e6edeadc3cea882f9d71e495b9711a" +checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" dependencies = [ "crossbeam-epoch", "crossbeam-utils", @@ -1537,18 +1428,18 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.21" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc74980687109a3b14c72fd458107bf0baa1da1a1a805e178d15501ba9b86d9d" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.23" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31eee39dddec8330830986fcd7625edb5a24ec90ea038215273bbc3adb08ac6" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "crunchy" @@ -1563,17 +1454,18 @@ dependencies = [ "cosmic-text", "etagere", "lru", - "rustc-hash 2.1.3", + "rustc-hash 2.1.2", "wgpu", ] [[package]] name = "crypto-common" -version = "0.2.2" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6e4c961d6cd6c9a86db418387425e8bdeaf05b3c8bc1411e6dca4c252f1453" +checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" dependencies = [ - "hybrid-array", + "generic-array", + "typenum", ] [[package]] @@ -1584,12 +1476,12 @@ checksum = "42aaeae719fd78ce501d77c6cdf01f7e96f26bcd5617a4903a1c2b97e388543a" [[package]] name = "csscolorparser" -version = "0.8.4" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168dbdf4dced8f57fa4246ac9080598452b49d70bb2d0e46422142f113140dd8" +checksum = "199f851bd3cb5004c09474252c7f74e7c047441ed0979bf3688a7106a13da952" dependencies = [ "num-traits", - "phf", + "phf 0.13.1", "serde", "uncased", ] @@ -1622,12 +1514,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.24.1" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed17f5901b6630b993ca003def43f2f8ef4014fc13b047b57aad617ff32bc2ec" +checksum = "25ae13da2f202d56bd7f91c25fba009e7717a1e4a1cc98a76d844b65ae912e9d" dependencies = [ - "darling_core 0.24.1", - "darling_macro 0.24.1", + "darling_core 0.23.0", + "darling_macro 0.23.0", ] [[package]] @@ -1641,7 +1533,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.119", + "syn 2.0.117", ] [[package]] @@ -1655,20 +1547,20 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.119", + "syn 2.0.117", ] [[package]] name = "darling_core" -version = "0.24.1" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6837e2cf7485aaae18f86181d2f0e9a7ed297a025e220aeabf63fdebd3a2ddff" +checksum = "9865a50f7c335f53564bb694ef660825eb8610e0a53d3e11bf1b0d3df31e03b0" dependencies = [ "ident_case", "proc-macro2", "quote", "strsim", - "syn 3.0.5", + "syn 2.0.117", ] [[package]] @@ -1679,7 +1571,7 @@ checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" dependencies = [ "darling_core 0.20.11", "quote", - "syn 2.0.119", + "syn 2.0.117", ] [[package]] @@ -1690,18 +1582,18 @@ checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81" dependencies = [ "darling_core 0.21.3", "quote", - "syn 2.0.119", + "syn 2.0.117", ] [[package]] name = "darling_macro" -version = "0.24.1" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ac7135c3ef02b2f7833bbeb1be5ba7f966dcde8a87c6b87f65a778d71a02785" +checksum = "ac3984ec7bd6cfa798e62b4a642426a5be0e68f9401cfc2a01e3fa9ea2fcdb8d" dependencies = [ - "darling_core 0.24.1", + "darling_core 0.23.0", "quote", - "syn 3.0.5", + "syn 2.0.117", ] [[package]] @@ -1710,65 +1602,13 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be1e0bca6c3637f992fc1cc7cbc52a78c1ef6db076dbf1059c4323d6a2048376" -[[package]] -name = "dav1d" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ee89cb860616069c67520dcd66cacdb900b57c799f634a0eb6d91f6e2a82b61" -dependencies = [ - "av-data", - "bitflags 2.13.2", - "dav1d-sys", - "static_assertions", -] - -[[package]] -name = "dav1d-sys" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c91aea6668645415331133ed6f8ddf0e7f40160cd97a12d59e68716a58704b" -dependencies = [ - "libc", - "system-deps", -] - -[[package]] -name = "defmt" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2953bfe4f93bbd20cc71198842756f77d161884c99ebbabc41d80231ded88d1" -dependencies = [ - "bitflags 1.3.2", - "defmt-macros", -] - -[[package]] -name = "defmt-macros" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bad9c72e7ca2137e0dc3813245a0d282fd6daad32fd800af018306a9169b5fe8" -dependencies = [ - "defmt-parser", - "proc-macro2", - "quote", - "syn 2.0.119", -] - -[[package]] -name = "defmt-parser" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10d60334b3b2e7c9d91ef8150abfb6fa4c1c39ebbcf4a81c2e346aad939fee3e" -dependencies = [ - "thiserror 2.0.20", -] - [[package]] name = "deranged" version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c" dependencies = [ + "powerfmt", "serde_core", ] @@ -1790,7 +1630,7 @@ dependencies = [ "darling 0.20.11", "proc-macro2", "quote", - "syn 2.0.119", + "syn 2.0.117", ] [[package]] @@ -1800,7 +1640,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" dependencies = [ "derive_builder_core", - "syn 2.0.119", + "syn 2.0.117", ] [[package]] @@ -1812,28 +1652,27 @@ dependencies = [ "darling 0.21.3", "proc-macro2", "quote", - "syn 2.0.119", + "syn 2.0.117", ] [[package]] name = "derive_utils" -version = "0.16.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc05a5d33db20c784f873e84934ad94bb209a090987ac5f62fede2c178234f23" +checksum = "362f47930db19fe7735f527e6595e4900316b893ebf6d48ad3d31be928d57dd6" dependencies = [ "proc-macro2", "quote", - "syn 3.0.5", + "syn 2.0.117", ] [[package]] name = "digest" -version = "0.11.3" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1dd6dbb5841937940781866fa1281a1ff7bd3bf827091440879f9994983d5c2" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", - "const-oid", "crypto-common", ] @@ -1855,7 +1694,7 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -1864,7 +1703,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "block2 0.6.2", "libc", "objc2 0.6.4", @@ -1872,13 +1711,13 @@ dependencies = [ [[package]] name = "displaydoc" -version = "0.2.7" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6232dd377dcc64799954cbd3a9bb882e9cdc1308ccd87b1c098f1fb2eaf82a8" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 3.0.5", + "syn 2.0.117", ] [[package]] @@ -1894,7 +1733,7 @@ dependencies = [ name = "dnd" version = "0.1.0" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "mime 0.1.0", "raw-window-handle", "smithay-client-toolkit", @@ -1928,9 +1767,9 @@ checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" [[package]] name = "either" -version = "1.18.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "252afb9ae5eaa683babdc6a068b3f5726eb19e05070c731f9b2a23a7c3e8ed34" +checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" [[package]] name = "endi" @@ -1967,7 +1806,7 @@ checksum = "67c78a4d8fdf9953a5c9d458f9efe940fd97a0cab0941c075a813ac594733827" dependencies = [ "proc-macro2", "quote", - "syn 2.0.119", + "syn 2.0.117", ] [[package]] @@ -1987,7 +1826,7 @@ checksum = "44f23cf4b44bfce11a86ace86f8a73ffdec849c9fd00a386a53d278bd9e81fb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.119", + "syn 2.0.117", ] [[package]] @@ -2003,14 +1842,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] name = "error-code" -version = "3.4.0" +version = "3.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b5343afd4a8365a643ac588dab4cf234a190c7f6c88c9f6dd6ffe00837661b7" +checksum = "dea2df4cf52843e0452895c455a1a2cfbb842a1e7329671acf418fdc53ed4c59" [[package]] name = "etagere" @@ -2033,10 +1872,11 @@ dependencies = [ [[package]] name = "event-listener" -version = "5.4.2" +version = "5.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a23add41df1562121a9393cb065eab5146a1242410f23a644851e90cfd669d2" +checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab" dependencies = [ + "concurrent-queue", "parking", "pin-project-lite", ] @@ -2053,16 +1893,14 @@ dependencies = [ [[package]] name = "exr" -version = "1.74.2" +version = "1.74.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711fe42c9964295e01ee3fba3f9fe0e1d24b98886950d68efe81b1c76e21adf3" +checksum = "4300e043a56aa2cb633c01af81ca8f699a321879a7854d3896a0ba89056363be" dependencies = [ "bit_field", "half", "lebe", - "miniz_oxide 0.8.9", - "num-complex", - "pulp", + "miniz_oxide", "rayon-core", "smallvec", "zune-inflate", @@ -2070,29 +1908,25 @@ dependencies = [ [[package]] name = "eyre" -version = "0.6.14" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08309dbcc659c5549a24ddb9b27027640641b282ef5768267c7e675558986a3" +checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" dependencies = [ - "autocfg", "indenter", "once_cell", ] [[package]] -name = "fallible_collections" -version = "0.4.9" +name = "fast-srgb8" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a88c69768c0a15262df21899142bc6df9b9b823546d4b4b9a7bc2d6c448ec6fd" -dependencies = [ - "hashbrown 0.13.2", -] +checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1" [[package]] name = "fastrand" -version = "2.5.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da7c62ceae207dd37ea5b845da6a0696c799f85e97da1ab5b7910be3c1c80223" +checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6" [[package]] name = "fdeflate" @@ -2109,14 +1943,14 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59a98bbaacea1c0eb6a0876280051b892eb73594fd90cf3b20e9c817029c57d2" dependencies = [ - "toml 0.5.11", + "toml", ] [[package]] name = "find-msvc-tools" -version = "0.1.12" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e0f1c7c3a72c66fd80abe965175f7523475c0489a87d3ff9d6e8c87d87a9d2d" +checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" [[package]] name = "fixed_decimal" @@ -2131,13 +1965,12 @@ dependencies = [ [[package]] name = "flate2" -version = "1.1.10" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e634e2e0ebac1ee034020da1ca582e17ffe4e0f5e985823721e168928136dcb" +checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c" dependencies = [ "crc32fast", - "miniz_oxide 0.9.1", - "zlib-rs", + "miniz_oxide", ] [[package]] @@ -2181,7 +2014,7 @@ dependencies = [ "fluent-syntax", "intl-memoizer", "intl_pluralrules", - "rustc-hash 2.1.3", + "rustc-hash 2.1.2", "self_cell", "smallvec", "unic-langid", @@ -2203,7 +2036,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54f0d287c53ffd184d04d8677f590f4ac5379785529e5e08b1c8083acdd5c198" dependencies = [ "memchr", - "thiserror 2.0.20", + "thiserror 2.0.18", ] [[package]] @@ -2233,15 +2066,6 @@ dependencies = [ "bytemuck", ] -[[package]] -name = "font-types" -version = "0.12.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8eb065f3251655b3c90e22e5e363f310fc5332fb3402e37bbc94752283248f6" -dependencies = [ - "bytemuck", -] - [[package]] name = "fontconfig-parser" version = "0.5.8" @@ -2259,7 +2083,7 @@ checksum = "457e789b3d1202543297a350643cf459f836cade38934e7a4cf6a39e7cde2905" dependencies = [ "fontconfig-parser", "log", - "memmap2 0.9.11", + "memmap2 0.9.10", "slotmap", "tinyvec", "ttf-parser", @@ -2277,13 +2101,13 @@ dependencies = [ [[package]] name = "foreign-types-macros" -version = "0.2.4" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea5190182e6915eb873ddbc16e23b711b6eb1f9c00a0d0a3a91b5f6228475225" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 3.0.5", + "syn 2.0.117", ] [[package]] @@ -2303,15 +2127,15 @@ dependencies = [ [[package]] name = "freedesktop-desktop-entry" -version = "0.8.3" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cfa09933e03f1ced380ad639822d65cb59a1914217da6c72aa8db3563e94214" +checksum = "28273c5c6b97a5f07724f6652f064c0c7f637f9aa5e7c09c83bc3bc4ad4ea245" dependencies = [ "bstr", "gettext-rs", "log", "memchr", - "thiserror 2.0.20", + "thiserror 2.0.18", "unicase", "xdg", ] @@ -2327,9 +2151,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.34" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a31d2a3fbaaeb2af2368bbdd904aa8e812d3c04a1ee10d3171f52d556e5d0a3" +checksum = "8b147ee9d1f6d097cef9ce628cd2ee62288d963e16fb287bd9286455b241382d" dependencies = [ "futures-channel", "futures-core", @@ -2342,9 +2166,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.34" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f9e3d69d39e4862ffed03ed071a76f9a13ba1d9109d355b0f0aa6b15e393c4" +checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d" dependencies = [ "futures-core", "futures-sink", @@ -2352,15 +2176,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.34" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d699e522242e69e3003b94ecc1f960f3a5e015aa7c5d7486e65ad01dd94f5e" +checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d" [[package]] name = "futures-executor" -version = "0.3.34" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "031b47cf1a3c6cc8bc2fc76cd437f521619387907d469316e7c0bc278f1f5432" +checksum = "baf29c38818342a3b26b5b923639e7b1f4a61fc5e76102d4b1981c6dc7a7579d" dependencies = [ "futures-core", "futures-task", @@ -2369,9 +2193,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.34" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53c0fa8157de1303bfffdaa1cc2a673bfffb60102f76b0ef4441659124373fed" +checksum = "cecba35d7ad927e23624b22ad55235f2239cfa44fd10428eecbeba6d6a717718" [[package]] name = "futures-lite" @@ -2388,32 +2212,32 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.34" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb9654ba8355388abeb8dcb4fc62f511300867002afc858860463bdd9fe0c44" +checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b" dependencies = [ "proc-macro2", "quote", - "syn 3.0.5", + "syn 2.0.117", ] [[package]] name = "futures-sink" -version = "0.3.34" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1944426bf7d03f1d14f708785e4b33efd750b36d48a157b836b3efc15ede8e1d" +checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893" [[package]] name = "futures-task" -version = "0.3.34" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd417de3d1d015fc3bfd2b1ea46dfc7bab72ef86f1cc7cc9c78e728b34a6d1fd" +checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393" [[package]] name = "futures-util" -version = "0.3.34" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d50a92467f8ba5dd6e3ee5d4bd04d73ab2e4e1c44474a0674821dfce14b79bc" +checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6" dependencies = [ "futures-channel", "futures-core", @@ -2426,6 +2250,16 @@ dependencies = [ "slab", ] +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + [[package]] name = "getrandom" version = "0.2.17" @@ -2451,20 +2285,22 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.4.3" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099" +checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555" dependencies = [ "cfg-if", "libc", "r-efi 6.0.0", + "wasip2", + "wasip3", ] [[package]] name = "gettext-rs" -version = "0.8.0" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9df5e3fa8c077b15fdfa8ce130e2bc73d663b8aaa6d51b71421b8659980b1d80" +checksum = "5d5857dc1b7f0fee86961de833f434e29494d72af102ce5355738c0664222bdf" dependencies = [ "gettext-sys", "locale_config", @@ -2472,9 +2308,9 @@ dependencies = [ [[package]] name = "gettext-sys" -version = "0.27.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4caa7e4460b196107cc1bb2629488e8b6dbb7f34f6683ea6753c4ac22f590785" +checksum = "4ea859ab0dd7e70ff823032b3e077d03d39c965d68c6c10775add60e999d8ee9" dependencies = [ "cc", "temp-dir", @@ -2515,9 +2351,9 @@ checksum = "151665d9be52f9bb40fc7966565d39666f2d1e69233571b71b87791c7e0528b3" [[package]] name = "glob" -version = "0.3.4" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4eba85ea1d0a966a983acd07deee566e67395d2d96b6fb39e62b5a833f1eb0b" +checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" [[package]] name = "glow" @@ -2550,8 +2386,8 @@ dependencies = [ "hashbrown 0.16.1", "log", "presser", - "thiserror 2.0.20", - "windows 0.62.2", + "thiserror 2.0.18", + "windows 0.61.3", ] [[package]] @@ -2560,7 +2396,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b89c83349105e3732062a895becfc71a8f921bb71ecbbdd8ff99263e3b53a0ca" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "gpu-descriptor-types", "hashbrown 0.15.5", ] @@ -2571,7 +2407,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", ] [[package]] @@ -2621,10 +2457,10 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9da2e5ae821f6e96664977bf974d6d6a2d6682f9ccee23e62ec1d134246845f9" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "bytemuck", "core_maths", - "read-fonts 0.37.0", + "read-fonts", "smallvec", ] @@ -2634,15 +2470,6 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -[[package]] -name = "hashbrown" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" -dependencies = [ - "ahash", -] - [[package]] name = "hashbrown" version = "0.15.5" @@ -2665,9 +2492,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.17.1" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a" +checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51" [[package]] name = "heck" @@ -2689,9 +2516,9 @@ checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hermit-abi" -version = "0.5.3" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e17592d60ebacc7d5e169f4663c5f84f9161cc90328abcfe8456f41e4dfcb284" +checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c" [[package]] name = "hex" @@ -2706,7 +2533,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d37f101bf4c633f7ca2e4b5e136050314503dd198e78e325ea602c327c484ef0" dependencies = [ "arrayvec", - "rand 0.8.8", + "rand 0.8.6", "serde", ] @@ -2716,15 +2543,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" -[[package]] -name = "hybrid-array" -version = "0.4.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27f864f10dfb56725ce5ce5472bc52252c8f93a4ab86327122cebf62c5f59a17" -dependencies = [ - "typenum", -] - [[package]] name = "i18n-config" version = "0.4.8" @@ -2762,20 +2580,20 @@ dependencies = [ [[package]] name = "i18n-embed-fl" -version = "0.10.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "602e6bd30c3db2749e13e38b363a3d98d9d41de1d8de7a79c31bb69e45b47cda" +checksum = "e598ed73b67db92f61e04672e599eef2991a262a40e1666735b8a86d2e7e9f30" dependencies = [ "find-crate", "fluent", "fluent-syntax", "i18n-config", "i18n-embed", - "proc-macro-error3", + "proc-macro-error2", "proc-macro2", "quote", "strsim", - "syn 2.0.119", + "syn 2.0.117", "unic-langid", ] @@ -2789,7 +2607,7 @@ dependencies = [ "i18n-config", "proc-macro2", "quote", - "syn 2.0.119", + "syn 2.0.117", ] [[package]] @@ -2820,7 +2638,6 @@ dependencies = [ name = "iced" version = "0.14.0" dependencies = [ - "build_helpers", "dnd", "iced_accessibility", "iced_core", @@ -2833,7 +2650,7 @@ dependencies = [ "iced_winit", "image", "mime 0.1.0", - "thiserror 2.0.20", + "thiserror 2.0.18", "window_clipboard", ] @@ -2849,8 +2666,7 @@ dependencies = [ name = "iced_core" version = "0.14.0" dependencies = [ - "bitflags 2.13.2", - "build_helpers", + "bitflags 2.11.1", "bytes", "cosmic-client-toolkit", "dnd", @@ -2861,10 +2677,10 @@ dependencies = [ "num-traits", "palette", "raw-window-handle", - "rustc-hash 2.1.3", + "rustc-hash 2.1.2", "serde", "smol_str", - "thiserror 2.0.20", + "thiserror 2.0.18", "unicode-segmentation", "web-time", "window_clipboard", @@ -2886,7 +2702,7 @@ dependencies = [ "futures", "iced_core", "log", - "rustc-hash 2.1.3", + "rustc-hash 2.1.2", "tokio", "wasm-bindgen-futures", "wasmtimer", @@ -2896,7 +2712,7 @@ dependencies = [ name = "iced_graphics" version = "0.14.0" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "bytemuck", "cosmic-text", "half", @@ -2907,8 +2723,8 @@ dependencies = [ "log", "lyon_path", "raw-window-handle", - "rustc-hash 2.1.3", - "thiserror 2.0.20", + "rustc-hash 2.1.2", + "thiserror 2.0.18", "unicode-segmentation", ] @@ -2928,21 +2744,20 @@ dependencies = [ "iced_tiny_skia", "iced_wgpu", "log", - "thiserror 2.0.20", + "thiserror 2.0.18", ] [[package]] name = "iced_runtime" version = "0.14.0" dependencies = [ - "build_helpers", "bytes", "cosmic-client-toolkit", "dnd", "iced_core", "iced_futures", "raw-window-handle", - "thiserror 2.0.20", + "thiserror 2.0.18", "window_clipboard", ] @@ -2957,17 +2772,16 @@ dependencies = [ "kurbo 0.10.4", "log", "resvg", - "rustc-hash 2.1.3", + "rustc-hash 2.1.2", "softbuffer", - "tiny-skia 0.11.4", + "tiny-skia", ] [[package]] name = "iced_wgpu" version = "0.14.0" dependencies = [ - "bitflags 2.13.2", - "build_helpers", + "bitflags 2.11.1", "bytemuck", "cosmic-client-toolkit", "cryoglyph", @@ -2980,9 +2794,9 @@ dependencies = [ "lyon", "raw-window-handle", "resvg", - "rustc-hash 2.1.3", + "rustc-hash 2.1.2", "rustix 0.38.44", - "thiserror 2.0.20", + "thiserror 2.0.18", "wayland-backend", "wayland-client", "wayland-protocols", @@ -2994,7 +2808,6 @@ dependencies = [ name = "iced_widget" version = "0.14.2" dependencies = [ - "build_helpers", "cosmic-client-toolkit", "dnd", "iced_renderer", @@ -3002,8 +2815,8 @@ dependencies = [ "log", "num-traits", "ouroboros", - "rustc-hash 2.1.3", - "thiserror 2.0.20", + "rustc-hash 2.1.2", + "thiserror 2.0.18", "unicode-segmentation", "window_clipboard", ] @@ -3012,7 +2825,6 @@ dependencies = [ name = "iced_winit" version = "0.14.0" dependencies = [ - "build_helpers", "cosmic-client-toolkit", "cursor-icon", "dnd", @@ -3023,9 +2835,9 @@ dependencies = [ "iced_runtime", "log", "raw-window-handle", - "rustc-hash 2.1.3", + "rustc-hash 2.1.2", "rustix 0.38.44", - "thiserror 2.0.20", + "thiserror 2.0.18", "wasm-bindgen-futures", "wayland-backend", "wayland-client", @@ -3042,9 +2854,9 @@ dependencies = [ [[package]] name = "icu" -version = "2.3.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4867dd3a39b9d48632416cc7fc3dfa1913d89fd36cc02fe7bfc1dddc6fda3cde" +checksum = "00380f83691e089bcfa4aeb03a2d96a910b1c9ea406d6f822fc19dfb8b58d1ec" dependencies = [ "icu_calendar", "icu_casemap", @@ -3066,15 +2878,15 @@ dependencies = [ [[package]] name = "icu_calendar" -version = "2.3.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58655df2f728e46e4eee80bddebefacf52ec3e77cdb925014b47c5a5905eb55c" +checksum = "a2b2acc6263f494f1df50685b53ff8e57869e47d5c6fe39c23d518ae9a4f3e45" dependencies = [ "calendrical_calculations", "displaydoc", "icu_calendar_data", + "icu_locale", "icu_locale_core", - "icu_locale_fallback", "icu_provider", "ixdtf", "serde", @@ -3084,15 +2896,15 @@ dependencies = [ [[package]] name = "icu_calendar_data" -version = "2.3.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc00caaa3fb3201ff7a18aa458e8c3ab042b9da154cfdf948bdde3936c31c36e" +checksum = "118577bcf3a0fa7c6ac0a7d6e951814da84ee56b9b1f68fb4d8d10b08cefaf4d" [[package]] name = "icu_casemap" -version = "2.3.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2edfd120d8445de853cf53a1abec916f638f933a70a6f4bf8f7e2d7b7f884e9" +checksum = "070f98b5b82798fcb93654bf96ed9f40064fc44c86f51a09ea711092cd5cc5be" dependencies = [ "icu_casemap_data", "icu_collections", @@ -3106,20 +2918,20 @@ dependencies = [ [[package]] name = "icu_casemap_data" -version = "2.3.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "059fcda0fc8d33effc6633a8cf0d8a3c17caf7d7c91918fba9918744f501e4e8" +checksum = "846b0857ca091204be3c874bc93daaf89d4777e8d2d20b0d3ffe8f671d98014b" [[package]] name = "icu_collator" -version = "2.3.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08984ed58ac439ebf3e13d2cf26b0c46a60afcd21721c1d14087c0b240344dda" +checksum = "b521b92a2666061ddda902769d8a4cf730b5c9529a845cc1b69770b12a6c9a71" dependencies = [ "icu_collator_data", "icu_collections", + "icu_locale", "icu_locale_core", - "icu_locale_fallback", "icu_normalizer", "icu_properties", "icu_provider", @@ -3131,15 +2943,15 @@ dependencies = [ [[package]] name = "icu_collator_data" -version = "2.3.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d7e54efdddeb1208c08dd5d32b53a879ac00d2d3d051b2255fd26821d16368" +checksum = "038ed8e5817f2059c2f3efb0945ba78d060d3d25e8f1a1bea5139f821a21a2f0" [[package]] name = "icu_collections" -version = "2.3.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa68d21081c4a05d5a901a1c62add574c77048b6a1c67be3b50ce0b60d4ca513" +checksum = "2984d1cd16c883d7935b9e07e44071dca8d917fd52ecc02c04d5fa0b5a3f191c" dependencies = [ "displaydoc", "potential_utf", @@ -3152,17 +2964,17 @@ dependencies = [ [[package]] name = "icu_datetime" -version = "2.3.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c44df99c4c5297b05653d1a1629f13bdc9fd4044acfbbaf30b15194a1eed4cd6" +checksum = "989d56ea5bbc43ae2b4e0388874b002884eaf4ed3a76c84a6c8c5ad575e04d72" dependencies = [ "displaydoc", "fixed_decimal", "icu_calendar", "icu_datetime_data", "icu_decimal", + "icu_locale", "icu_locale_core", - "icu_locale_fallback", "icu_pattern", "icu_plurals", "icu_provider", @@ -3175,21 +2987,21 @@ dependencies = [ [[package]] name = "icu_datetime_data" -version = "2.3.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bb5555f6e4b42233f58564351ce16d73e9e6ebfce6bdcf29875d0cfc554d6a8" +checksum = "40d3cc1b690d9703202bc319692ac8a1f3a6390686f0930ff40542450fa34f0b" [[package]] name = "icu_decimal" -version = "2.3.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9eb8f655bba2d0c0459e43a5b0e6cd3cd388109898fb3d85d048165e8b0abd08" +checksum = "288247df2e32aa776ac54fdd64de552149ac43cb840f2761811f0e8d09719dd4" dependencies = [ "displaydoc", "fixed_decimal", "icu_decimal_data", + "icu_locale", "icu_locale_core", - "icu_locale_fallback", "icu_pattern", "icu_plurals", "icu_provider", @@ -3200,15 +3012,15 @@ dependencies = [ [[package]] name = "icu_decimal_data" -version = "2.3.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4c887fc7d4c297cf3f9436864af9e3dba7f8be9415a6c2a7f392f3b1636298c" +checksum = "6f14a5ca9e8af29eef62064f269078424283d90dbaffeac5225addf62aaabc22" [[package]] name = "icu_experimental" -version = "0.6.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c09609ad18e249b97a0afa20e19502c4d11ab039e6e35f5ecf48bebd4eedd7e" +checksum = "0a881116e620fd635f564fd9cb9bc36c256b9da2221df8b3f55643d8ef32140f" dependencies = [ "displaydoc", "either", @@ -3220,7 +3032,6 @@ dependencies = [ "icu_list", "icu_locale", "icu_locale_core", - "icu_locale_fallback", "icu_normalizer", "icu_pattern", "icu_plurals", @@ -3240,18 +3051,18 @@ dependencies = [ [[package]] name = "icu_experimental_data" -version = "0.6.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "377481a8935d6774f410424d79a6dc8a09d9bd8def9560cff17abe755a246280" +checksum = "f72090d4f08a2bc94565cb02de6d5b87939424e462d9927d73a34f6f8e5d1232" [[package]] name = "icu_list" -version = "2.3.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5c625125085fac4bf9ad111888a90c6ab9dc7bcaec392ca79cab417f46e3fb" +checksum = "aeeaf517689324395bed4767f7c65504f5455942ed4c14ee54c2087ca00b816e" dependencies = [ "icu_list_data", - "icu_locale_fallback", + "icu_locale", "icu_provider", "regex-automata", "serde", @@ -3261,30 +3072,30 @@ dependencies = [ [[package]] name = "icu_list_data" -version = "2.3.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ffef91ee351bd195a803115615a034dfb9f02bb48850980548c31cb78568a91" +checksum = "ed62dbf114db9a4163481ed071509c4cd52cbcef9cb85979eba08a95549d73f3" [[package]] name = "icu_locale" -version = "2.3.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "785f595c61ef57169a467eeed7b4b6936a66f6cacbb116a96ee86da983251bf4" +checksum = "d5a396343c7208121dc86e35623d3dfe19814a7613cfd14964994cdc9c9a2e26" dependencies = [ "icu_collections", "icu_locale_core", "icu_locale_data", - "icu_locale_fallback", "icu_provider", + "potential_utf", "tinystr", "zerovec", ] [[package]] name = "icu_locale_core" -version = "2.3.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d56e28588da92eee5c3201a6eff33fabdd49b62269c8938d4ff050ce4d900deb" +checksum = "92219b62b3e2b4d88ac5119f8904c10f8f61bf7e95b640d25ba3075e6cac2c29" dependencies = [ "displaydoc", "litemap", @@ -3296,35 +3107,15 @@ dependencies = [ [[package]] name = "icu_locale_data" -version = "2.3.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d37d91460e362a5cf58907cd7ce871411775ee6294e49a5cc8e6cec16dfa75ea" - -[[package]] -name = "icu_locale_fallback" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "251af8e57c9400e3eb58242fe5b8b1152b2a64fdf4cf632f923c38ccee6f2fa9" -dependencies = [ - "icu_locale_core", - "icu_locale_fallback_data", - "icu_provider", - "potential_utf", - "tinystr", - "zerovec", -] - -[[package]] -name = "icu_locale_fallback_data" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "decf2a22ec8fa68f1a0c1129a3f8583f8f8bc24e8b9ccbe98ead99f62a4dc3a8" +checksum = "d5fdcc9ac77c6d74ff5cf6e65ef3181d6af32003b16fce3a77fb451d2f695993" [[package]] name = "icu_normalizer" -version = "2.3.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12f9cf5f235641ed274641dd81c3f28d870e276763d0797aeeab72317b1c646f" +checksum = "c56e5ee99d6e3d33bd91c5d85458b6005a22140021cc324cea84dd0e72cff3b4" dependencies = [ "icu_collections", "icu_normalizer_data", @@ -3339,15 +3130,15 @@ dependencies = [ [[package]] name = "icu_normalizer_data" -version = "2.3.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1563da1ed3e0b3bf3d74c9b85917ac9c56464d2f57242270c09c9e752f8021a0" +checksum = "da3be0ae77ea334f4da67c12f149704f19f81d1adf7c51cf482943e84a2bad38" [[package]] name = "icu_pattern" -version = "0.5.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b3db611446bd92c246b03e4aa0bafa71ddb194af431ddbb42b9d70e4bfce1a0" +checksum = "1c4c568054ffe735398a9f4c55aec37ad7c768844553cc0978f09cc9b933a1fb" dependencies = [ "displaydoc", "either", @@ -3359,12 +3150,12 @@ dependencies = [ [[package]] name = "icu_plurals" -version = "2.3.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e475e6766ef87b1d3c1f97be6363995b0bfaeddbc789671615df598a97ff0593" +checksum = "2a50023f1d49ad5c4333380328a0d4a19e4b9d6d842ec06639affd5ba47c8103" dependencies = [ "fixed_decimal", - "icu_locale_fallback", + "icu_locale", "icu_plurals_data", "icu_provider", "zerovec", @@ -3372,17 +3163,16 @@ dependencies = [ [[package]] name = "icu_plurals_data" -version = "2.3.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1251aa39a95e1333888e499b1263e1c196447a28948acf5bdabd82c046f153bf" +checksum = "8485497155dc865f901decb93ecc20d3e467df67bfeceb91e3ba34e2b11e8e1d" [[package]] name = "icu_properties" -version = "2.3.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e7ca276ad3145661a65914e6daf131ca5120cd3dcee8f8f3214b8875184a148" +checksum = "bee3b67d0ea5c2cca5003417989af8996f8604e34fb9ddf96208a033901e70de" dependencies = [ - "displaydoc", "icu_collections", "icu_locale_core", "icu_properties_data", @@ -3394,15 +3184,15 @@ dependencies = [ [[package]] name = "icu_properties_data" -version = "2.3.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e590f038c1464a96894fd6d10127e90a8be4509f56ff7ecef851b15cee0b7caa" +checksum = "8e2bbb201e0c04f7b4b3e14382af113e17ba4f63e2c9d2ee626b720cbce54a14" [[package]] name = "icu_provider" -version = "2.3.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d27bbb9d3abbefac45d55f647c9de1d44aafcd1186eb91879afef17c396c3e73" +checksum = "139c4cf31c8b5f33d7e199446eff9c1e02decfc2f0eec2c8d71f65befa45b421" dependencies = [ "displaydoc", "icu_locale_core", @@ -3417,32 +3207,31 @@ dependencies = [ [[package]] name = "icu_segmenter" -version = "2.3.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82d07aafccd67af15d02512a6adf5896fbc5ed00f2e99b471d2efa14016db3db" +checksum = "5c0794db0b1a86193ac9c48768d0e6c52c54448e0870ad87907d456ee0dac964" dependencies = [ "core_maths", "icu_collections", - "icu_locale_fallback", + "icu_locale", "icu_provider", "icu_segmenter_data", "potential_utf", - "smallvec", "utf8_iter", "zerovec", ] [[package]] name = "icu_segmenter_data" -version = "2.3.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae293c039020f9ec10710af98d29ce6aa2051486638b49c9a6409f3b4a9e98ad" +checksum = "e4a2c462a4d927d512f5f882a033ddd62f33a05bb9f230d98f736ac3dc85938f" [[package]] name = "icu_time" -version = "2.3.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af37e1c3b9f3ab564b619fdf4b22de169f6381eb0f7048e3ca454290c438126b" +checksum = "ec3af0c141da0a61d4f6970cd1d5f4b388b17ea22f8124f8f6049d3d5147586a" dependencies = [ "calendrical_calculations", "displaydoc", @@ -3458,9 +3247,15 @@ dependencies = [ [[package]] name = "icu_time_data" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f2f8aeca682d874a5247084aa4fb7d1cef9ba45d889c21209a8818dcaaa0ec9" + +[[package]] +name = "id-arena" version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "005ff86fa5851a77fc0a977b72d717f777bd9230415a247219d7898aefb1517a" +checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954" [[package]] name = "ident_case" @@ -3497,16 +3292,14 @@ checksum = "85ab80394333c02fe689eaf900ab500fbd0c2213da414687ebf995a65d5a6104" dependencies = [ "bytemuck", "byteorder-lite", - "dav1d", "exr", "image-webp", "moxcms", - "mp4parse", "num-traits", "png 0.18.1", "ravif", "rayon", - "zune-core 0.5.3", + "zune-core 0.5.1", "zune-jpeg 0.5.15", ] @@ -3537,9 +3330,9 @@ checksum = "edcd27d72f2f071c64249075f42e205ff93c9a4c5f6c6da53e79ed9f9832c285" [[package]] name = "imgref" -version = "1.12.3" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e44b0a4eaa4c82f441d50a963f2d5f05a787240aeee097597033e72accfd22f" +checksum = "40fac9d56ed6437b198fddba683305e8e2d651aa42647f00f5ae542e7f5c94a2" [[package]] name = "indenter" @@ -3560,32 +3353,32 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.14.2" +version = "2.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc4e190f5d26ca7051642629da2c52fc03bde85a03197c99408dcd291734c855" +checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9" dependencies = [ "equivalent", - "hashbrown 0.17.1", + "hashbrown 0.17.0", "serde", "serde_core", ] [[package]] name = "inotify" -version = "0.11.5" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cc00ea907cab49550b7da656f80ebb97be1b997d931fbcd28d39734e17ce592" +checksum = "bd5b3eaf1a28b758ac0faa5a4254e8ab2705605496f1b1f3fbbc3988ad73d199" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "inotify-sys", "libc", ] [[package]] name = "inotify-sys" -version = "0.1.8" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c033f80b2c113cdf91ab7a33faa9cbc014726dcad99880c8609af2a370edf37d" +checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" dependencies = [ "libc", ] @@ -3596,7 +3389,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9793345a65d71317763a33066b5d8351f8760dde8d4930fe9e39b5f14a7959d" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "input-sys", "libc", "log", @@ -3617,7 +3410,7 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.119", + "syn 2.0.117", ] [[package]] @@ -3676,35 +3469,23 @@ checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" [[package]] name = "ixdtf" -version = "0.6.6" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d3667095d64c3ecffc96463a21157b04bf3e252f6e8d5750b20c02e33c194e3" +checksum = "2ceaf4c6c48465bead8cb6a0b7c4ee0c86ecbb31239032b9c66ab9a08d2f3ee1" [[package]] name = "jiff" -version = "0.2.37" +version = "0.2.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab1baf72f08796de0260609515130699b890ac25f30e610ad894bc5856cafdb" +checksum = "f00b5dbd620d61dfdcb6007c9c1f6054ebd75319f163d886a9055cec1155073d" dependencies = [ - "defmt", - "jiff-core", "jiff-static", "jiff-tzdb-platform", "log", "portable-atomic", "portable-atomic-util", "serde_core", - "windows-link 0.2.1", -] - -[[package]] -name = "jiff-core" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e52fe76043ccecc9005d2305ebaadf7d7fc0cc89ca6baa10a94d6bc68c7128c" -dependencies = [ - "defmt", - "log", + "windows-sys 0.61.2", ] [[package]] @@ -3720,21 +3501,20 @@ dependencies = [ [[package]] name = "jiff-static" -version = "0.2.37" +version = "0.2.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "378268a1116ad67ae6228701118ac9f491d78fda38a40a1f1a9e1348de6f7212" +checksum = "e000de030ff8022ea1da3f466fbb0f3a809f5e51ed31f6dd931c35181ad8e6d7" dependencies = [ - "jiff-core", "proc-macro2", "quote", - "syn 2.0.119", + "syn 2.0.117", ] [[package]] name = "jiff-tzdb" -version = "0.1.8" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "142bd39932ad231f10513df9ab62661fead8719872150b7ad02a2df79f4e141e" +checksum = "c900ef84826f1338a557697dc8fc601df9ca9af4ac137c7fb61d4c6f2dfd3076" [[package]] name = "jiff-tzdb-platform" @@ -3757,7 +3537,7 @@ dependencies = [ "jni-sys 0.4.1", "log", "simd_cesu8", - "thiserror 2.0.20", + "thiserror 2.0.18", "walkdir", "windows-link 0.2.1", ] @@ -3772,7 +3552,7 @@ dependencies = [ "quote", "rustc_version", "simd_cesu8", - "syn 2.0.119", + "syn 2.0.117", ] [[package]] @@ -3800,210 +3580,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38c0b942f458fe50cdac086d2f946512305e5631e720728f2a61aabcd47a6264" dependencies = [ "quote", - "syn 2.0.119", + "syn 2.0.117", ] [[package]] name = "jobserver" -version = "0.1.35" +version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c00acbd29eabad4a2392fa0e921c874934dbbf4194312ad20f04a0ed67a3cb3" +checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33" dependencies = [ - "getrandom 0.4.3", + "getrandom 0.3.4", "libc", ] [[package]] name = "js-sys" -version = "0.3.105" +version = "0.3.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce57d20d1ea864ce2ac172ab472d409214f4fd359f0b2a2775abdf522e2af99e" +checksum = "67df7112613f8bfd9150013a0314e196f4800d3201ae742489d999db2f979f08" dependencies = [ "cfg-if", "futures-util", + "once_cell", "wasm-bindgen", ] -[[package]] -name = "jxl-bitstream" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b480e752277e29eb4054f69546887a9b84656fe78c08f54ba5850ced98a378fe" -dependencies = [ - "tracing", -] - -[[package]] -name = "jxl-coding" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd972bcd125e776f1eb241ac50e39f956095a1c2770c64736c968f8946bd9a3c" -dependencies = [ - "jxl-bitstream", - "tracing", -] - -[[package]] -name = "jxl-color" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f316b1358c1711755b3ee8e8cb5c4a1dad12e796233088a7a513440782de80b2" -dependencies = [ - "jxl-bitstream", - "jxl-coding", - "jxl-grid", - "jxl-image", - "jxl-oxide-common", - "jxl-threadpool", - "tracing", -] - -[[package]] -name = "jxl-frame" -version = "0.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d967c6fd669c7c01060b5022d8835fa82fd46b06ffc98b549f17600a097c2b3" -dependencies = [ - "jxl-bitstream", - "jxl-coding", - "jxl-grid", - "jxl-image", - "jxl-modular", - "jxl-oxide-common", - "jxl-threadpool", - "jxl-vardct", - "tracing", -] - -[[package]] -name = "jxl-grid" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01671307879a033bfa52e6e8784b941aca770b3f3a7d33830b455b6844f793fb" -dependencies = [ - "tracing", -] - -[[package]] -name = "jxl-image" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f752d62577c702a94dbbce4045caf08cb58639e8a4d56464b40ecf33ffe565" -dependencies = [ - "jxl-bitstream", - "jxl-grid", - "jxl-oxide-common", - "tracing", -] - -[[package]] -name = "jxl-jbr" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e35d032bcec660647828527ff42c6f5776d2fd44b8357f9f6d9ac6dc07218e46" -dependencies = [ - "brotli-decompressor", - "jxl-bitstream", - "jxl-frame", - "jxl-grid", - "jxl-image", - "jxl-modular", - "jxl-oxide-common", - "jxl-threadpool", - "jxl-vardct", - "tracing", -] - -[[package]] -name = "jxl-modular" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2f045b24c738dd91d482be385512b512721ae08a671bd4b27bf1c47f215235" -dependencies = [ - "jxl-bitstream", - "jxl-coding", - "jxl-grid", - "jxl-oxide-common", - "jxl-threadpool", - "tracing", -] - -[[package]] -name = "jxl-oxide" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d36c662923f47586880211f3bc7c0d83fb3a9b410d278c7bde93450748abeef3" -dependencies = [ - "brotli-decompressor", - "bytemuck", - "image", - "jxl-bitstream", - "jxl-color", - "jxl-frame", - "jxl-grid", - "jxl-image", - "jxl-jbr", - "jxl-oxide-common", - "jxl-render", - "jxl-threadpool", - "tracing", -] - -[[package]] -name = "jxl-oxide-common" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62394c5021b3a9e7e0dbb2d639d555d019090c9946c39f6d3b09d390db4157b" -dependencies = [ - "jxl-bitstream", -] - -[[package]] -name = "jxl-render" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34386bfdb6a19b5a30cc9beb4d475d537422c31ae8c39bb69640fcce3fcaf19" -dependencies = [ - "bytemuck", - "jxl-bitstream", - "jxl-coding", - "jxl-color", - "jxl-frame", - "jxl-grid", - "jxl-image", - "jxl-modular", - "jxl-oxide-common", - "jxl-threadpool", - "jxl-vardct", - "tracing", -] - -[[package]] -name = "jxl-threadpool" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25f15eb830aa77a7f21148d72e153562a26bfe570139bd4922eab1908dd499d3" -dependencies = [ - "rayon", - "rayon-core", - "tracing", -] - -[[package]] -name = "jxl-vardct" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce72a18c6d3a47172ab6c479be2bdb56f22066b5d7092663f03b4490820b4511" -dependencies = [ - "jxl-bitstream", - "jxl-coding", - "jxl-grid", - "jxl-modular", - "jxl-oxide-common", - "jxl-threadpool", - "tracing", -] - [[package]] name = "kamadak-exif" version = "0.6.1" @@ -4030,7 +3631,7 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fbe853b403ae61a04233030ae8a79d94975281ed9770a1f9e246732b534b28d" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "serde", ] @@ -4057,14 +3658,14 @@ version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a1886916523694cd6ea3d175f03a1e5010699a2a4cc13696d83d7bea1d80638" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] name = "kqueue" -version = "1.2.1" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d763e5b24120b4ddf50de6c92308156765aabfbbccebf401da7cff2d70a41ea" +checksum = "eac30106d7dce88daf4a3fcb4879ea939476d5074a9b7ddd0fb97fa4bed5596a" dependencies = [ "kqueue-sys", "libc", @@ -4072,11 +3673,11 @@ dependencies = [ [[package]] name = "kqueue-sys" -version = "1.1.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07293a4e297ac234359b510362495713f75ea345d5307140414f20c69ffeb087" +checksum = "a7b65860415f949f23fa882e669f2dbd4a0f0eeb1acdd56790b30494afd7da2f" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "libc", ] @@ -4113,6 +3714,12 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" +[[package]] +name = "leb128fmt" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2" + [[package]] name = "lebe" version = "0.5.3" @@ -4121,9 +3728,9 @@ checksum = "7a79a3332a6609480d7d0c9eab957bca6b455b91bb84e66d19f5ff66294b85b8" [[package]] name = "libc" -version = "0.2.189" +version = "0.2.186" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eaf3ede3fee6db1a4c2ee091bf8a8b4dccdc6d17f656fb07896ee72867612f2" +checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" [[package]] name = "libcosmic-yoda" @@ -4132,7 +3739,6 @@ dependencies = [ "apply", "ashpd 0.12.3", "auto_enums", - "build_helpers", "cosmic-client-toolkit", "cosmic-config", "cosmic-freedesktop-icons", @@ -4163,16 +3769,15 @@ dependencies = [ "log", "mime 0.3.17", "palette", - "phf", + "phf 0.13.1", "rfd", - "roxmltree", "rust-embed", "rustix 1.1.4", "serde", - "shlex 1.3.0", + "shlex", "slotmap", "taffy", - "thiserror 2.0.20", + "thiserror 2.0.18", "tokio", "tracing", "unicode-segmentation", @@ -4182,9 +3787,9 @@ dependencies = [ [[package]] name = "libfuzzer-sys" -version = "0.4.13" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9fd2f41a1cba099f79a0b6b6c35656cf7c03351a7bae8ff0f28f25270f929d2" +checksum = "f12a681b7dd8ce12bff52488013ba614b869148d54dd79836ab85aafdd53f08d" dependencies = [ "arbitrary", "cc", @@ -4208,14 +3813,14 @@ checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" [[package]] name = "libredox" -version = "0.1.24" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6480ccc157a1389bb2e4891b24751b0f798ba640d22386f23143fbcc89da195a" +checksum = "e02f3bb43d335493c96bf3fd3a321600bf6bd07ed34bc64118e9293bdffea46c" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "libc", "plain", - "redox_syscall 0.9.4", + "redox_syscall 0.7.5", ] [[package]] @@ -4230,9 +3835,9 @@ dependencies = [ [[package]] name = "lilt" -version = "0.8.2" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "337d4c256f7d9f2dbd633891d48ace853efa5b1554122d9220b172ad9c03c3a9" +checksum = "f67562e5eff6b20553fa9be1c503356768420994e28f67e3eafe6f41910e57ad" dependencies = [ "web-time", ] @@ -4257,9 +3862,9 @@ checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" [[package]] name = "litemap" -version = "0.8.3" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47d9d19d1d6efa0109d2f65ff4c85cddd50bd572e5a00127ab10987290bcefae" +checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0" [[package]] name = "litrs" @@ -4291,9 +3896,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.34" +version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6" +checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" [[package]] name = "logind-zbus" @@ -4332,9 +3937,9 @@ dependencies = [ [[package]] name = "lyon_algorithms" -version = "1.0.21" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdfa8785f95e57914ddb35e3b59994aeba6f5e79e9cfd03da1c269f010f36009" +checksum = "8575c0d003ae459399623c4def180c63b77f343b1a7fee64f249b349e7699a31" dependencies = [ "lyon_path", "num-traits", @@ -4363,9 +3968,9 @@ dependencies = [ [[package]] name = "lyon_tessellation" -version = "1.0.22" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b8dcf906637ecef61b3c0740c7a4e7f27caeb31257cfac0cc579ce15be6005" +checksum = "8e43b7e44161571868f5c931d12583592c223c5583eef86b08aa02b7048a3552" dependencies = [ "float_next_after", "lyon_path", @@ -4402,9 +4007,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.8.3" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98" +checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79" [[package]] name = "memmap2" @@ -4417,9 +4022,9 @@ dependencies = [ [[package]] name = "memmap2" -version = "0.9.11" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1219ed1b7f229ee7104d281dd01d6802fe28bb6e95d292942c4daacdeb798c0" +checksum = "714098028fe011992e1c3962653c96b2d578c4b4bce9036e15ff220319b1e0e3" dependencies = [ "libc", ] @@ -4439,7 +4044,7 @@ version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7047791b5bc903b8cd963014b355f71dc9864a9a0b727057676c1dcae5cbc15" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "block", "core-graphics-types 0.2.0", "foreign-types", @@ -4471,16 +4076,6 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" -[[package]] -name = "mime_guess" -version = "2.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" -dependencies = [ - "mime 0.3.17", - "unicase", -] - [[package]] name = "minimal-lexical" version = "0.2.1" @@ -4497,21 +4092,11 @@ dependencies = [ "simd-adler32", ] -[[package]] -name = "miniz_oxide" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b63fbc4a50860e98e7b2aa7804ded1db5cbc3aff9193adaff57a6931bf7c4b4c" -dependencies = [ - "adler2", - "simd-adler32", -] - [[package]] name = "mio" -version = "1.2.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b18443e9c262bfe8fa82f51666e2642c53393f7e5c27b3e1aeab922cff5b9d8" +checksum = "50b7e5b27aa02a74bac8c3f23f448f8d87ff11f92d3aac1a6ed369ee08cc56c1" dependencies = [ "libc", "log", @@ -4529,20 +4114,6 @@ dependencies = [ "pxfm", ] -[[package]] -name = "mp4parse" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63a35203d3c6ce92d5251c77520acb2e57108c88728695aa883f70023624c570" -dependencies = [ - "bitreader", - "byteorder", - "fallible_collections", - "log", - "num-traits", - "static_assertions", -] - [[package]] name = "mutate_once" version = "0.1.2" @@ -4557,21 +4128,21 @@ checksum = "618f667225063219ddfc61251087db8a9aec3c3f0950c916b614e403486f1135" dependencies = [ "arrayvec", "bit-set", - "bitflags 2.13.2", + "bitflags 2.11.1", "cfg-if", "cfg_aliases", "codespan-reporting", "half", "hashbrown 0.16.1", "hexf-parse", - "indexmap 2.14.2", + "indexmap 2.14.0", "libm", "log", "num-traits", "once_cell", "rustc-hash 1.1.0", "spirv", - "thiserror 2.0.20", + "thiserror 2.0.18", "unicode-ident", ] @@ -4581,7 +4152,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "jni-sys 0.3.1", "log", "ndk-sys", @@ -4613,11 +4184,11 @@ checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" [[package]] name = "nix" -version = "0.31.3" +version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf20d2fde8ff38632c426f1165ed7436270b44f199fc55284c38276f9db47c3d" +checksum = "5d6d0705320c1e6ba1d912b5e37cf18071b6c2e9b7fa8215a1e8a7651966f5d3" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "cfg-if", "cfg_aliases", "libc", @@ -4663,7 +4234,7 @@ version = "8.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d3d07927151ff8575b7087f245456e549fea62edf0ec4e565a5ee50c8402bc3" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "fsevent-sys", "inotify", "kqueue", @@ -4681,7 +4252,7 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42b8cfee0e339a0337359f3c88165702ac6e600dc01c0cc9579a92d62b08477a" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", ] [[package]] @@ -4690,7 +4261,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -4709,9 +4280,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.8" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89e69e7e0f03bea5ef08013795c25018e101932225a656383bd384495ecc367" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ "num-integer", "num-traits", @@ -4723,15 +4294,14 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" dependencies = [ - "bytemuck", "num-traits", ] [[package]] name = "num-conv" -version = "0.2.2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "521739c6d2bac4aa25192232afe6841231376b2b26d4d9fae5ecf8ca5772e441" +checksum = "c6673768db2d862beb9b39a78fdcb1a69439615d5794a1be50caa9bc92c81967" [[package]] name = "num-derive" @@ -4741,24 +4311,25 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.119", + "syn 2.0.117", ] [[package]] name = "num-integer" -version = "0.1.47" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ce2d95d4b3734dc35aa2f45e1aa22cd416814592a4f9d9205e11affd5b8e10b" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ "num-traits", ] [[package]] name = "num-iter" -version = "0.1.46" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c92800bd69a1eac91786bcfe9da64a897eb72911b8dc3095decbd07429e8048b" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ + "autocfg", "num-integer", "num-traits", ] @@ -4803,7 +4374,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.119", + "syn 2.0.117", ] [[package]] @@ -4866,7 +4437,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "block2 0.5.1", "libc", "objc2 0.5.2", @@ -4882,7 +4453,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "block2 0.6.2", "objc2 0.6.4", "objc2-core-foundation", @@ -4895,7 +4466,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "block2 0.5.1", "objc2 0.5.2", "objc2-foundation 0.2.2", @@ -4907,7 +4478,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "block2 0.6.2", "dispatch2", "objc2 0.6.4", @@ -4919,7 +4490,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "libc", "objc2-core-foundation", ] @@ -4942,7 +4513,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d425caf1df73233f29fd8a5c3e5edbc30d2d4307870f802d18f00d83dc5141a6" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "objc2-core-foundation", "objc2-core-graphics", ] @@ -4959,7 +4530,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "block2 0.5.1", "libc", "objc2 0.5.2", @@ -4971,7 +4542,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "block2 0.6.2", "objc2 0.6.4", "objc2-core-foundation", @@ -4983,7 +4554,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "block2 0.5.1", "objc2 0.5.2", "objc2-foundation 0.2.2", @@ -4995,7 +4566,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "block2 0.5.1", "objc2 0.5.2", "objc2-foundation 0.2.2", @@ -5008,7 +4579,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "objc2 0.6.4", "objc2-core-foundation", "objc2-foundation 0.3.2", @@ -5046,9 +4617,9 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "orbclient" -version = "0.3.55" +version = "0.3.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5df339f526ea9a60e371768d50efc2f2508c7203290731565d1f7a6f71d21747" +checksum = "a570f6bca41d29acb2139229a7c873ec99bc9a313bd10804081d89bfac8ff329" dependencies = [ "libc", "libredox", @@ -5056,9 +4627,9 @@ dependencies = [ [[package]] name = "ordered-float" -version = "5.5.0" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c7c9e0d9b23589f26070720bac724174bfec1083e82f7854cdd0267518343c0" +checksum = "b7d950ca161dc355eaf28f82b11345ed76c6e1f6eb1f4f4479e0323b9e2fbd0e" dependencies = [ "num-traits", ] @@ -5094,7 +4665,7 @@ dependencies = [ "proc-macro2", "proc-macro2-diagnostics", "quote", - "syn 2.0.119", + "syn 2.0.117", ] [[package]] @@ -5108,41 +4679,35 @@ dependencies = [ [[package]] name = "owo-colors" -version = "4.4.0" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13c45bb4a6ae1280ec0803b1ef9d3455eb50f01efbbe1447ab020f1d54fba9d8" +checksum = "d211803b9b6b570f68772237e415a029d5a50c65d382910b879fb19d3271f94d" [[package]] name = "palette" -version = "0.7.7" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddeed8580d347d2abf3dcf06a5f0b3dc020258338526b277847cd4248a70fc64" +checksum = "4cbf71184cc5ecc2e4e1baccdb21026c20e5fc3dcf63028a086131b3ab00b6e6" dependencies = [ "approx", + "fast-srgb8", "palette_derive", - "palette_math", - "phf", + "phf 0.11.3", "serde", ] [[package]] name = "palette_derive" -version = "0.7.7" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88537020289b719d81be994ccf1bbf4990f477e2f69ee52fe3e45f43a02e56be" +checksum = "f5030daf005bface118c096f510ffb781fc28f9ab6a32ab224d8631be6851d30" dependencies = [ "by_address", "proc-macro2", "quote", - "syn 2.0.119", + "syn 2.0.117", ] -[[package]] -name = "palette_math" -version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e6eb142958d64335fb0e345c5b9ead2ecd6fc438c307e9d7d3c4fd428dbaf12" - [[package]] name = "pam-client" version = "0.5.0" @@ -5214,17 +4779,37 @@ version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" +[[package]] +name = "phf" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078" +dependencies = [ + "phf_macros 0.11.3", + "phf_shared 0.11.3", +] + [[package]] name = "phf" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf" dependencies = [ - "phf_macros", - "phf_shared", + "phf_macros 0.13.1", + "phf_shared 0.13.1", "serde", ] +[[package]] +name = "phf_generator" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d" +dependencies = [ + "phf_shared 0.11.3", + "rand 0.8.6", +] + [[package]] name = "phf_generator" version = "0.13.1" @@ -5232,7 +4817,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "135ace3a761e564ec88c03a77317a7c6b80bb7f7135ef2544dbe054243b89737" dependencies = [ "fastrand", - "phf_shared", + "phf_shared 0.13.1", +] + +[[package]] +name = "phf_macros" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216" +dependencies = [ + "phf_generator 0.11.3", + "phf_shared 0.11.3", + "proc-macro2", + "quote", + "syn 2.0.117", ] [[package]] @@ -5241,14 +4839,23 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "812f032b54b1e759ccd5f8b6677695d5268c588701effba24601f6932f8269ef" dependencies = [ - "phf_generator", - "phf_shared", + "phf_generator 0.13.1", + "phf_shared 0.13.1", "proc-macro2", "quote", - "syn 2.0.119", + "syn 2.0.117", "uncased", ] +[[package]] +name = "phf_shared" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5" +dependencies = [ + "siphasher", +] + [[package]] name = "phf_shared" version = "0.13.1" @@ -5267,22 +4874,22 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" [[package]] name = "pin-project" -version = "1.1.13" +version = "1.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2466b2336ed02bcdca6b294417127b90ec92038d1d5c4fbeac971a922e0e0924" +checksum = "cbf0d9e68100b3a7989b4901972f265cd542e560a3a8a724e1e20322f4d06ce9" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.13" +version = "1.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c96395f0a926bc13b1c17622aaddda1ecb55d49c8f1bf9777e4d877800a43f8b" +checksum = "a990e22f43e84855daf260dded30524ef4a9021cc7541c26540500a50b624389" dependencies = [ "proc-macro2", "quote", - "syn 2.0.119", + "syn 2.0.117", ] [[package]] @@ -5310,9 +4917,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.34" +version = "0.3.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6b464fbc74e149a392436b17d523f769e057cb6877f6a5c4618bc6f11800548" +checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e" [[package]] name = "plain" @@ -5330,7 +4937,7 @@ dependencies = [ "crc32fast", "fdeflate", "flate2", - "miniz_oxide 0.8.9", + "miniz_oxide", ] [[package]] @@ -5339,11 +4946,11 @@ version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "crc32fast", "fdeflate", "flate2", - "miniz_oxide 0.8.9", + "miniz_oxide", ] [[package]] @@ -5354,7 +4961,7 @@ checksum = "5d0e4f59085d47d8241c88ead0f274e8a0cb551f3625263c05eb8dd897c34218" dependencies = [ "cfg-if", "concurrent-queue", - "hermit-abi 0.5.3", + "hermit-abi 0.5.2", "pin-project-lite", "rustix 1.1.4", "windows-sys 0.61.2", @@ -5368,24 +4975,24 @@ checksum = "2f3a9f18d041e6d0e102a0a46750538147e5e8992d3b4873aaafee2520b00ce3" [[package]] name = "portable-atomic" -version = "1.15.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05c8b63e8d9609db387f0324918f81d68fe27748f084ef092fb35954d0539a85" +checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" [[package]] name = "portable-atomic-util" -version = "0.2.8" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10ab3eb7f3becc3a1cbc4f2c6f20267996cfc1a6467a873763411b136a122715" +checksum = "c2a106d1259c23fac8e543272398ae0e3c0b8d33c88ed73d0cc71b0f1d902618" dependencies = [ "portable-atomic", ] [[package]] name = "potential_utf" -version = "0.1.6" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d83eb9bc6d8e5cf568e7a1101d60ee05e81ed50ea106026f3d18deeb046d7661" +checksum = "0103b1cef7ec0cf76490e969665504990193874ea05c85ff9bab8b911d0a0564" dependencies = [ "serde_core", "writeable", @@ -5413,6 +5020,16 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa" +[[package]] +name = "prettyplease" +version = "0.2.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" +dependencies = [ + "proc-macro2", + "syn 2.0.117", +] + [[package]] name = "proc-macro-crate" version = "3.5.0" @@ -5423,32 +5040,32 @@ dependencies = [ ] [[package]] -name = "proc-macro-error-attr3" -version = "3.1.1" +name = "proc-macro-error-attr2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e564d14133360e1ae169ffde5da25881b5fa47261665b8e5713c212c27799da" +checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" dependencies = [ "proc-macro2", "quote", ] [[package]] -name = "proc-macro-error3" -version = "3.1.1" +name = "proc-macro-error2" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f0d4471b3436c22106b21913b1dda531558918ae9b7ec55d58aa84b43552233" +checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" dependencies = [ - "proc-macro-error-attr3", + "proc-macro-error-attr2", "proc-macro2", "quote", - "syn 3.0.5", + "syn 2.0.117", ] [[package]] name = "proc-macro2" -version = "1.0.107" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "985e7ec9bb745e6ce6535b544d84d6cd6f7ad8bd711c398938ae983b91a766d9" +checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934" dependencies = [ "unicode-ident", ] @@ -5461,7 +5078,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.119", + "syn 2.0.117", "version_check", "yansi", ] @@ -5472,7 +5089,7 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25485360a54d6861439d60facef26de713b1e126bf015ec8f98239467a2b82f7" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "procfs-core", "rustix 1.1.4", ] @@ -5483,7 +5100,7 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6401bf7b6af22f78b563665d15a22e9aef27775b79b149a66ca022468a4e405" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "hex", ] @@ -5503,32 +5120,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4488a4a36b9a4ba6b9334a32a39971f77c1436ec82c38707bce707699cc3bbcb" dependencies = [ "quote", - "syn 2.0.119", + "syn 2.0.117", ] -[[package]] -name = "pulp" -version = "0.22.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046aa45b989642ec2e4717c8e72d677b13edd831a4d3b6cf37d9a3e54912496a" -dependencies = [ - "bytemuck", - "cfg-if", - "libm", - "num-complex", - "paste", - "pulp-wasm-simd-flag", - "raw-cpuid", - "reborrow", - "version_check", -] - -[[package]] -name = "pulp-wasm-simd-flag" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d8f70e07b9c3962945a74e59ca1c511bba65b6419468acc217c457d93f3c740" - [[package]] name = "pwd" version = "1.4.0" @@ -5541,9 +5135,9 @@ dependencies = [ [[package]] name = "pxfm" -version = "0.1.30" +version = "0.1.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d55d956fa96f5ec02be2e13af0e20391a5aa83d6a074e3ad368959d0fab299ea" +checksum = "e0c5ccf5294c6ccd63a74f1565028353830a9c2f5eb0c682c355c471726a6e3f" [[package]] name = "quick-error" @@ -5553,18 +5147,19 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" [[package]] name = "quick-xml" -version = "0.41.0" +version = "0.39.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e660451e55124f798a69a5af3f49ccfbefbd41910eefd25caf2393e1f3473ec1" +checksum = "721da970c312655cde9b4ffe0547f20a8494866a4af5ff51f18b7c633d0c870b" dependencies = [ "memchr", + "serde", ] [[package]] name = "quote" -version = "1.0.47" +version = "1.0.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fbf4db142a473a8d80c26bbf18454ed458bf8d26c8219c331daecfdbd079001" +checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924" dependencies = [ "proc-macro2", ] @@ -5583,9 +5178,9 @@ checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" [[package]] name = "rand" -version = "0.8.8" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e058c7de0b26af77780c769414d6257830bb240f3c38477dbc2c16e5f54d6d4c" +checksum = "5ca0ecfa931c29007047d1bc58e623ab12e5590e8c7cc53200d5202b69266d8a" dependencies = [ "libc", "rand_chacha 0.3.1", @@ -5594,9 +5189,9 @@ dependencies = [ [[package]] name = "rand" -version = "0.9.5" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ef1d0d795eb7d84685bca4f72f3649f064e6641543d3a8c415898726a57b41" +checksum = "44c5af06bb1b7d3216d91932aed5265164bf384dc89cd6ba05cf59a35f5f76ea" dependencies = [ "rand_chacha 0.9.0", "rand_core 0.9.5", @@ -5648,9 +5243,9 @@ checksum = "ca45419789ae5a7899559e9512e58ca889e41f04f1f2445e9f4b290ceccd1d08" [[package]] name = "rangemap" -version = "1.8.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a611d15b50743feb4c76b7d03edcb0e64f399c26961e4efe6975bc398be6aa3d" +checksum = "973443cf09a9c8656b574a866ab68dfa19f0867d0340648c7d2f6a71b8a8ea68" [[package]] name = "rav1e" @@ -5679,10 +5274,10 @@ dependencies = [ "num-traits", "paste", "profiling", - "rand 0.9.5", + "rand 0.9.4", "rand_chacha 0.9.0", "simd_helpers", - "thiserror 2.0.20", + "thiserror 2.0.18", "v_frame", "wasm-bindgen", ] @@ -5702,15 +5297,6 @@ dependencies = [ "rgb", ] -[[package]] -name = "raw-cpuid" -version = "11.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "498cd0dc59d73224351ee52a95fee0f1a617a2eae0e7d9d720cc622c73a54186" -dependencies = [ - "bitflags 2.13.2", -] - [[package]] name = "raw-window-handle" version = "0.6.2" @@ -5745,33 +5331,16 @@ checksum = "7b634fabf032fab15307ffd272149b622260f55974d9fad689292a5d33df02e5" dependencies = [ "bytemuck", "core_maths", - "font-types 0.11.3", + "font-types", ] -[[package]] -name = "read-fonts" -version = "0.41.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046a7d674daf459825b32f5062056d6882db0d2f5a479fbd76ccfc870ac18709" -dependencies = [ - "bytemuck", - "font-types 0.12.5", - "once_cell", -] - -[[package]] -name = "reborrow" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03251193000f4bd3b042892be858ee50e8b3719f2b08e5833ac4353724632430" - [[package]] name = "redox_event" -version = "0.4.8" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5018d583d6d2f5499352aea8d177e9067d1eb03ab17c78169d5ba7a30001b15" +checksum = "4ea3e412d205440c7b0218af26247226f979ed1201674cda7a33cc70609084b5" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "libredox", ] @@ -5781,16 +5350,16 @@ version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", ] [[package]] name = "redox_syscall" -version = "0.9.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "737970939a87c6fa31e7acad13307bccbb017a073b695b6089a2c484f929e20e" +checksum = "4666a1a60d8412eab19d94f6d13dcc9cea0a5ef4fdf6a5db306537413c661b1b" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", ] [[package]] @@ -5801,34 +5370,34 @@ checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac" dependencies = [ "getrandom 0.2.17", "libredox", - "thiserror 2.0.20", + "thiserror 2.0.18", ] [[package]] name = "ref-cast" -version = "1.0.27" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e440fb4e4b4147295338efb76001ab9e4efc0e5839df2c47fc5ac2381d365c3" +checksum = "f354300ae66f76f1c85c5f84693f0ce81d747e2c3f21a45fef496d89c960bf7d" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.27" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92ecd8964f8453721699a1ed72037b0db49ce2f5a5138486ee89bed6f67cdf3a" +checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da" dependencies = [ "proc-macro2", "quote", - "syn 3.0.5", + "syn 2.0.117", ] [[package]] name = "regex" -version = "1.13.1" +version = "1.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f020237b6c8eed93db2e2cb53c00c60a8e1bc73da7d073199a1180401450218d" +checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276" dependencies = [ "aho-corasick", "memchr", @@ -5838,9 +5407,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.18" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad8553b9b26413251cbf30e620595c7a41b3887f03da04579c0e6b0d6a06b4b2" +checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f" dependencies = [ "aho-corasick", "memchr", @@ -5849,9 +5418,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.11" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4" +checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a" [[package]] name = "renderdoc-sys" @@ -5871,7 +5440,7 @@ dependencies = [ "pico-args", "rgb", "svgtypes", - "tiny-skia 0.11.4", + "tiny-skia", "usvg", "zune-jpeg 0.4.21", ] @@ -5915,8 +5484,8 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db09040cc89e461f1a265139777a2bde7f8d8c67c4936f700c63ce3e2904d468" dependencies = [ - "base64 0.22.1", - "bitflags 2.13.2", + "base64", + "bitflags 2.11.1", "serde", "serde_derive", "unicode-ident", @@ -5924,11 +5493,11 @@ dependencies = [ [[package]] name = "ron" -version = "0.12.2" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81116b9531d61eabc41aeb228e4b6b2435bcca3233b98cf3b3077d4e6e9debb3" +checksum = "4147b952f3f819eca0e99527022f7d6a8d05f111aeb0a62960c74eb283bec8fc" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "once_cell", "serde", "serde_derive", @@ -5956,9 +5525,9 @@ dependencies = [ [[package]] name = "rust-embed" -version = "8.12.0" +version = "8.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9e7760e252aaba7b09f4be00e36476cf585bdb68a53552ac954cdf504ab4bc9" +checksum = "04113cb9355a377d83f06ef1f0a45b8ab8cd7d8b1288160717d66df5c7988d27" dependencies = [ "rust-embed-impl", "rust-embed-utils", @@ -5967,23 +5536,22 @@ dependencies = [ [[package]] name = "rust-embed-impl" -version = "8.12.0" +version = "8.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bcfc4d6f53af43755f7a723e4b6b8794fcce052a178dd8c6c1dadc5f5343097" +checksum = "da0902e4c7c8e997159ab384e6d0fc91c221375f6894346ae107f47dd0f3ccaa" dependencies = [ - "mime_guess", "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.119", + "syn 2.0.117", "walkdir", ] [[package]] name = "rust-embed-utils" -version = "8.12.0" +version = "8.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ffa149f6aa81b58a5b3011d01a857c4ed12c7a732d2c51947a4c7c692185f0" +checksum = "5bcdef0be6fe7f6fa333b1073c949729274b05f123a0ad7efcb8efd878e5c3b1" dependencies = [ "sha2", "walkdir", @@ -5991,9 +5559,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.28" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b74b56ffa8bb2830709a538c2cbcae9aa062db0d2a42563bfb09bdaae44020eb" +checksum = "b50b8869d9fc858ce7266cce0194bd74df58b9d0e3f6df3a9fc8eb470d95c09d" [[package]] name = "rustc-hash" @@ -6003,9 +5571,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc-hash" -version = "2.1.3" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b1e7f9a428571be2dc5bc0505c13fb6bf936822b894ec87abf8a08a4e51742d" +checksum = "94300abf3f1ae2e2b8ffb7b58043de3d399c73fa6f4b73826402a5c457614dbe" [[package]] name = "rustc_version" @@ -6022,7 +5590,7 @@ version = "0.38.44" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "errno", "libc", "linux-raw-sys 0.4.15", @@ -6035,18 +5603,18 @@ version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "errno", "libc", "linux-raw-sys 0.12.1", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] name = "rustversion" -version = "1.0.23" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf54715a573b99ac80df0bc206da022bcd442c974952c7b9720069370852e21f" +checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" [[package]] name = "rustybuzz" @@ -6054,7 +5622,7 @@ version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd3c7c96f8a08ee34eff8857b11b49b07d71d1c3f4e88f8a88d4c9e9f90b1702" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "bytemuck", "core_maths", "log", @@ -6089,9 +5657,9 @@ dependencies = [ [[package]] name = "schemars" -version = "1.2.2" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "687274d293b6cdc6e73e0fee520bf2049650090d7164f87672d212a3c530cf4a" +checksum = "a2b42f36aa1cd011945615b92222f6bf73c599a102a300334cd7f8dbeec726cc" dependencies = [ "dyn-clone", "ref-cast", @@ -6113,22 +5681,22 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sctk-adwaita" -version = "0.11.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea2a4360b9abcdcee43809e6fc11d6d61ca5d25734026a8fc46c2883eea3f13f" +checksum = "1dd3accc0f3f4bbaf2c9e1957a030dc582028130c67660d44c0a0345a22ca69b" dependencies = [ "ab_glyph", "log", - "memmap2 0.9.11", + "memmap2 0.9.10", "smithay-client-toolkit", - "tiny-skia 0.12.0", + "tiny-skia", ] [[package]] name = "self_cell" -version = "1.3.0" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab42ca02749e120097e328d91d415325bdf43b1c72c4c8badf37375fe40a813" +checksum = "b12e76d157a900eb52e81bc6e9f3069344290341720e9178cde2407113ac8d89" [[package]] name = "semver" @@ -6138,9 +5706,9 @@ checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd" [[package]] name = "serde" -version = "1.0.229" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4148590afebada386688f18773da617792bf2ef03ffc1e4cbd2b1d45b023e0ba" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" dependencies = [ "serde_core", "serde_derive", @@ -6160,31 +5728,31 @@ dependencies = [ [[package]] name = "serde_core" -version = "1.0.229" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67dca2c9c51e58a4791a4b1ed58308b39c64224d349a935ab5039aa360942a48" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.229" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 3.0.5", + "syn 2.0.117", ] [[package]] name = "serde_json" -version = "1.0.151" +version = "1.0.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c841b55ecdae098c80dcae9cf767f6f8a0c2cdb3416bbef72181df4d0fe73f14" +checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" dependencies = [ - "indexmap 2.14.2", + "indexmap 2.14.0", "itoa", "memchr", "serde", @@ -6194,39 +5762,28 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.21" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d3b1629de253c70a0508c3899572da79ca359fdab27c7920ff00406df418906" +checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c" dependencies = [ "proc-macro2", "quote", - "syn 3.0.5", -] - -[[package]] -name = "serde_spanned" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6662b5879511e06e8999a8a235d848113e942c9124f211511b16466ee2995f26" -dependencies = [ - "serde_core", + "syn 2.0.117", ] [[package]] name = "serde_with" -version = "3.23.0" +version = "3.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "935177bb8c0cd8ca1a4e6d1a2ac8988bea69cab4f9d3a31311e012ad27868ea4" +checksum = "f05839ce67618e14a09b286535c0d9c94e85ef25469b0e13cb4f844e5593eb19" dependencies = [ - "base64 0.23.1", - "bs58", + "base64", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.14.2", - "jiff", + "indexmap 2.14.0", "schemars 0.9.0", - "schemars 1.2.2", + "schemars 1.2.1", "serde_core", "serde_json", "serde_with_macros", @@ -6235,21 +5792,21 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.23.0" +version = "3.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d607aa01a3cb0ad757d6fd216136910db3c97b102fe686585689615a02dbcdc" +checksum = "cf2ebbe86054f9b45bc3881e865683ccfaccce97b9b4cb53f3039d67f355a334" dependencies = [ - "darling 0.24.1", + "darling 0.23.0", "proc-macro2", "quote", - "syn 3.0.5", + "syn 2.0.117", ] [[package]] name = "sha2" -version = "0.11.0" +version = "0.10.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "446ba717509524cb3f22f17ecc096f10f4822d76ab5c0b9822c5f9c284e825f4" +checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" dependencies = [ "cfg-if", "cpufeatures", @@ -6271,12 +5828,6 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" -[[package]] -name = "shlex" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba" - [[package]] name = "signal-hook-registry" version = "1.4.8" @@ -6289,15 +5840,15 @@ dependencies = [ [[package]] name = "simd-adler32" -version = "0.3.10" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a219298ac11a56ea9a6d2120044824d6f01aeb034955e7af7bc16858527deea" +checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214" [[package]] name = "simd_cesu8" -version = "1.2.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11031e251abf8611c80f460e19dbdeb54a66db918e49c65a7065b46ac7aec520" +checksum = "94f90157bb87cddf702797c5dadfa0be7d266cdf49e22da2fcaa32eff75b2c33" dependencies = [ "rustc_version", "simdutf8", @@ -6340,17 +5891,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fbdfe3d2475fbd7ddd1f3e5cf8288a30eb3e5f95832829570cd88115a7434ac" dependencies = [ "bytemuck", - "read-fonts 0.37.0", -] - -[[package]] -name = "skrifa" -version = "0.44.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819ab7d62b1d3e72d9d9dea5650bac30424f9111364bb94928dbf5ecad1baa68" -dependencies = [ - "bytemuck", - "read-fonts 0.41.0", + "read-fonts", ] [[package]] @@ -6370,9 +5911,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.16.1" +version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba467056f1b547ed52077911161fc86985becbc60e8e1857c8a144dab0def891" +checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" [[package]] name = "smithay-client-toolkit" @@ -6380,17 +5921,17 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0512da38f5e2b31201a93524adb8d3136276fa4fe4aafab4e1f727a82b534cc0" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "bytemuck", "calloop", "calloop-wayland-source", "cursor-icon", "libc", "log", - "memmap2 0.9.11", + "memmap2 0.9.10", "pkg-config", "rustix 1.1.4", - "thiserror 2.0.20", + "thiserror 2.0.18", "wayland-backend", "wayland-client", "wayland-csd-frame", @@ -6426,9 +5967,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.6.5" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4" +checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e" dependencies = [ "libc", "windows-sys 0.61.2", @@ -6445,11 +5986,11 @@ dependencies = [ "fastrand", "foreign-types", "js-sys", - "libredox", "log", - "memmap2 0.9.11", + "memmap2 0.9.10", "objc", "raw-window-handle", + "redox_syscall 0.5.18", "rustix 0.38.44", "wasm-bindgen", "wayland-backend", @@ -6465,7 +6006,7 @@ version = "0.3.0+sdk-1.3.268.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", ] [[package]] @@ -6513,11 +6054,11 @@ dependencies = [ [[package]] name = "swash" -version = "0.2.10" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c2499c2d826531388872b2268718aed907a39bd785ab0dcfe57fab26283f92e" +checksum = "842f3cd369c2ba38966204f983eaa5e54a8e84a7d7159ed36ade2b6c335aae64" dependencies = [ - "skrifa 0.44.0", + "skrifa", "yazi", "zeno", ] @@ -6535,20 +6076,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.119" +version = "2.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "872831b642d1a07999a962a351ed35b955ea2cfc8f3862091e2a240a84f17297" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "3.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12df2e0110f65b775f769bb17ef989067a1d931b2eb822bd4346631eeada89f9" +checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99" dependencies = [ "proc-macro2", "quote", @@ -6557,13 +6087,13 @@ dependencies = [ [[package]] name = "synstructure" -version = "0.14.0" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "901704edd0dfe137f1987838ee4f259e4e063c31371bdb423f7ae38ec6f77f02" +checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ "proc-macro2", "quote", - "syn 3.0.5", + "syn 2.0.117", ] [[package]] @@ -6575,19 +6105,6 @@ dependencies = [ "libc", ] -[[package]] -name = "system-deps" -version = "7.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "396a35feb67335377e0251fcbc1092fc85c484bd4e3a7a54319399da127796e7" -dependencies = [ - "cfg-expr", - "heck 0.5.0", - "pkg-config", - "toml 1.1.6+spec-1.1.0", - "version-compare", -] - [[package]] name = "taffy" version = "0.9.2" @@ -6600,12 +6117,6 @@ dependencies = [ "slotmap", ] -[[package]] -name = "target-lexicon" -version = "0.13.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adb6935a6f5c20170eeceb1a3835a49e12e19d792f6dd344ccc76a985ca5a6ca" - [[package]] name = "temp-dir" version = "0.1.16" @@ -6619,10 +6130,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd" dependencies = [ "fastrand", - "getrandom 0.4.3", + "getrandom 0.4.2", "once_cell", "rustix 1.1.4", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -6645,11 +6156,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.20" +version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec86235f5fcc2a73650310756d2ac5b138a5780bbbdfae3eeccec992c435ba4f" +checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4" dependencies = [ - "thiserror-impl 2.0.20", + "thiserror-impl 2.0.18", ] [[package]] @@ -6660,36 +6171,37 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.119", + "syn 2.0.117", ] [[package]] name = "thiserror-impl" -version = "2.0.20" +version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc04cd3e1236dd4a98afca4569f2deb3f120e5422a4023be2cb683f8486292af" +checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5" dependencies = [ "proc-macro2", "quote", - "syn 3.0.5", + "syn 2.0.117", ] [[package]] name = "thread_local" -version = "1.1.10" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad99c4c6d32803332c548b1af0540b357b3f5fc0be8f6c6bfe8b2e6ae784070" +checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185" dependencies = [ "cfg-if", ] [[package]] name = "time" -version = "0.3.55" +version = "0.3.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb87b95ec50ddfa440816d227a17b2ccbdda963a316a727fda0fc4334f7d134" +checksum = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c" dependencies = [ "deranged", + "itoa", "libc", "num-conv", "num_threads", @@ -6701,15 +6213,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.9" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1c906769ad99c88eaa54e728060edef082f8e358ff32030cb7c7d315e81109" +checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca" [[package]] name = "time-macros" -version = "0.2.32" +version = "0.2.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e689342a48d2ea927c87ea50cabf8594854bf940e9310208848d680d668ed85" +checksum = "2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215" dependencies = [ "num-conv", "time-core", @@ -6734,21 +6246,7 @@ dependencies = [ "cfg-if", "log", "png 0.17.16", - "tiny-skia-path 0.11.4", -] - -[[package]] -name = "tiny-skia" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47ffee5eaaf5527f630fb0e356b90ebdec84d5d18d937c5e440350f88c5a91ea" -dependencies = [ - "arrayref", - "arrayvec", - "bytemuck", - "cfg-if", - "log", - "tiny-skia-path 0.12.0", + "tiny-skia-path", ] [[package]] @@ -6762,22 +6260,11 @@ dependencies = [ "strict-num", ] -[[package]] -name = "tiny-skia-path" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edca365c3faccca67d06593c5980fa6c57687de727a03131735bb85f01fdeeb9" -dependencies = [ - "arrayref", - "bytemuck", - "strict-num", -] - [[package]] name = "tinystr" -version = "0.8.4" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1e27c91459209c2986af3dcf603a5a74a4368754ce37414f59acc971167f643" +checksum = "c8323304221c2a851516f22236c5722a72eaa19749016521d6dff0824447d96d" dependencies = [ "displaydoc", "serde_core", @@ -6786,15 +6273,24 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.13.3" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3ca314f692efd6c868f8408f53fe444634a845f96c028b97d35f6a1f79f0ee" +checksum = "3e61e67053d25a4e82c844e8424039d9745781b3fc4f32b8d55ed50f5f667ef3" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.53.1" +version = "1.52.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "202caea871b69668250d242070849eb495be178ed697a3e98aebce5bc81a0bed" +checksum = "110a78583f19d5cdb2c5ccf321d1290344e71313c6c37d43520d386027d18386" dependencies = [ "bytes", "libc", @@ -6810,20 +6306,20 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.7.2" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78773a2a397f451582ce068015985c33193cf6dea8b74d2a639fe457b2f07b0e" +checksum = "385a6cb71ab9ab790c5fe8d67f1645e6c450a7ce006a33de03daa956cf70a496" dependencies = [ "proc-macro2", "quote", - "syn 3.0.5", + "syn 2.0.117", ] [[package]] name = "tokio-stream" -version = "0.1.19" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3d06f0b082ba57c26b79407372e57cf2a1e28124f78e9479fe80322cf53420b" +checksum = "32da49809aab5c3bc678af03902d4ccddea2a87d028d86392a4b1560c6906c70" dependencies = [ "futures-core", "pin-project-lite", @@ -6839,21 +6335,6 @@ dependencies = [ "serde", ] -[[package]] -name = "toml" -version = "1.1.6+spec-1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "920602543f0911ab71da12c50d59701da54c196d1a2bf5cb4b75667f137a406a" -dependencies = [ - "indexmap 2.14.2", - "serde_core", - "serde_spanned", - "toml_datetime", - "toml_parser", - "toml_writer", - "winnow 1.0.4", -] - [[package]] name = "toml_datetime" version = "1.1.1+spec-1.1.0" @@ -6865,30 +6346,24 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.25.15+spec-1.1.0" +version = "0.25.11+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1340ea94a5856333492c9064b02c778b191dd2c853778d9609debdcdfea3a614" +checksum = "0b59c4d22ed448339746c59b905d24568fcbb3ab65a500494f7b8c3e97739f2b" dependencies = [ - "indexmap 2.14.2", + "indexmap 2.14.0", "toml_datetime", "toml_parser", - "winnow 1.0.4", + "winnow 1.0.2", ] [[package]] name = "toml_parser" -version = "1.1.3+spec-1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d38ac1cf9b95face32296c0a3ede1fdc270627c9d9c02a7274dd6d960dc4d56" -dependencies = [ - "winnow 1.0.4", -] - -[[package]] -name = "toml_writer" version = "1.1.2+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d56353a2a665ad0f41a421187180aab746c8c325620617ad883a99a1cbe66d2" +checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526" +dependencies = [ + "winnow 1.0.2", +] [[package]] name = "tracing" @@ -6910,7 +6385,7 @@ checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da" dependencies = [ "proc-macro2", "quote", - "syn 2.0.119", + "syn 2.0.117", ] [[package]] @@ -6988,7 +6463,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb30dbbd9036155e74adad6812e9898d03ec374946234fbcebd5dfc7b9187b90" dependencies = [ - "rustc-hash 2.1.3", + "rustc-hash 2.1.2", ] [[package]] @@ -6999,9 +6474,9 @@ checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c" [[package]] name = "typenum" -version = "1.20.1" +version = "1.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6f5e870be6c3b371b77fe0ee0bafb859fa4964b4404c27de1d380043c4dda20" +checksum = "40ce102ab67701b8526c123c1bab5cbe42d7040ccfd0f64af1a385808d2f43de" [[package]] name = "udev" @@ -7104,9 +6579,9 @@ checksum = "383ad40bb927465ec0ce7720e033cb4ca06912855fc35db31b5755d0de75b1ee" [[package]] name = "unicode-segmentation" -version = "1.13.3" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6f5d3c3b1bf09027a88a6bc961fc00497d651009560b5463668dc81b0fa87a8" +checksum = "9629274872b2bfaf8d66f5f15725007f635594914870f65218920345aa11aa8c" [[package]] name = "unicode-vo" @@ -7126,6 +6601,12 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254" +[[package]] +name = "unicode-xid" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" + [[package]] name = "upower_dbus" version = "0.3.2" @@ -7160,7 +6641,7 @@ version = "0.45.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80be9b06fbae3b8b303400ab20778c80bbaf338f563afe567cf3c9eea17b47ef" dependencies = [ - "base64 0.22.1", + "base64", "data-url", "flate2", "fontdb", @@ -7174,7 +6655,7 @@ dependencies = [ "siphasher", "strict-num", "svgtypes", - "tiny-skia-path 0.11.4", + "tiny-skia-path", "unicode-bidi", "unicode-script", "unicode-vo", @@ -7195,9 +6676,9 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[package]] name = "uuid" -version = "1.26.1" +version = "1.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ef6dac1e96601b4fb3acccccff2139741fcb757cb9a36089bf5be91cfb285ce" +checksum = "ddd74a9687298c6858e9b88ec8935ec45d22e8fd5e6394fa1bd4e99a87789c76" dependencies = [ "js-sys", "serde_core", @@ -7233,12 +6714,6 @@ dependencies = [ "time", ] -[[package]] -name = "version-compare" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03c2856837ef78f57382f06b2b8563a2f512f7185d732608fd9176cb3b8edf0e" - [[package]] name = "version_check" version = "0.9.5" @@ -7263,18 +6738,27 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] name = "wasip2" -version = "1.0.4+wasi-0.2.12" +version = "1.0.3+wasi-0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67efb37e106e55ce722a510d6b5f9c17f083e5fc79afc2badeb12cc313d9487" +checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6" dependencies = [ - "wit-bindgen", + "wit-bindgen 0.57.1", +] + +[[package]] +name = "wasip3" +version = "0.4.0+wasi-0.3.0-rc-2026-01-06" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5" +dependencies = [ + "wit-bindgen 0.51.0", ] [[package]] name = "wasm-bindgen" -version = "0.2.128" +version = "0.2.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aecb87a33d3b0c5e3b7aa46336eaf486cffafbd281b195e4c8b80d50df2351bf" +checksum = "49ace1d07c165b0864824eee619580c4689389afa9dc9ed3a4c75040d82e6790" dependencies = [ "cfg-if", "once_cell", @@ -7285,9 +6769,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.78" +version = "0.4.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ef4c5d3d2cdf5c54f4231181768f5510842e350db025faf1f7163b1030ed928" +checksum = "96492d0d3ffba25305a7dc88720d250b1401d7edca02cc3bcd50633b424673b8" dependencies = [ "js-sys", "wasm-bindgen", @@ -7295,9 +6779,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.128" +version = "0.2.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a690d511e3c1a8b3a55e33511e3c2c00c78415cd23650f32b808627f5696b9ed" +checksum = "8e68e6f4afd367a562002c05637acb8578ff2dea1943df76afb9e83d177c8578" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -7305,26 +6789,60 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.128" +version = "0.2.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "411e4887f0071ef2d2164a9d5fdf2d20efbef78fccd3a78b0c10a1dc5295e48a" +checksum = "d95a9ec35c64b2a7cb35d3fead40c4238d0940c86d107136999567a4703259f2" dependencies = [ "bumpalo", "proc-macro2", "quote", - "syn 3.0.5", + "syn 2.0.117", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.128" +version = "0.2.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81941cd78d0c92026c33e5e01312845a4cb1e9af3407f9134b100dd03144103e" +checksum = "c4e0100b01e9f0d03189a92b96772a1fb998639d981193d7dbab487302513441" dependencies = [ "unicode-ident", ] +[[package]] +name = "wasm-encoder" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319" +dependencies = [ + "leb128fmt", + "wasmparser", +] + +[[package]] +name = "wasm-metadata" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909" +dependencies = [ + "anyhow", + "indexmap 2.14.0", + "wasm-encoder", + "wasmparser", +] + +[[package]] +name = "wasmparser" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" +dependencies = [ + "bitflags 2.11.1", + "hashbrown 0.15.5", + "indexmap 2.14.0", + "semver", +] + [[package]] name = "wasmtimer" version = "0.4.3" @@ -7341,9 +6859,9 @@ dependencies = [ [[package]] name = "wayland-backend" -version = "0.3.17" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38a91b4eaddff87b1cd1074985e3713da4af2c49742d1b356b2c01670a67a078" +checksum = "2857dd20b54e916ec7253b3d6b4d5c4d7d4ca2c33c2e11c6c76a99bd8744755d" dependencies = [ "cc", "downcast-rs", @@ -7355,11 +6873,11 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.31.15" +version = "0.31.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3c36a0f861ad76d0901f2800b46321410d9f73f2ea88aac0650d86c32688073" +checksum = "645c7c96bb74690c3189b5c9cb4ca1627062bb23693a4fad9d8c3de958260144" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "rustix 1.1.4", "wayland-backend", "wayland-scanner", @@ -7371,7 +6889,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "cursor-icon", "wayland-backend", ] @@ -7389,11 +6907,11 @@ dependencies = [ [[package]] name = "wayland-protocols" -version = "0.32.13" +version = "0.32.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d0c813de3daa2ed6520af85a3bd49b0e722a3078506899aa9686fea58dc4b6" +checksum = "563a85523cade2429938e790815fd7319062103b9f4a2dc806e9b53b95982d8f" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "wayland-backend", "wayland-client", "wayland-scanner", @@ -7406,7 +6924,7 @@ version = "20250721.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40a1f863128dcaaec790d7b4b396cc9b9a7a079e878e18c47e6c2d2c5a8dcbb1" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "wayland-backend", "wayland-client", "wayland-protocols", @@ -7419,7 +6937,7 @@ version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e9567599ef23e09b8dad6e429e5738d4509dfc46b3b21f32841a304d16b29c8" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "wayland-backend", "wayland-client", "wayland-protocols", @@ -7432,7 +6950,7 @@ version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b6d8cf1eb2c1c31ed1f5643c88a6e53538129d4af80030c8cabd1f9fa884d91" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "wayland-backend", "wayland-client", "wayland-protocols", @@ -7445,7 +6963,7 @@ version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb04e52f7836d7c7976c78ca0250d61e33873c34156a2a1fc9474828ec268234" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "wayland-backend", "wayland-client", "wayland-protocols", @@ -7455,9 +6973,9 @@ dependencies = [ [[package]] name = "wayland-scanner" -version = "0.31.11" +version = "0.31.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "338e30461b3a2b67d70eb30a6d89f8e0c93a833e07d2ae89085cd070c4a00ac0" +checksum = "9c324a910fd86ebdc364a3e61ec1f11737d3b1d6c273c0239ee8ff4bc0d24b4a" dependencies = [ "proc-macro2", "quick-xml", @@ -7466,11 +6984,11 @@ dependencies = [ [[package]] name = "wayland-server" -version = "0.31.14" +version = "0.31.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dde9c29be0f723a573977de51ee455bf3dfa03652730a74f9dd3b337e374d75" +checksum = "cc1846eb04c49182e04f4a099e2a830a2b745610bbc1d61246e206f29c7000a0" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "downcast-rs", "rustix 1.1.4", "wayland-backend", @@ -7491,9 +7009,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.105" +version = "0.3.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fbddc4a036f00ec4f18c83445bd3115cb306a91da554919a099d9222fe4a7f8" +checksum = "4b572dff8bcf38bad0fa19729c89bb5748b2b9b1d8be70cf90df697e3a8f32aa" dependencies = [ "js-sys", "wasm-bindgen", @@ -7522,7 +7040,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9cb534d5ffd109c7d1135f34cdae29e60eab94855a625dcfe1705f8bc7ad79f" dependencies = [ "arrayvec", - "bitflags 2.13.2", + "bitflags 2.11.1", "bytemuck", "cfg-if", "cfg_aliases", @@ -7554,12 +7072,12 @@ dependencies = [ "arrayvec", "bit-set", "bit-vec", - "bitflags 2.13.2", + "bitflags 2.11.1", "bytemuck", "cfg_aliases", "document-features", "hashbrown 0.16.1", - "indexmap 2.14.2", + "indexmap 2.14.0", "log", "naga", "once_cell", @@ -7569,7 +7087,7 @@ dependencies = [ "raw-window-handle", "rustc-hash 1.1.0", "smallvec", - "thiserror 2.0.20", + "thiserror 2.0.18", "wgpu-core-deps-apple", "wgpu-core-deps-emscripten", "wgpu-core-deps-windows-linux-android", @@ -7614,7 +7132,7 @@ dependencies = [ "arrayvec", "ash", "bit-set", - "bitflags 2.13.2", + "bitflags 2.11.1", "block", "bytemuck", "cfg-if", @@ -7644,7 +7162,7 @@ dependencies = [ "raw-window-handle", "renderdoc-sys", "smallvec", - "thiserror 2.0.20", + "thiserror 2.0.18", "wasm-bindgen", "web-sys", "wgpu-types", @@ -7658,7 +7176,7 @@ version = "28.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e18308757e594ed2cd27dddbb16a139c42a683819d32a2e0b1b0167552f5840c" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "bytemuck", "js-sys", "log", @@ -7693,7 +7211,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -7814,7 +7332,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.119", + "syn 2.0.117", ] [[package]] @@ -7825,7 +7343,7 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" dependencies = [ "proc-macro2", "quote", - "syn 2.0.119", + "syn 2.0.117", ] [[package]] @@ -8149,7 +7667,7 @@ checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" name = "winit" version = "0.31.0-beta.2" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "cfg_aliases", "cursor-icon", "dpi", @@ -8174,7 +7692,7 @@ name = "winit-android" version = "0.31.0-beta.2" dependencies = [ "android-activity", - "bitflags 2.13.2", + "bitflags 2.11.1", "dpi", "ndk", "raw-window-handle", @@ -8187,7 +7705,7 @@ dependencies = [ name = "winit-appkit" version = "0.31.0-beta.2" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "block2 0.6.2", "dispatch2", "dpi", @@ -8208,7 +7726,7 @@ dependencies = [ name = "winit-common" version = "0.31.0-beta.2" dependencies = [ - "memmap2 0.9.11", + "memmap2 0.9.10", "objc2 0.6.4", "objc2-core-foundation", "smol_str", @@ -8221,7 +7739,7 @@ dependencies = [ name = "winit-core" version = "0.31.0-beta.2" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "cursor-icon", "dpi", "keyboard-types", @@ -8234,7 +7752,7 @@ dependencies = [ name = "winit-orbital" version = "0.31.0-beta.2" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "dpi", "libredox", "orbclient", @@ -8249,7 +7767,7 @@ dependencies = [ name = "winit-uikit" version = "0.31.0-beta.2" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "block2 0.6.2", "dispatch2", "dpi", @@ -8269,12 +7787,12 @@ name = "winit-wayland" version = "0.31.0-beta.2" dependencies = [ "ahash", - "bitflags 2.13.2", + "bitflags 2.11.1", "calloop", "cursor-icon", "dpi", "libc", - "memmap2 0.9.11", + "memmap2 0.9.10", "raw-window-handle", "rustix 1.1.4", "sctk-adwaita", @@ -8294,7 +7812,7 @@ name = "winit-web" version = "0.31.0-beta.2" dependencies = [ "atomic-waker", - "bitflags 2.13.2", + "bitflags 2.11.1", "concurrent-queue", "cursor-icon", "dpi", @@ -8314,7 +7832,7 @@ dependencies = [ name = "winit-win32" version = "0.31.0-beta.2" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "cursor-icon", "dpi", "raw-window-handle", @@ -8336,19 +7854,107 @@ dependencies = [ [[package]] name = "winnow" -version = "1.0.4" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b97319f7b8343df12cc98938e5c3eb436064524c8d2b4e30a1d3a36eecdf81" +checksum = "2ee1708bef14716a11bae175f579062d4554d95be2c6829f518df847b7b3fdd0" dependencies = [ "memchr", ] +[[package]] +name = "wit-bindgen" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" +dependencies = [ + "wit-bindgen-rust-macro", +] + [[package]] name = "wit-bindgen" version = "0.57.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e" +[[package]] +name = "wit-bindgen-core" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc" +dependencies = [ + "anyhow", + "heck 0.5.0", + "wit-parser", +] + +[[package]] +name = "wit-bindgen-rust" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21" +dependencies = [ + "anyhow", + "heck 0.5.0", + "indexmap 2.14.0", + "prettyplease", + "syn 2.0.117", + "wasm-metadata", + "wit-bindgen-core", + "wit-component", +] + +[[package]] +name = "wit-bindgen-rust-macro" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a" +dependencies = [ + "anyhow", + "prettyplease", + "proc-macro2", + "quote", + "syn 2.0.117", + "wit-bindgen-core", + "wit-bindgen-rust", +] + +[[package]] +name = "wit-component" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2" +dependencies = [ + "anyhow", + "bitflags 2.11.1", + "indexmap 2.14.0", + "log", + "serde", + "serde_derive", + "serde_json", + "wasm-encoder", + "wasm-metadata", + "wasmparser", + "wit-parser", +] + +[[package]] +name = "wit-parser" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736" +dependencies = [ + "anyhow", + "id-arena", + "indexmap 2.14.0", + "log", + "semver", + "serde", + "serde_derive", + "serde_json", + "unicode-xid", + "wasmparser", +] + [[package]] name = "write16" version = "1.0.0" @@ -8357,18 +7963,18 @@ checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" [[package]] name = "writeable" -version = "0.6.4" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ad82d2a33cdc9674dc7465672f271e096168fcdbe0f799d9e6db8c5892679dc" +checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4" dependencies = [ "either", ] [[package]] name = "xcursor" -version = "0.3.11" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "163b33ed8786455e2fa5d72f554057ce3f3182425434f756cd39c99839d88e23" +checksum = "bec9e4a500ca8864c5b47b8b482a73d62e4237670e5b5f1d6b9e3cae50f28f2b" [[package]] name = "xdg" @@ -8404,7 +8010,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d66ca9352cbd4eecbbc40871d8a11b4ac8107cfc528a6e14d7c19c69d0e1ac9" dependencies = [ "libc", - "memmap2 0.9.11", + "memmap2 0.9.10", "xkeysym", ] @@ -8415,7 +8021,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7a974f48060a14e95705c01f24ad9c3345022f4d97441b8a36beb7ed5c4a02d" dependencies = [ "libc", - "memmap2 0.9.11", + "memmap2 0.9.10", "xkeysym", ] @@ -8425,7 +8031,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5" dependencies = [ - "bitflags 2.13.2", + "bitflags 2.11.1", "dlib", "log", "once_cell", @@ -8443,9 +8049,9 @@ dependencies = [ [[package]] name = "xml-rs" -version = "0.8.29" +version = "0.8.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e450f9b2ed1dff33c94c12589a87338689467b9c4f5d8a5710bd09a847d2c8a7" +checksum = "3ae8337f8a065cfc972643663ea4279e04e7256de865aa66fe25cec5fb912d3f" [[package]] name = "xmlwriter" @@ -8473,9 +8079,9 @@ checksum = "e01738255b5a16e78bbb83e7fbba0a1e7dd506905cfc53f4622d89015a03fbb5" [[package]] name = "yoke" -version = "0.8.3" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "709fe23a0424b6a435d82152b1bd3fdfb0833487d5fa90d05d42762a9891fef5" +checksum = "abe8c5fda708d9ca3df187cae8bfb9ceda00dd96231bed36e445a1a48e66f9ca" dependencies = [ "stable_deref_trait", "yoke-derive", @@ -8484,21 +8090,21 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.8.3" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33811428bee40dbceb6d545e95754741d17a6aef9a4849f0fd62e2ba4f412a78" +checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e" dependencies = [ "proc-macro2", "quote", - "syn 3.0.5", + "syn 2.0.117", "synstructure", ] [[package]] name = "zbus" -version = "5.19.0" +version = "5.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5db4be7c075cb421e4b7ee645541604239bd243ba7c357511f4ff3a74b555907" +checksum = "c3bcbf15c8708d7fc1be0c993622e0a5cbd5e8b52bfa40afa4c3e0cd8d724ac1" dependencies = [ "async-broadcast", "async-executor", @@ -8524,7 +8130,7 @@ dependencies = [ "uds_windows", "uuid", "windows-sys 0.61.2", - "winnow 1.0.4", + "winnow 1.0.2", "zbus_macros", "zbus_names", "zvariant", @@ -8548,7 +8154,7 @@ checksum = "10da05367f3a7b7553c8cdf8fa91aee6b64afebe32b51c95177957efc47ca3a0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.119", + "syn 2.0.117", "zbus-lockstep", "zbus_xml", "zvariant", @@ -8556,14 +8162,14 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "5.19.0" +version = "5.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2990635d09ade6df1868f72f8cac69a876a90981e8bd3c40b1be413f8dc88f40" +checksum = "51fa5406ad9175a8c825a931f8cf347116b531b3634fcb0b627c290f1f2516ff" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 3.0.5", + "syn 2.0.117", "zbus_names", "zvariant", "zvariant_utils", @@ -8571,46 +8177,27 @@ dependencies = [ [[package]] name = "zbus_names" -version = "4.3.4" +version = "4.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8bf88b4a3ff53e883001e0e0115b297a9d53c31b9c1edd2bfdd853e3428624e" +checksum = "7074f3e50b894eac91750142016d30d0a89be8e67dbfd9704fb875825760e52d" dependencies = [ "serde", - "winnow 1.0.4", + "winnow 1.0.2", "zvariant", ] -[[package]] -name = "zbus_systemd" -version = "0.26000.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40c8310483ff4a77492d04a90bef30f40938059b4a4b4f7e456dda335d816cb6" -dependencies = [ - "serde", - "zbus", -] - [[package]] name = "zbus_xml" -version = "5.2.1" +version = "5.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1586c021a01ca0a9216dcd874e546382e156a5cbab5fab6cb5f10087e22682a" +checksum = "a8067892e940ed1727dea64690378601603b31d62dfde019a5335fbb7c0e0ed9" dependencies = [ + "quick-xml", "serde", - "winnow 1.0.4", "zbus_names", "zvariant", ] -[[package]] -name = "zcheapstr" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1afec51604565183aeb5c54c20aeab286120d4e4460f7f76e3e8bb8c0d99473" -dependencies = [ - "serde", -] - [[package]] name = "zeno" version = "0.3.3" @@ -8619,50 +8206,50 @@ checksum = "6df3dc4292935e51816d896edcd52aa30bc297907c26167fec31e2b0c6a32524" [[package]] name = "zerocopy" -version = "0.8.57" +version = "0.8.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d35102a9f36d089ccae9e4c6802bc118be4487b80aaffc0ab4e0cf5ce92d2873" +checksum = "eed437bf9d6692032087e337407a86f04cd8d6a16a37199ed57949d415bd68e9" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.57" +version = "0.8.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146c01f5ab44258da43cf276c74a2763db2ff3969c9c652c3f2de07041d0b2bc" +checksum = "70e3cd084b1788766f53af483dd21f93881ff30d7320490ec3ef7526d203bad4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.119", + "syn 2.0.117", ] [[package]] name = "zerofrom" -version = "0.1.8" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ec05a11813ea801ff6d75110ad09cd0824ddba17dfe17128ea0d5f68e6c5272" +checksum = "69faa1f2a1ea75661980b013019ed6687ed0e83d069bc1114e2cc74c6c04c4df" dependencies = [ "zerofrom-derive", ] [[package]] name = "zerofrom-derive" -version = "0.1.8" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f75b4683f6c7f45248d4d64056a24298c6281e0993356d7d1b4a1a962ef10d4a" +checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1" dependencies = [ "proc-macro2", "quote", - "syn 3.0.5", + "syn 2.0.117", "synstructure", ] [[package]] name = "zerotrie" -version = "0.2.5" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea269c3bd32f0a32c321907a2ae912ba6f4649bb0fc764a15627e99a7095a3f" +checksum = "0f9152d31db0792fa83f70fb2f83148effb5c1f5b8c7686c3459e361d9bc20bf" dependencies = [ "displaydoc", "yoke", @@ -8672,9 +8259,9 @@ dependencies = [ [[package]] name = "zerovec" -version = "0.11.8" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb0464e17806c1d976d5cba29399c7f08e516e279e2ba493f63123b5fca67dd8" +checksum = "90f911cbc359ab6af17377d242225f4d75119aec87ea711a880987b18cd7b239" dependencies = [ "serde", "yoke", @@ -8684,26 +8271,20 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.11.6" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34df6fc39dbd26ddc9c10e6a2984476e13acce22e64e4487636ef494369225da" +checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555" dependencies = [ "proc-macro2", "quote", - "syn 3.0.5", + "syn 2.0.117", ] -[[package]] -name = "zlib-rs" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b268e58e7c693d7c271f93ffc4ba3b380412554231c85bf61ca7af91042a4112" - [[package]] name = "zmij" -version = "1.0.23" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b" +checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" [[package]] name = "zune-core" @@ -8713,9 +8294,9 @@ checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" [[package]] name = "zune-core" -version = "0.5.3" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d56377fd46368984a170bc5aac5567e52ca5da874caa60bea39fcbca78fb658b" +checksum = "cb8a0807f7c01457d0379ba880ba6322660448ddebc890ce29bb64da71fb40f9" [[package]] name = "zune-inflate" @@ -8741,49 +8322,48 @@ version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27bc9d5b815bc103f142aa054f561d9187d191692ec7c2d1e2b4737f8dbd7296" dependencies = [ - "zune-core 0.5.3", + "zune-core 0.5.1", ] [[package]] name = "zvariant" -version = "5.15.0" +version = "5.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1d34c27cc6cdd1f458427519dd6b8612f7b7e3f7b9a0b2355d041dda9869147" +checksum = "1c1567a6ec68df868cbbfde844cfc6d81649fe5109a62b116b19fabd53e618ee" dependencies = [ "endi", "enumflags2", "serde", "url", - "winnow 1.0.4", - "zcheapstr", + "winnow 1.0.2", "zvariant_derive", "zvariant_utils", ] [[package]] name = "zvariant_derive" -version = "5.15.0" +version = "5.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "864155e69b4352db0c7f374917bf45d1e0c8d17659c8b3dbf9795f3673f8c497" +checksum = "c7d5b780599bbde114e39d9a0799577fad1ced5105d38515745f7b3099d8ceda" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 3.0.5", + "syn 2.0.117", "zvariant_utils", ] [[package]] name = "zvariant_utils" -version = "4.2.0" +version = "3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bad0294361a320b694a328460dc73add56c306150f5cb6bfafc44446120008a3" +checksum = "6d464f5733ffa07a3164d656f18533caace9d0638596721355d73256a410d691" dependencies = [ "proc-macro2", "quote", "serde", - "syn 3.0.5", - "winnow 1.0.4", + "syn 2.0.117", + "winnow 1.0.2", ] [[patch.unused]] diff --git a/Cargo.toml b/Cargo.toml index b6fdaa4..170acb4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,7 +18,6 @@ cosmic-comp-config.workspace = true cosmic-config = { workspace = true, features = ["calloop", "macro"] } cosmic-greeter-config.workspace = true cosmic-greeter-daemon = { path = "daemon" } -cosmic-osk-config = { git = "https://github.com/pop-os/cosmic-osk" } dirs = "6" cosmic = { package = "libcosmic-yoda", path = "../libcosmic", default-features = false, features = [ "advanced-shaping", @@ -81,16 +80,12 @@ cosmic-randr-shell = { workspace = true } kdl.workspace = true color-eyre.workspace = true image = { version = "0.25", default-features = false, features = [ - "avif-native", "jpeg", "png", "rayon", "webp", "hdr", ] } -# JPEG-XL support -jxl-oxide = { version = "0.12.6", features = ["image"] } -enumflags2 = "0.7.12" [dependencies.greetd_ipc] version = "0.10.3" @@ -173,8 +168,8 @@ iced_widget = { path = "../libcosmic/iced/widget" } iced_winit = { path = "../libcosmic/iced/winit" } [patch."https://github.com/pop-os/cosmic-protocols"] -cosmic-client-toolkit = { path = "../cosmic-protocols/client-toolkit" } cosmic-protocols = { path = "../cosmic-protocols" } +cosmic-client-toolkit = { path = "../cosmic-protocols/client-toolkit" } [patch."https://github.com/pop-os/cosmic-settings-daemon"] cosmic-settings-config = { path = "../cosmic-settings-daemon/config" } @@ -189,7 +184,3 @@ dnd = { path = "../window_clipboard/dnd" } mime = { path = "../window_clipboard/mime" } clipboard_wayland = { path = "../window_clipboard/wayland" } clipboard_macos = { path = "../window_clipboard/macos" } - -# Yoda: cosmic-osk-config depuis le checkout local (meme source que le paquet cosmic-osk). -[patch."https://github.com/pop-os/cosmic-osk"] -cosmic-osk-config = { path = "../cosmic-osk/config" } diff --git a/daemon/Cargo.toml b/daemon/Cargo.toml index 000ad41..a229b05 100644 --- a/daemon/Cargo.toml +++ b/daemon/Cargo.toml @@ -28,8 +28,7 @@ whitespace-conf = "1" #TODO: reduce features tokio = { workspace = true, features = ["full"] } xdg = "3.0" -zbus_systemd = { version = "0.26000.0", features = ["home1"], optional = true } [features] default = ["systemd"] -systemd = ["tracing-journald", "zbus_systemd"] +systemd = ["tracing-journald"] diff --git a/daemon/src/lib.rs b/daemon/src/lib.rs index 689a913..e01885f 100644 --- a/daemon/src/lib.rs +++ b/daemon/src/lib.rs @@ -1,12 +1,11 @@ use cosmic_comp_config::output::randr; use cosmic_config::CosmicConfigEntry; use kdl::KdlDocument; -use std::collections::{BTreeMap, BTreeSet}; +use std::collections::BTreeMap; use std::fs; use std::io::Read; use std::os::unix::fs::OpenOptionsExt; use std::path::{Path, PathBuf}; -use zbus::Connection; pub use cosmic_applets_config::time::TimeAppletConfig; pub use cosmic_bg_config::state::State as BgState; @@ -17,41 +16,12 @@ pub use cosmic_theme::{Theme, ThemeBuilder}; pub struct UserFilter { uid_min: u32, uid_max: u32, - homed_uids: BTreeSet, } -impl UserFilter { - #[cfg(feature = "systemd")] - async fn get_homed_uids() -> Result, zbus::Error> { - use zbus_systemd::home1; - - let connection = Connection::system().await?; - let homed = home1::ManagerProxy::new(&connection).await?; - - let homed_uids = homed - .list_homes() - .await? - .iter() - .map(|(_, uid, ..)| *uid) - .collect(); - - Ok(homed_uids) - } - - pub async fn new() -> Self { +impl Default for UserFilter { + fn default() -> Self { let login_defs_data = fs::read_to_string("/etc/login.defs").unwrap_or_default(); let login_defs = whitespace_conf::parse(&login_defs_data); - - #[cfg(feature = "systemd")] - let homed_uids = Self::get_homed_uids() - .await - .inspect_err(|e| { - tracing::warn!("failed to list dynamic UIDs from systemd-homed: {e:?}") - }) - .unwrap_or_default(); - #[cfg(not(feature = "systemd"))] - let homed_uids = BTreeSet::new(); - Self { uid_min: login_defs .get("UID_MIN") @@ -61,14 +31,17 @@ impl UserFilter { .get("UID_MAX") .and_then(|x| x.parse::().ok()) .unwrap_or(65000), - homed_uids, } } +} + +impl UserFilter { + pub fn new() -> Self { + Self::default() + } pub fn filter(&self, user: &pwd::Passwd) -> bool { - if (user.uid < self.uid_min || user.uid > self.uid_max) - && !self.homed_uids.contains(&user.uid) - { + if user.uid < self.uid_min || user.uid > self.uid_max { // Skip system accounts return false; } @@ -128,48 +101,6 @@ impl UserData { } } - fn load_icon_as_user(&mut self) { - //TODO: use accountsservice? - let icon_paths = [ - //IMPORTANT: This file is owned by root and safe to read (it won't be a link to /etc/shadow for example) - // It may not exist if the user uses one of the system icons. In that case, we should read the - // information in /var/lib/AccountsService/users, and then read the icon path as the user - Path::new("/var/lib/AccountsService/icons").join(&self.name), - // systemd-homed cache - Path::new("/var/cache/systemd/home") - .join(&self.name) - .join("avatar"), - ]; - - for icon_path in icon_paths { - match fs::OpenOptions::new() - .read(true) - // Do not follow symlinks - .custom_flags(libc::O_NOFOLLOW) - .open(&icon_path) - { - Ok(mut icon_file) => { - let mut icon_data = Vec::new(); - match icon_file.read_to_end(&mut icon_data) { - Ok(count) => { - icon_data.truncate(count); - self.icon_opt = Some(icon_data); - return; - } - Err(err) => { - tracing::error!("failed to read icon data {:?}: {:?}", icon_path, err); - } - } - } - Err(err) => { - tracing::warn!("failed to open icon {:?}: {:?}", icon_path, err); - } - } - } - - tracing::error!("failed to load icon for user {:?}", self.name) - } - pub fn load_config_as_user(&mut self) { self.icon_opt = None; self.theme_opt = None; @@ -178,7 +109,33 @@ impl UserData { self.xkb_config_opt = None; self.time_applet_config = Default::default(); - self.load_icon_as_user(); + //TODO: use accountsservice? + //IMPORTANT: This file is owned by root and safe to read (it won't be a link to /etc/shadow for example) + // It may not exist if the user uses one of the system icons. In that case, we should read the + // information in /var/lib/AccountsService/users, and then read the icon path as the user + let icon_path = Path::new("/var/lib/AccountsService/icons").join(&self.name); + match fs::OpenOptions::new() + .read(true) + // Do not follow symlinks + .custom_flags(libc::O_NOFOLLOW) + .open(&icon_path) + { + Ok(mut icon_file) => { + let mut icon_data = Vec::new(); + match icon_file.read_to_end(&mut icon_data) { + Ok(count) => { + icon_data.truncate(count); + self.icon_opt = Some(icon_data); + } + Err(err) => { + tracing::error!("failed to read icon data {:?}: {:?}", icon_path, err); + } + } + } + Err(err) => { + tracing::error!("failed to open icon {:?}: {:?}", icon_path, err); + } + } let mut is_dark = true; match cosmic_theme::ThemeMode::config() { @@ -252,16 +209,6 @@ impl UserData { tracing::error!("failed to create cosmic-bg state helper: {:?}", err); } } - if self.bg_state.wallpapers.is_empty() { - self.bg_state.wallpapers.push(( - String::new(), - BgSource::Path( - Path::new("/var/cache/systemd/home") - .join(&self.name) - .join("login-background"), - ), - )); - } self.load_wallpapers_as_user(); match cosmic_config::Config::new("com.system76.CosmicComp", CosmicCompConfig::VERSION) { diff --git a/daemon/src/main.rs b/daemon/src/main.rs index 419a20d..427070a 100644 --- a/daemon/src/main.rs +++ b/daemon/src/main.rs @@ -70,8 +70,8 @@ struct GreeterProxy; #[zbus::interface(name = "com.system76.CosmicGreeter")] impl GreeterProxy { - async fn get_user_data(&mut self) -> Result { - let user_filter = UserFilter::new().await; + fn get_user_data(&mut self) -> Result { + let user_filter = UserFilter::new(); // The pwd::Passwd method is unsafe (but not labelled as such) due to using global state (libc pwent functions). // To prevent issues, this should only be called once in the entire process space at a time diff --git a/debian/control b/debian/control index f193b0e..4ed59b9 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,6 @@ Build-Depends: git, just (>= 1.13.0), libclang-dev, - libdav1d-dev, libinput-dev, libpam-dev, libwayland-dev, diff --git a/default.nix b/default.nix deleted file mode 100644 index e613104..0000000 --- a/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - rust-overlay ? import (import ./nix/flake-parse.nix "rust-overlay"), - pkgs ? import (import ./nix/flake-parse.nix "nixpkgs") { - system = builtins.currentSystem; - overlays = [ rust-overlay ]; - }, -}: -let - rustToolchain = pkgs.rust-bin.stable.latest.default.override { - extensions = [ - "rust-analyzer" - "rust-src" - "llvm-tools" - ]; - }; -in -{ - shell = import ./nix/shell.nix { - inherit pkgs rustToolchain; - }; - - formatter = import ./nix/formatter.nix { inherit pkgs rustToolchain; }; - - packages = - let - rustPlatform = pkgs.makeRustPlatform { - cargo = rustToolchain; - rustc = rustToolchain; - }; - in - rec { - default = pkgs.callPackage ./nix/package.nix { - inherit rustPlatform; - }; - sessiond-seat = default; - }; -} diff --git a/flake.lock b/flake.lock deleted file mode 100644 index 014c16f..0000000 --- a/flake.lock +++ /dev/null @@ -1,45 +0,0 @@ -{ - "nodes": { - "nixpkgs": { - "locked": { - "lastModified": 1788881743, - "narHash": "sha256-151taSq/21cxagiIu7hyMVl68+FbHfwBP4lh6TB6KOM=", - "rev": "d6524aaca2ff07876657ae2b323f24be4874944b", - "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1069856.d6524aaca2ff/nixexprs.tar.xz" - }, - "original": { - "type": "tarball", - "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" - } - }, - "root": { - "inputs": { - "nixpkgs": "nixpkgs", - "rust-overlay": "rust-overlay" - } - }, - "rust-overlay": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1788851328, - "narHash": "sha256-YOwlUD0Lt/3SulKhZ7z0Jmgbq/DWh8SjnGwUlFSw+YM=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "6ae57a71bcb0bebc7a66cc2bd76942c4cf649167", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/flake.nix b/flake.nix deleted file mode 100644 index 8a12faa..0000000 --- a/flake.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ - inputs = { - nixpkgs.url = "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"; - rust-overlay = { - url = "github:oxalica/rust-overlay"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - }; - - outputs = - { - self, - nixpkgs, - rust-overlay, - ... - }: - let - systems = [ - "x86_64-linux" - "aarch64-linux" - ]; - - pkgsFor = - system: - import nixpkgs { - inherit system; - overlays = [ rust-overlay.overlays.default ]; - }; - - forAllSystems = f: nixpkgs.lib.genAttrs systems (system: f (pkgsFor system)); - in - { - devShells = forAllSystems (pkgs: { - default = - let - rustToolchain = pkgs.rust-bin.stable.latest.default.override { - extensions = [ - "rust-analyzer" - "rust-src" - "llvm-tools" - ]; - }; - in - import ./nix/shell.nix { inherit pkgs rustToolchain; }; - }); - - packages = forAllSystems ( - pkgs: - let - rustToolchain = pkgs.rust-bin.stable.latest.default.override { - extensions = [ - "rust-analyzer" - "rust-src" - "llvm-tools" - ]; - }; - rustPlatform = pkgs.makeRustPlatform { - cargo = rustToolchain; - rustc = rustToolchain; - }; - in - { - cosmic-greeter = pkgs.callPackage ./nix/package.nix { - inherit rustPlatform; - }; - default = self.packages.${pkgs.stdenv.hostPlatform.system}.cosmic-greeter; - } - ); - - formatter = forAllSystems ( - pkgs: - let - rustToolchain = pkgs.rust-bin.stable.latest.default.override { - extensions = [ - "rust-analyzer" - "rust-src" - "llvm-tools" - ]; - }; - in - import ./nix/formatter.nix { inherit pkgs rustToolchain; } - ); - }; -} diff --git a/i18n/cs/cosmic_greeter.ftl b/i18n/cs/cosmic_greeter.ftl index 752b814..0f16321 100644 --- a/i18n/cs/cosmic_greeter.ftl +++ b/i18n/cs/cosmic_greeter.ftl @@ -2,7 +2,7 @@ accessibility = Přístupnost .screen-reader = Čtečka obrazovky .magnifier = Lupa .high-contrast = Vysoký kontrast - .invert-colors = Inverze barev + .invert-colors = Převrátit barvy cancel = Zrušit caps-lock = Caps Lock je aktivní. enter-user = Zadat jméno ručně... diff --git a/i18n/da/cosmic_greeter.ftl b/i18n/da/cosmic_greeter.ftl index 71244ce..e69de29 100644 --- a/i18n/da/cosmic_greeter.ftl +++ b/i18n/da/cosmic_greeter.ftl @@ -1,37 +0,0 @@ -cancel = Afbryd -restart = Genstart -caps-lock = Skiftelås er aktiv. -enter-user = Indtast navn manuelt... -type-username = Brugernavn: -keyboard-layout = Tastaturopsætning -restart-now = Genstart nu? -session = Session -shutdown = Luk ned -shutdown-now = Luk ned nu? -user = Bruger -suspend = Slumre -auth-error-default = Godkendelse fejlede. Prøv venligst igen. -auth-error-credentials = Ukorrekt adgangskode. Kontrollér venligst din tastaturopsætning og prøv igen. -auth-error-denied = Adgang nægtet. -auth-error-maxtries = For mange mislykkede godkendelsesforsøg. -auth-error-account = Konto er utilgængelig eller deaktiveret. -accessibility = Accessibility - .screen-reader = Skærmlæser - .magnifier = Forstørrelsesglas - .high-contrast = Høj kontrast - .invert-colors = Invertér Farver -authenticating = Godkender... -restart-timeout = - The system will restart automatically - { $seconds -> - [0] now. - [1] in 1 second. - *[other] in { $seconds } seconds. - } -shutdown-timeout = - Systemet lukker automatisk ned - { $seconds -> - [0] nu. - [1] om 1 sekund. - *[other] om { $seconds } sekunder. - } diff --git a/i18n/de/cosmic_greeter.ftl b/i18n/de/cosmic_greeter.ftl index 286810f..5edaa51 100644 --- a/i18n/de/cosmic_greeter.ftl +++ b/i18n/de/cosmic_greeter.ftl @@ -27,11 +27,11 @@ accessibility = Barrierefreiheit .magnifier = Vergrößerungsglas .high-contrast = Hoher Kontrast .invert-colors = Farben invertieren -enter-user = Name manuell eingeben ... +enter-user = Name manuell eingeben… type-username = Benutzername: auth-error-default = Authentifizierung fehlgeschlagen. Bitte versuche es erneut. auth-error-credentials = Falsches Passwort. Bitte überprüfe deine Tastaturbelegung und versuche es erneut. auth-error-denied = Zugriff verweigert. auth-error-maxtries = Zu viele fehlgeschlagene Authentifizierungsversuche. auth-error-account = Konto ist nicht verfügbar oder deaktiviert. -authenticating = Authentifizierung ... +authenticating = Authentifizierung... diff --git a/i18n/en-GB/cosmic_greeter.ftl b/i18n/en-GB/cosmic_greeter.ftl index 269cddf..e69de29 100644 --- a/i18n/en-GB/cosmic_greeter.ftl +++ b/i18n/en-GB/cosmic_greeter.ftl @@ -1 +0,0 @@ -cancel = Cancel diff --git a/i18n/en/cosmic_greeter.ftl b/i18n/en/cosmic_greeter.ftl index fa77b09..2625d59 100644 --- a/i18n/en/cosmic_greeter.ftl +++ b/i18n/en/cosmic_greeter.ftl @@ -9,7 +9,6 @@ caps-lock = Caps Lock is active. enter-user = Enter name manually... type-username = Username: keyboard-layout = Keyboard layout -on-screen-keyboard = On-screen keyboard restart = Restart restart-now = Restart now? restart-timeout = The system will restart automatically diff --git a/i18n/fa/cosmic_greeter.ftl b/i18n/fa/cosmic_greeter.ftl index dc16d57..e69de29 100644 --- a/i18n/fa/cosmic_greeter.ftl +++ b/i18n/fa/cosmic_greeter.ftl @@ -1 +0,0 @@ -cancel = لغو diff --git a/i18n/fil/cosmic_greeter.ftl b/i18n/fil/cosmic_greeter.ftl deleted file mode 100644 index e69de29..0000000 diff --git a/i18n/gl/cosmic_greeter.ftl b/i18n/gl/cosmic_greeter.ftl deleted file mode 100644 index 7b02560..0000000 --- a/i18n/gl/cosmic_greeter.ftl +++ /dev/null @@ -1,37 +0,0 @@ -cancel = Cancelar -accessibility = Accesibilidade - .screen-reader = Lector de pantalla - .magnifier = Lupa - .high-contrast = Alto contraste - .invert-colors = Inverter cores -authenticating = Autentificando... -caps-lock = Bloqueo de Maiúsculas activo. -enter-user = Introducir nome manualmente... -type-username = Nome de usuario: -keyboard-layout = Distribución do teclado -restart = Reiniciar -restart-now = Reiniciar agora? -restart-timeout = - O sistema reiniciarase automaticamente - { $seconds -> - [0] agora. - [1] dentro de 1 segundo. - *[other] dentro de { $seconds } segundos. - } -session = Sesión -shutdown = Apagar -shutdown-now = Apagar agora? -shutdown-timeout = - O sistema apagarase automaticamente - { $seconds -> - [0] agora. - [1] dentro de 1 segundo. - *[other] dentro de { $seconds } segundos. - } -suspend = Suspender -user = Usuario -auth-error-default = A autenticación fallou. Téntao de novo. -auth-error-credentials = Contrasinal incorrecto. Comproba a distribución do teclado e téntao de novo. -auth-error-denied = Acceso denegado. -auth-error-maxtries = Demasiados intentos de autenticación. -auth-error-account = A conta non estña dispoñible ou está deshabilitada. diff --git a/i18n/kab/cosmic_greeter.ftl b/i18n/kab/cosmic_greeter.ftl index b5d125e..911c8f4 100644 --- a/i18n/kab/cosmic_greeter.ftl +++ b/i18n/kab/cosmic_greeter.ftl @@ -1,4 +1,4 @@ -cancel = Semmet +cancel = Sefsex restart-timeout = Anagraw ad yales tanekra s wudem awurman { $seconds -> diff --git a/i18n/oc/cosmic_greeter.ftl b/i18n/oc/cosmic_greeter.ftl index ef74145..e69de29 100644 --- a/i18n/oc/cosmic_greeter.ftl +++ b/i18n/oc/cosmic_greeter.ftl @@ -1,17 +0,0 @@ -shutdown = Atudar -restart-timeout = - Lo sistèma reaviarà automaticament - { $seconds -> - [0] ara. - [1] d’aquí 1 segondas. - *[other] d’aquí { $seconds } segondas. - } -shutdown-timeout = - Lo sistèma s'atudarà automaticament - { $seconds -> - [0] ara. - [1] d’aquí 1 segondas. - *[other] d’aquí { $seconds } segondas. - } -cancel = Anullar -user = Utilizaire diff --git a/i18n/pt-BR/cosmic_greeter.ftl b/i18n/pt-BR/cosmic_greeter.ftl index 654fec1..7288818 100644 --- a/i18n/pt-BR/cosmic_greeter.ftl +++ b/i18n/pt-BR/cosmic_greeter.ftl @@ -29,7 +29,7 @@ shutdown-timeout = } suspend = Suspender user = Usuário -authenticating = Autenticando... +authenticating = Autenticando… auth-error-default = A autenticação falhou. Tente novamente. auth-error-credentials = Senha incorreta. Verifique o layout do seu teclado e tente novamente. auth-error-denied = Acesso negado. diff --git a/i18n/sat/cosmic_greeter.ftl b/i18n/sat/cosmic_greeter.ftl deleted file mode 100644 index 67f522a..0000000 --- a/i18n/sat/cosmic_greeter.ftl +++ /dev/null @@ -1 +0,0 @@ -cancel = ᱵᱟᱹᱛᱤᱞ diff --git a/i18n/th/cosmic_greeter.ftl b/i18n/th/cosmic_greeter.ftl index 82b47f4..7171fa5 100644 --- a/i18n/th/cosmic_greeter.ftl +++ b/i18n/th/cosmic_greeter.ftl @@ -2,10 +2,10 @@ cancel = ยกเลิก keyboard-layout = ผังคีย์บอร์ด restart = รีสตาร์ท restart-now = รีสตาร์ทตอนนี้เลยหรือไม่ -restart-timeout = ระบบจะรีสตาร์ทโดยอัตโนมัติภายใน { $seconds } วินาที +restart-timeout = ระบบจะรีสตาร์ทโดยอัตโนมัติภายใน {$seconds} วินาที session = เซสชั่น shutdown = ปิดระบบ shutdown-now = ปิดระบบตอนนี้เลยหรือไม่ -shutdown-timeout = ระบบจะปิดลงโดยอัตโนมัติภายใน { $seconds } วินาที +shutdown-timeout = ระบบจะปิดลงโดยอัตโนมัติภายใน {$seconds} วินาที suspend = ระงับ user = ผู้ใช้ diff --git a/nix/flake-parse.nix b/nix/flake-parse.nix deleted file mode 100644 index 45799f4..0000000 --- a/nix/flake-parse.nix +++ /dev/null @@ -1,12 +0,0 @@ -inputName: -let - lock = builtins.fromJSON (builtins.readFile ../flake.lock); - namedNode = lock.nodes.${lock.nodes.root.inputs.${inputName}}.locked; - githubTarball = fetchTarball { - url = - namedNode.url - or "https://github.com/${namedNode.owner}/${namedNode.repo}/archive/${namedNode.rev}.tar.gz"; - sha256 = namedNode.narHash; - }; -in -githubTarball diff --git a/nix/formatter.nix b/nix/formatter.nix deleted file mode 100644 index c5039e8..0000000 --- a/nix/formatter.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ pkgs, rustToolchain }: -pkgs.writeShellApplication { - name = "nix3-fmt-wrapper"; - runtimeInputs = builtins.attrValues { - inherit (pkgs) - nixfmt - taplo - fd - ; - inherit rustToolchain; - }; - text = '' - fd "$@" -t f -e nix -x nixfmt -q '{}' - fd "$@" -t f -e toml -x taplo format '{}' - cargo fmt - ''; -} diff --git a/nix/package.nix b/nix/package.nix deleted file mode 100644 index 5dbad01..0000000 --- a/nix/package.nix +++ /dev/null @@ -1,108 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rustPlatform, - libcosmicAppHook, - cmake, - just, - cosmic-randr, - dav1d, - libinput, - linux-pam, - udev, - coreutils, - xkeyboard_config, - nixosTests, - orca, - withLogind ? true, - withUpower ? true, - withNetworkManager ? true, -}: - -rustPlatform.buildRustPackage (finalAttrs: { - pname = "cosmic-greeter"; - version = "1.6.0"; - - src = fetchFromGitHub { - owner = "pop-os"; - repo = "cosmic-greeter"; - tag = "epoch-${finalAttrs.version}"; - hash = "sha256-hDVdl2+7NVLA+YxO2HToni57IEr0i4OGTsYDc3YGTuw="; - }; - - postPatch = '' - substituteInPlace src/greeter.rs --replace-fail '/usr/bin/env' '${lib.getExe' coreutils "env"}' - substituteInPlace src/greeter.rs --replace-fail '/usr/bin/orca' '${lib.getExe orca}' - ''; - - cargoHash = "sha256-vHR9go8/iVUT7oBV8h+mmBvhi2oSKNBKtV0uoDOr6go="; - - buildNoDefaultFeatures = true; - - buildFeatures = - lib.optionals withLogind [ "logind" ] - ++ lib.optionals withUpower [ "upower" ] - ++ lib.optionals withNetworkManager [ "networkmanager" ]; - - separateDebugInfo = true; - __structuredAttrs = true; - - env.VERGEN_GIT_SHA = finalAttrs.src.tag; - - nativeBuildInputs = [ - rustPlatform.bindgenHook - cmake - just - libcosmicAppHook - ]; - - buildInputs = [ - cosmic-randr - dav1d - libinput - linux-pam - udev - orca - ]; - - dontUseJustBuild = true; - dontUseJustCheck = true; - - justFlags = [ - "--set" - "prefix" - (placeholder "out") - "--set" - "cargo-target-dir" - "target/${stdenv.hostPlatform.rust.cargoShortTarget}" - ]; - - preFixup = '' - libcosmicAppWrapperArgs+=( - --prefix PATH : ${lib.makeBinPath [ cosmic-randr ]} - --set-default X11_BASE_RULES_XML ${xkeyboard_config}/share/X11/xkb/rules/base.xml - --set-default X11_BASE_EXTRA_RULES_XML ${xkeyboard_config}/share/X11/xkb/rules/extra.xml - ) - ''; - - passthru = { - tests = { - inherit (nixosTests) - cosmic - cosmic-autologin - cosmic-noxwayland - cosmic-autologin-noxwayland - ; - }; - }; - - meta = { - homepage = "https://github.com/pop-os/cosmic-greeter"; - description = "Greeter for the COSMIC Desktop Environment"; - mainProgram = "cosmic-greeter"; - license = lib.licenses.gpl3Only; - teams = [ lib.teams.cosmic ]; - platforms = lib.platforms.linux; - }; -}) diff --git a/nix/shell.nix b/nix/shell.nix deleted file mode 100644 index e188f12..0000000 --- a/nix/shell.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ pkgs, rustToolchain }: -pkgs.mkShell { - name = "cosmic-greeter-devshell"; - packages = builtins.attrValues { - inherit - rustToolchain - ; - inherit (pkgs) - rust-analyzer-unwrapped - nixd - libxkbcommon - dav1d - libinput - linux-pam - gcc - glibc - cmake - ; - inherit (pkgs.llvmPackages) - libclang - llvm - ; - }; - - nativeBuildInputs = [ pkgs.pkg-config ]; - - RUST_SRC_PATH = "${rustToolchain}/lib/rustlib/src/rust/library"; - LLVM_CONFIG_PATH = "${pkgs.llvmPackages.llvm}/bin/llvm-config"; - LIBCLANG_PATH = "${pkgs.llvmPackages.libclang.lib}/lib"; - BINDGEN_EXTRA_CLANG_ARGS = "-I${pkgs.linux-pam}/include -I${pkgs.glibc.dev}/include"; -} diff --git a/rustfmt.toml b/rustfmt.toml new file mode 100644 index 0000000..c1578aa --- /dev/null +++ b/rustfmt.toml @@ -0,0 +1 @@ +imports_granularity = "Module" diff --git a/src/common.rs b/src/common.rs index 442a5a1..6fdd371 100644 --- a/src/common.rs +++ b/src/common.rs @@ -3,24 +3,15 @@ use cosmic::iced::core::SmolStr; use cosmic::iced::event::wayland::{Event as WaylandEvent, OutputEvent, SessionLockEvent}; use cosmic::iced::event::{self}; use cosmic::iced::keyboard::{Event as KeyEvent, Key, Modifiers}; -use cosmic::iced::platform_specific::shell::commands::blur::blur; use cosmic::iced::runtime::core::window::Id as SurfaceId; -use cosmic::iced::runtime::platform_specific::wayland::CornerRadius; use cosmic::iced::{self, Rectangle, Size, Subscription}; -use cosmic::surface::corner_radius::rounded_rect_strips; -use cosmic::widget::rectangle_tracker::{RectangleUpdate, rectangle_tracker_subscription}; -use cosmic::widget::{self, RectangleTracker}; -use cosmic_config::CosmicConfigEntry; -use cosmic_greeter_daemon::{BgSource, UserData}; -use cosmic_protocols::keyboard_layout::v1::client::zcosmic_keyboard_layout_v1::ZcosmicKeyboardLayoutV1; -use std::collections::{HashMap, HashSet}; +use cosmic::widget; +use cosmic_config::{ConfigSet, CosmicConfigEntry}; +use cosmic_greeter_daemon::{BgSource, CosmicCompConfig, UserData}; +use std::collections::HashMap; use std::sync::Arc; use wayland_client::protocol::wl_output::WlOutput; -use wayland_client::{Connection, Proxy}; -use crate::keyboard_layout_wayland; - -pub const MAX_WIDTH: f32 = 866.; pub const DEFAULT_MENU_ITEM_HEIGHT: f32 = 36.; #[derive(Debug, Clone, Eq, PartialEq)] @@ -30,28 +21,14 @@ pub struct ActiveLayout { pub variant: String, } -impl ActiveLayout { - pub fn name(&self) -> String { - let mut name = self.layout.clone(); - if !self.variant.is_empty() { - name.push_str(" ("); - name.push_str(&self.variant); - name.push_str(")"); - } - name - } -} - pub struct Common { - pub wayland_connection: Option, - pub keyboard_layout: Option, - pub current_keyboard_layout: usize, pub active_layouts: Vec, pub active_surface_id_opt: Option, pub on_battery: bool, pub battery_percent: f64, pub charging_limit: Option, pub caps_lock: bool, + pub comp_config_handler: Option, pub core: Core, pub error_opt: Option, pub fallback_background: widget::image::Handle, @@ -62,12 +39,8 @@ pub struct Common { pub output_names: HashMap, pub power_info_opt: Option<(widget::Icon, f64)>, pub prompt_opt: Option<(String, bool, Option)>, - pub rectangle_tracker: Option>, - pub rectangles: HashMap<(SurfaceId, bool), iced::Rectangle>, - pub include_menu: bool, pub subsurface_rects: HashMap, pub surface_ids: HashMap, - pub subsurface_outputs: HashMap, pub surface_images: HashMap, pub surface_names: HashMap, pub text_input_ids: HashMap, @@ -81,16 +54,12 @@ pub enum Message { Focus(SurfaceId), Key(Modifiers, Key, Option), NetworkIcon(Option<&'static str>), - OnScreenKeyboard, - SubsurfaceOpened(SurfaceId), OutputEvent(OutputEvent, WlOutput), PowerInfo(Option<(f64, bool, bool)>), Prompt(String, bool, Option), SessionLockEvent(SessionLockEvent), Tick, Tz(jiff::tz::TimeZone), - Rectangle(RectangleUpdate<(SurfaceId, bool)>), - KeyboardLayoutWayland(keyboard_layout_wayland::Event), } impl + Send + 'static> Common { @@ -103,6 +72,17 @@ impl + Send + 'static> Common { core.window.show_minimize = false; core.window.use_template = false; + let comp_config_handler = match cosmic_config::Config::new( + "com.system76.CosmicComp", + CosmicCompConfig::VERSION, + ) { + Ok(config_handler) => Some(config_handler), + Err(err) => { + tracing::error!("failed to create cosmic-comp config handler: {}", err); + None + } + }; + let layouts_opt = match xkb_data::all_keyboard_layouts() { Ok(ok) => Some(Arc::new(ok)), Err(err) => { @@ -112,12 +92,10 @@ impl + Send + 'static> Common { }; let app = Self { - wayland_connection: None, - keyboard_layout: None, - current_keyboard_layout: 0, active_layouts: Vec::new(), active_surface_id_opt: None, caps_lock: false, + comp_config_handler, core, error_opt: None, fallback_background: widget::image::Handle::from_bytes( @@ -140,10 +118,6 @@ impl + Send + 'static> Common { battery_percent: 0.0, on_battery: false, charging_limit: None, - subsurface_outputs: HashMap::new(), - rectangle_tracker: None, - rectangles: HashMap::new(), - include_menu: false, }; ( app, @@ -154,6 +128,27 @@ impl + Send + 'static> Common { ) } + pub fn set_xkb_config(&self, user_data: &UserData) { + if let Some(mut xkb_config) = user_data.xkb_config_opt.clone() { + xkb_config.layout = String::new(); + xkb_config.variant = String::new(); + for (i, layout) in self.active_layouts.iter().enumerate() { + if i > 0 { + xkb_config.layout.push(','); + xkb_config.variant.push(','); + } + xkb_config.layout.push_str(&layout.layout); + xkb_config.variant.push_str(&layout.variant); + } + if let Some(comp_config_handler) = &self.comp_config_handler { + match comp_config_handler.set("xkb_config", xkb_config) { + Ok(()) => tracing::info!("updated cosmic-comp xkb_config"), + Err(err) => tracing::error!("failed to update cosmic-comp xkb_config: {}", err), + } + } + } + } + pub fn update_wallpapers(&mut self, user_data: &UserData) { for (_output, surface_id) in self.surface_ids.iter() { if self.surface_images.contains_key(surface_id) { @@ -291,32 +286,7 @@ impl + Send + 'static> Common { self.network_icon_opt = network_icon_opt.map(|name| widget::icon::from_name(name).into()); } - Message::OnScreenKeyboard => { - use cosmic_osk_config::Config; - match Config::handler() { - Ok(handler) => { - let mut config = match Config::get_entry(&handler) { - Ok(config) => config, - Err((errs, config)) => { - tracing::warn!("failed to parse OSK config: {:?}", errs); - config - } - }; - if let Err(err) = config.set_always_shown(&handler, !config.always_shown) { - tracing::error!("failed to set OSK always_shown config: {}", err); - } - } - Err(err) => { - tracing::error!("failed to create OSK config handler: {}", err); - } - } - } Message::OutputEvent(output_event, output) => { - if self.wayland_connection.is_none() { - if let Some(backend) = output.backend().upgrade() { - self.wayland_connection = Some(Connection::from_backend(backend)); - } - } if let Some(on_output_event) = &self.on_output_event { return Task::done(cosmic::Action::App(on_output_event(output_event, output))); } @@ -352,88 +322,13 @@ impl + Send + 'static> Common { Message::Tz(tz) => { self.time.set_tz(tz); } - Message::SubsurfaceOpened(id) => { - return self.blur_rects(id); - } - Message::Rectangle(u) => match u { - RectangleUpdate::Rectangle(r) => { - self.rectangles.insert(r.0, r.1); - - return self.blur_rects(r.0.0); - } - RectangleUpdate::Init(tracker) => { - self.rectangle_tracker.replace(tracker); - } - }, - Message::KeyboardLayoutWayland(w) => match w { - keyboard_layout_wayland::Event::KeyboardLayout(keyboard_layout) => { - self.keyboard_layout = Some(keyboard_layout); - } - keyboard_layout_wayland::Event::Group(group) => { - self.current_keyboard_layout = group; - } - }, - } - Task::none() - } - - pub(crate) fn dropdown_blur_rects(&mut self, enable: bool) -> Task { - let mut ids = HashSet::new(); - for r in self.rectangles.keys() { - ids.insert(r.0); - } - self.include_menu = enable; - Task::batch( - ids.into_iter() - .map(|i| self.blur_rects(i)) - .collect::>(), - ) - } - - pub fn blur_rects(&mut self, id: SurfaceId) -> Task { - if let Some(output) = self.subsurface_outputs.get(&id) { - if let Some(rect) = self.subsurface_rects.get(output) { - let x = rect.x; - let y = rect.y; - if let Some(rect) = self.rectangles.get(&(id, false)) { - let mut offset_rect = *rect; - offset_rect.x += x; - offset_rect.y += y; - let rad = CornerRadius { - top_left: 16, - top_right: 16, - bottom_left: 16, - bottom_right: 16, - }; - let mut rects = rounded_rect_strips(offset_rect, rad); - if let Some(other_rect) = self.rectangles.get(&(id, true)) - && self.include_menu - { - let mut other = *other_rect; - other.x += x; - other.y += y; - let rad = CornerRadius { - top_left: 8, - top_right: 8, - bottom_left: 8, - bottom_right: 8, - }; - rects.append(&mut rounded_rect_strips(other, rad)); - } - - return blur(id, Some(rects)).discard(); - } else { - tracing::error!("no rectangle for surface {id:?}"); - } - } } Task::none() } pub fn subscription(&self) -> Subscription { let mut subscriptions = Vec::with_capacity(3); - subscriptions - .push(rectangle_tracker_subscription(0).map(|update| Message::Rectangle(update.1))); + subscriptions.push(event::listen_with(|event, status, id| match event { iced::Event::Keyboard(KeyEvent::KeyPressed { key, @@ -456,21 +351,12 @@ impl + Send + 'static> Common { WaylandEvent::SessionLock(lock_event) => { Some(Message::SessionLockEvent(lock_event)) } - iced::event::wayland::Event::Subsurface( - iced::event::wayland::SubsurfaceEvent::Created, - ) => Some(Message::SubsurfaceOpened(id)), _ => None, }, iced::Event::Window(iced::window::Event::Focused) => Some(Message::Focus(id)), _ => None, })); - if let Some(conn) = self.wayland_connection.clone() { - subscriptions.push( - keyboard_layout_wayland::subscription(conn).map(Message::KeyboardLayoutWayland), - ); - } - #[cfg(feature = "networkmanager")] { subscriptions.push(crate::networkmanager::subscription().map(Message::NetworkIcon)); diff --git a/src/greeter.rs b/src/greeter.rs index 59771a2..8722d56 100644 --- a/src/greeter.rs +++ b/src/greeter.rs @@ -11,7 +11,6 @@ use cosmic::cctk::wayland_protocols::xdg::shell::client::xdg_positioner::Gravity use cosmic::cosmic_config::{self, ConfigSet}; use cosmic::cosmic_theme::{self, CosmicPalette}; use cosmic::desktop::fde::{DesktopEntry, get_languages_from_env}; -use cosmic::iced::core::text::{Ellipsize, EllipsizeHeightLimit}; use cosmic::iced::event::listen_with; use cosmic::iced::event::wayland::OutputEvent; use cosmic::iced::futures::SinkExt; @@ -19,15 +18,14 @@ use cosmic::iced::platform_specific::runtime::wayland::layer_surface::{ IcedMargin, IcedOutput, SctkLayerSurfaceSettings, }; use cosmic::iced::platform_specific::shell::wayland::commands::layer_surface::{ - Anchor, KeyboardInteractivity, Layer, destroy_layer_surface, + Anchor, KeyboardInteractivity, Layer, destroy_layer_surface, get_layer_surface, }; use cosmic::iced::platform_specific::shell::wayland::commands::subsurface::reposition_subsurface; use cosmic::iced::runtime::core::window::Id as SurfaceId; use cosmic::iced::runtime::platform_specific::wayland::subsurface::SctkSubsurfaceSettings; use cosmic::iced::{ - self, Alignment, Background, Border, Length, Point, Rectangle, Size, Subscription, window, + self, Alignment, Background, Border, Length, Point, Size, Subscription, window, }; -use cosmic::surface::action::{LiveSettings, app_layer_shell}; use cosmic::widget::{id_container, text}; use cosmic::{Element, executor, surface, theme, widget}; use cosmic_greeter_config::Config as CosmicGreeterConfig; @@ -42,7 +40,7 @@ use std::num::NonZeroU32; use std::process::Stdio; use std::sync::{Arc, LazyLock}; use std::time::{Duration, Instant}; -use std::{fs, io, process, thread}; +use std::{fs, io, process}; use tokio::process::Child; use tokio::time; use tracing::metadata::LevelFilter; @@ -53,7 +51,7 @@ use wayland_client::Proxy; use wayland_client::protocol::wl_output::WlOutput; use zbus::{Connection, proxy}; -use crate::common::{self, Common, DEFAULT_MENU_ITEM_HEIGHT, MAX_WIDTH}; +use crate::common::{self, Common, DEFAULT_MENU_ITEM_HEIGHT}; use crate::fl; static USERNAME_ID: LazyLock = LazyLock::new(|| iced::id::Id::new("username-id")); @@ -78,8 +76,8 @@ async fn user_data_dbus() -> Result, Box> { Ok(user_datas) } -async fn user_data_fallback() -> Vec { - let user_filter = UserFilter::new().await; +fn user_data_fallback() -> Vec { + let user_filter = UserFilter::new(); // The pwd::Passwd method is unsafe (but not labelled as such) due to using global state (libc pwent functions). /* unsafe */ @@ -131,7 +129,7 @@ pub fn main() -> Result<(), Box> { Ok(ok) => ok, Err(err) => { tracing::error!("failed to load user data from daemon: {}", err); - runtime.block_on(user_data_fallback()) + user_data_fallback() } }; @@ -281,22 +279,6 @@ pub fn main() -> Result<(), Box> { sessions }; - match process::Command::new("cosmic-osk") - .arg("overlay") - .env("RUST_LOG", "cosmic_osk=info") - .spawn() - { - Ok(mut child) => { - thread::spawn(move || match child.wait() { - Ok(status) => tracing::warn!("cosmic-osk exited: {}", status), - Err(err) => tracing::error!("failed to wait on cosmic-osk: {}", err), - }); - } - Err(err) => { - tracing::error!("failed to spawn cosmic-osk: {}", err); - } - } - let flags = Flags { user_icons: user_datas .iter_mut() @@ -306,10 +288,6 @@ pub fn main() -> Result<(), Box> { sessions, greeter_config, greeter_config_handler, - #[cfg(feature = "logind")] - logind_available: crate::logind::is_available(), - #[cfg(not(feature = "logind"))] - logind_available: false, }; let settings = Settings::default().no_main_window(true); @@ -326,7 +304,6 @@ pub struct Flags { sessions: HashMap, Vec)>, greeter_config: CosmicGreeterConfig, greeter_config_handler: Option, - logind_available: bool, } #[derive(Clone, Debug)] @@ -381,9 +358,6 @@ pub enum Message { Common(common::Message), OutputEvent(OutputEvent, WlOutput), Auth(Option), - /// Non-fatal error message from PAM (`PAM_ERROR_MSG`), reported by greetd as an auth - /// message of type `Error`. Unlike [`Message::Error`] the conversation stays alive. - AuthError(String), ConfigUpdateUser, DialogCancel, DialogConfirm, @@ -407,7 +381,7 @@ pub enum Message { Session(String), Shutdown, Socket(SocketState), - Surface(surface::Action), + Surface(surface::Action), Suspend, Username(String), EnterUser(bool, String), @@ -499,9 +473,9 @@ impl App { .window_size .get(&id) .map(|s| s.width) - .unwrap_or(MAX_WIDTH); - let menu_width = if window_width > MAX_WIDTH { - MAX_WIDTH + .unwrap_or(800.); + let menu_width = if window_width > 800. { + 800. } else { window_width }; @@ -563,7 +537,7 @@ impl App { let dropdown_menu = |items: Vec<_>| { let item_cnt = items.len(); - let items = widget::menu::menu_column::MenuColumn::with_children(items); + let items = widget::column::with_children(items); let items = if item_cnt > 7 { Element::from( widget::scrollable(items) @@ -573,12 +547,12 @@ impl App { Element::from(items) }; - let menu = widget::container(items) + widget::container(items) .padding(1) //TODO: move style to libcosmic .class(theme::Container::custom(|theme| { let cosmic = theme.cosmic(); - let component = &cosmic.background(theme.transparent).component; + let component = &cosmic.background(false).component; widget::container::Style { icon_color: Some(component.on.into()), text_color: Some(component.on.into()), @@ -591,29 +565,13 @@ impl App { ..Default::default() } })) - .width(Length::Fixed(240.0)); - - if let Some(t) = self.common.rectangle_tracker.as_ref() { - Element::from(t.container((id, true), menu)) - } else { - menu.into() - } + .width(Length::Fixed(240.0)) }; let mut input_button = widget::popover( - widget::container( - widget::button::custom( - widget::text( - self.common.active_layouts[self.common.current_keyboard_layout].name(), - ) - .ellipsize(Ellipsize::End(EllipsizeHeightLimit::Lines(1))) - .height(16) - .center(), - ) + widget::button::custom(widget::icon::from_name("input-keyboard-symbolic")) .padding(12.0) .on_press(Message::DropdownToggle(Dropdown::Keyboard)), - ) - .max_width(80), ) .position(widget::popover::Position::Bottom); if matches!(self.dropdown_opt, Some(Dropdown::Keyboard)) { @@ -621,7 +579,7 @@ impl App { for (i, layout) in self.common.active_layouts.iter().enumerate() { items.push(menu_checklist( &layout.description, - i == self.common.current_keyboard_layout, + i == 0, Message::KeyboardLayout(i), )); } @@ -723,19 +681,12 @@ impl App { let accessibility_button = accessibility_dropdown; - let mut button_row = iced::widget::row![ + let button_row = iced::widget::row![ widget::tooltip( accessibility_button, text(fl!("accessibility")), widget::tooltip::Position::Top ), - widget::tooltip( - widget::button::custom(widget::icon::from_name("input-keyboard-symbolic")) - .padding(12.0) - .on_press(Message::Common(common::Message::OnScreenKeyboard)), - text(fl!("on-screen-keyboard")), - widget::tooltip::Position::Top, - ), widget::tooltip( input_button, text(fl!("keyboard-layout")), @@ -751,32 +702,30 @@ impl App { text(fl!("session")), widget::tooltip::Position::Top ), - ]; - if self.flags.logind_available { - button_row = button_row - .push(widget::tooltip( - widget::button::custom(widget::icon::from_name("system-suspend-symbolic")) - .padding(12.0) - .on_press(Message::Suspend), - text(fl!("suspend")), - widget::tooltip::Position::Top, - )) - .push(widget::tooltip( - widget::button::custom(widget::icon::from_name("system-reboot-symbolic")) - .padding(12.0) - .on_press(Message::Restart), - text(fl!("restart")), - widget::tooltip::Position::Top, - )) - .push(widget::tooltip( - widget::button::custom(widget::icon::from_name("system-shutdown-symbolic")) - .padding(12.0) - .on_press(Message::Shutdown), - text(fl!("shutdown")), - widget::tooltip::Position::Top, - )); - } - let button_row = button_row.padding([16.0, 0.0, 0.0, 0.0]).spacing(8.0); + widget::tooltip( + widget::button::custom(widget::icon::from_name("system-suspend-symbolic")) + .padding(12.0) + .on_press(Message::Suspend), + text(fl!("suspend")), + widget::tooltip::Position::Top + ), + widget::tooltip( + widget::button::custom(widget::icon::from_name("system-reboot-symbolic")) + .padding(12.0) + .on_press(Message::Restart), + text(fl!("restart")), + widget::tooltip::Position::Top + ), + widget::tooltip( + widget::button::custom(widget::icon::from_name("system-shutdown-symbolic")) + .padding(12.0) + .on_press(Message::Shutdown), + text(fl!("shutdown")), + widget::tooltip::Position::Top + ) + ] + .padding([16.0, 0.0, 0.0, 0.0]) + .spacing(8.0); widget::container(iced::widget::column![ date_time_column, @@ -979,37 +928,29 @@ impl App { }, ) }; - - let menu = widget::layer_container( - iced::widget::row![left_element, right_element].align_y(Alignment::Start), - ) - .layer(cosmic::cosmic_theme::Layer::Background) - .padding(16) - .class(cosmic::theme::Container::Custom(Box::new( - |theme: &cosmic::Theme| { - // Use background appearance as the base - let mut appearance = - widget::container::Catalog::style(theme, &cosmic::theme::Container::Background); - appearance.background = Some(iced::Background::Color( - // TODO if we can use popups instead of subsurfaces for the greeter and the lockscreen - // then we can allow transparency - theme.cosmic().background(theme.transparent).base.into(), - )); - appearance.border = iced::Border::default().rounded(16); - appearance - }, - ))) - .width(Length::Fixed(MAX_WIDTH)); - let menu = if let Some(t) = self.common.rectangle_tracker.as_ref() { - Element::from(t.container((id, false), menu)) - } else { - menu.into() - }; let menu = widget::container(widget::column::with_children(vec![ widget::space::vertical() .height(Length::FillPortion(1)) .into(), - menu, + widget::layer_container( + iced::widget::row![left_element, right_element].align_y(Alignment::Start), + ) + .layer(cosmic::cosmic_theme::Layer::Background) + .padding(16) + .class(cosmic::theme::Container::Custom(Box::new( + |theme: &cosmic::Theme| { + // Use background appearance as the base + let mut appearance = widget::container::Catalog::style( + theme, + &cosmic::theme::Container::Background, + ); + appearance.border = iced::Border::default().rounded(16); + appearance + }, + ))) + .class(cosmic::theme::Container::Background) + .width(Length::Fixed(800.0)) + .into(), widget::space::vertical() .height(Length::FillPortion(4)) .into(), @@ -1018,7 +959,6 @@ impl App { .height(Length::Fill) .align_x(Alignment::Center); - // TODO make these opaque? let popover = widget::popover(menu).modal(true); match self.dialog_page_opt { Some(DialogPage::Restart(instant)) => { @@ -1073,6 +1013,19 @@ impl App { } } + fn set_xkb_config(&self) { + let user_data = match self + .selected_username + .data_idx + .and_then(|i| self.flags.user_datas.get(i)) + { + Some(some) => some, + None => return, + }; + + self.common.set_xkb_config(user_data); + } + fn update_user_data(&mut self) -> Task { let user_data = match self .selected_username @@ -1087,6 +1040,9 @@ impl App { self.common.update_user_data(user_data); + // Ensure that user's xkb config is used + self.common.set_xkb_config(user_data); + if let Some(builder) = &user_data.theme_builder_opt { self.theme_builder = builder.clone(); } @@ -1134,8 +1090,7 @@ impl cosmic::Application for App { } /// Creates the application, and optionally emits command on initialize. - fn init(mut core: Core, flags: Self::Flags) -> (Self, Task) { - core.set_app_type(cosmic::core::AppType::System); + fn init(core: Core, flags: Self::Flags) -> (Self, Task) { let mut tasks = Vec::new(); let (mut common, common_task) = Common::init(core); common.on_output_event = Some(Box::new(|output_event, output| { @@ -1216,12 +1171,6 @@ impl cosmic::Application for App { fn update(&mut self, message: Self::Message) -> Task { match message { Message::Common(common_message) => { - if matches!(&common_message, common::Message::Prompt(_, _, Some(_))) - && self.authenticating - { - self.authenticating = false; - self.common.prompt_opt = None; - } // In greetd's IPC protocol, the greeter must acknowledge auth messages by // sending PostAuthMessageResponse. For non-interactive "info" messages // (fingerprint prompts typically come through here), the correct response @@ -1287,10 +1236,10 @@ impl cosmic::Application for App { let unwrapped_size = size .map(|s| (s.0.unwrap_or(1920), s.1.unwrap_or(1080))) .unwrap_or((1920, 1080)); - let (loc, sub_size) = if unwrapped_size.0 as f32 > MAX_WIDTH { + let (loc, sub_size) = if unwrapped_size.0 > 800 { ( - Point::new((unwrapped_size.0 as f32 - MAX_WIDTH) / 2., 32.), - Size::new(MAX_WIDTH, unwrapped_size.1 as f32 - 32.), + Point::new(unwrapped_size.0 as f32 / 2. - 400., 32.), + Size::new(800., unwrapped_size.1 as f32 - 32.), ) } else { ( @@ -1302,12 +1251,7 @@ impl cosmic::Application for App { surface_id, Size::new(unwrapped_size.0 as f32, unwrapped_size.1 as f32), ); - self.common - .subsurface_rects - .insert(output.clone(), Rectangle::new(loc, sub_size)); - self.common - .subsurface_outputs - .insert(subsurface_id, output.clone()); + let msg = cosmic::surface::action::subsurface( move |_: &mut App| SctkSubsurfaceSettings { parent: surface_id, @@ -1326,41 +1270,27 @@ impl cosmic::Application for App { ); return Task::batch([ self.update_user_data(), - cosmic::surface::surface_task(app_layer_shell( - |_: &App| LiveSettings { - padding: None, - corners: None, - blur: Some(false), + get_layer_surface(SctkLayerSurfaceSettings { + id: surface_id, + layer: Layer::Overlay, + keyboard_interactivity: KeyboardInteractivity::Exclusive, + input_zone: None, + anchor: Anchor::TOP | Anchor::LEFT | Anchor::BOTTOM | Anchor::RIGHT, + output: IcedOutput::Output(output), + namespace: "cosmic-locker".into(), + size: Some((None, None)), + margin: IcedMargin { + top: 0, + bottom: 0, + left: 0, + right: 0, }, - move |_: &mut App| { - let output = output.clone(); - SctkLayerSurfaceSettings { - id: surface_id, - layer: Layer::Top, - keyboard_interactivity: KeyboardInteractivity::Exclusive, - input_zone: None, - anchor: Anchor::TOP - | Anchor::LEFT - | Anchor::BOTTOM - | Anchor::RIGHT, - output: IcedOutput::Output(output), - namespace: "cosmic-greeter".into(), - size: Some((None, None)), - margin: IcedMargin { - top: 0, - bottom: 0, - left: 0, - right: 0, - }, - exclusive_zone: -1, - size_limits: iced::Limits::NONE - .min_width(1.0) - .min_height(1.0), - } - }, - None, + exclusive_zone: -1, + size_limits: iced::Limits::NONE.min_width(1.0).min_height(1.0), + }), + cosmic::task::message(cosmic::Action::Cosmic( + cosmic::app::Action::Surface(msg), )), - cosmic::task::message(cosmic::Action::Surface(msg)), ]); } OutputEvent::Removed => { @@ -1400,7 +1330,6 @@ impl cosmic::Application for App { self.selected_session = selected_session; if self.dropdown_opt == Some(Dropdown::Session) { self.dropdown_opt = None; - return self.common.dropdown_blur_rects(false); } } Message::EnterUser(focus_input, username) => { @@ -1417,10 +1346,7 @@ impl cosmic::Application for App { username, }; if focus_input { - return Task::batch([ - self.common.dropdown_blur_rects(false), - widget::text_input::focus(USERNAME_ID.clone()), - ]); + return widget::text_input::focus(USERNAME_ID.clone()); } } Message::Username(username) => { @@ -1458,12 +1384,9 @@ impl cosmic::Application for App { self.send_request(Request::CancelSession); } if let Some(randr_list) = self.randr_list.as_ref() { - return Task::batch([ - self.common.dropdown_blur_rects(false), - self.update(Message::RandrUpdate { - randr: Arc::new(Ok(randr_list.clone())), - }), - ]); + return self.update(Message::RandrUpdate { + randr: Arc::new(Ok(randr_list.clone())), + }); } } } @@ -1544,20 +1467,10 @@ impl cosmic::Application for App { } } Message::Auth(response) => { - if response.as_deref() == Some("") { - return Task::none(); - } self.common.error_opt = None; self.authenticating = true; self.send_request(Request::PostAuthMessageResponse { response }); } - Message::AuthError(error) => { - // The conversation continues, so acknowledge like any other - // non-interactive auth message rather than cancelling the session. - self.common.error_opt = Some(error); - self.authenticating = false; - self.send_request(Request::PostAuthMessageResponse { response: None }); - } Message::Login => { self.common.prompt_opt = None; self.common.error_opt = None; @@ -1585,9 +1498,6 @@ impl cosmic::Application for App { if let Some(handle) = self.heartbeat_handle.take() { handle.abort(); } - if self.dropdown_opt.is_some() { - return self.common.dropdown_blur_rects(true); - } } Message::DialogConfirm => match self.dialog_page_opt.take() { Some(DialogPage::Restart(_)) => { @@ -1614,26 +1524,20 @@ impl cosmic::Application for App { }) .discard(); } - None => { - if self.dropdown_opt.is_some() { - return self.common.dropdown_blur_rects(true); - } - } + None => {} }, Message::DropdownToggle(dropdown) => { if self.dropdown_opt == Some(dropdown) { self.dropdown_opt = None; - return self.common.dropdown_blur_rects(false); } else { self.dropdown_opt = Some(dropdown); - return self.common.dropdown_blur_rects(true); } } Message::KeyboardLayout(layout_i) => { - if let Some(keyboard_layout) = &self.common.keyboard_layout { - keyboard_layout.set_group(layout_i as u32); + if layout_i < self.common.active_layouts.len() { + self.common.active_layouts.swap(0, layout_i); + self.set_xkb_config(); } - self.common.current_keyboard_layout = layout_i; if self.dropdown_opt == Some(Dropdown::Keyboard) { self.dropdown_opt = None } @@ -1679,8 +1583,7 @@ impl cosmic::Application for App { .abortable(); self.heartbeat_handle = Some(handle); - self.common.include_menu = false; - return Task::batch(vec![self.common.dropdown_blur_rects(false), heartbeat]); + return heartbeat; } } Message::Heartbeat => match self.dialog_page_opt { @@ -1708,7 +1611,9 @@ impl cosmic::Application for App { self.greetd_sender = Some(sender); } Message::Surface(a) => { - return cosmic::task::message(cosmic::Action::Surface(a)); + return cosmic::task::message(cosmic::Action::Cosmic( + cosmic::app::Action::Surface(a), + )); } Message::ScreenReader(enabled) => { if enabled @@ -1906,8 +1811,8 @@ impl cosmic::Application for App { tracing::error!("Failed to find subsurface menu id"); return Task::none(); }; - let loc = if size.width > MAX_WIDTH { - Point::new((size.width - MAX_WIDTH) / 2., 32.) + let loc = if size.width > 800. { + Point::new(size.width / 2. - 400., 32.) } else { Point::new(0., 32.) }; diff --git a/src/greeter/ipc.rs b/src/greeter/ipc.rs index 4e92afe..d3f1e45 100644 --- a/src/greeter/ipc.rs +++ b/src/greeter/ipc.rs @@ -115,8 +115,7 @@ pub fn subscription() -> Subscription { .await; } greetd_ipc::AuthMessageType::Error => { - // PAM_ERROR_MSG: a failed attempt, not a dead session. - _ = sender.send(Message::AuthError(auth_message)).await; + _ = sender.send(Message::Error(auth_message)).await; } }, greetd_ipc::Response::Error { diff --git a/src/keyboard_layout_wayland.rs b/src/keyboard_layout_wayland.rs deleted file mode 100644 index 93221d9..0000000 --- a/src/keyboard_layout_wayland.rs +++ /dev/null @@ -1,157 +0,0 @@ -use cctk::{ - cosmic_protocols::keyboard_layout::v1::client::zcosmic_keyboard_layout_v1::ZcosmicKeyboardLayoutV1, - keyboard_layout::{KeyboardLayoutHandler, KeyboardLayoutState}, - sctk::{ - self, - registry::{ProvidesRegistryState, RegistryState}, - seat::{Capability, SeatHandler, SeatState}, - }, - wayland_client::{ - Connection, QueueHandle, delegate_noop, - globals::registry_queue_init, - protocol::{wl_keyboard, wl_seat}, - }, -}; -use cosmic::iced; -use cosmic::iced::futures::{SinkExt, channel::mpsc, executor::block_on}; -use std::{hash::Hash, thread}; - -#[derive(Clone, Debug)] -pub enum Event { - KeyboardLayout(ZcosmicKeyboardLayoutV1), - Group(usize), -} - -pub fn subscription(connection: Connection) -> iced::Subscription { - #[derive(Clone)] - struct WaylandSubscription(Connection); - impl Hash for WaylandSubscription { - fn hash(&self, state: &mut H) { - self.0.backend().display_id().hash(state); - } - } - iced::Subscription::run_with( - WaylandSubscription(connection), - |WaylandSubscription(connection)| { - let connection = connection.clone(); - iced::stream::channel(8, move |sender| async move { - thread::spawn(move || thread(connection, sender)); - }) - }, - ) -} - -struct Keyboard { - seat: wl_seat::WlSeat, - keyboard_layout: ZcosmicKeyboardLayoutV1, -} - -impl Drop for Keyboard { - fn drop(&mut self) { - self.keyboard_layout.destroy(); - } -} - -struct AppData { - seat_state: SeatState, - registry_state: RegistryState, - keyboard_layout_state: KeyboardLayoutState, - keyboard: Option, - sender: mpsc::Sender, -} - -impl KeyboardLayoutHandler for AppData { - fn group( - &mut self, - _conn: &Connection, - _qh: &QueueHandle, - _keyboard: &wl_keyboard::WlKeyboard, - _keyboard_layout: &ZcosmicKeyboardLayoutV1, - group: u32, - ) { - let _ = block_on(self.sender.send(Event::Group(group as usize))); - } -} - -impl ProvidesRegistryState for AppData { - fn registry(&mut self) -> &mut RegistryState { - &mut self.registry_state - } - - sctk::registry_handlers![SeatState,]; -} - -impl SeatHandler for AppData { - fn seat_state(&mut self) -> &mut SeatState { - &mut self.seat_state - } - - fn new_seat(&mut self, _: &Connection, _: &QueueHandle, _: wl_seat::WlSeat) {} - - fn new_capability( - &mut self, - _conn: &Connection, - qh: &QueueHandle, - seat: wl_seat::WlSeat, - capability: Capability, - ) { - if capability == Capability::Keyboard && self.keyboard.is_none() { - let keyboard = seat.get_keyboard(qh, ()); - let keyboard_layout = self - .keyboard_layout_state - .get_keyboard_layout(&keyboard, qh); - keyboard.release(); - - if let Some(keyboard_layout) = keyboard_layout { - let _ = block_on( - self.sender - .send(Event::KeyboardLayout(keyboard_layout.clone())), - ); - self.keyboard = Some(Keyboard { - seat, - keyboard_layout, - }); - } else { - keyboard.release(); - } - } - } - - fn remove_capability( - &mut self, - _conn: &Connection, - _: &QueueHandle, - seat: wl_seat::WlSeat, - _capability: Capability, - ) { - self.keyboard.take_if(|x| x.seat == seat); - } - - fn remove_seat(&mut self, _: &Connection, _: &QueueHandle, seat: wl_seat::WlSeat) { - self.keyboard.take_if(|x| x.seat == seat); - } -} - -fn thread(conn: Connection, sender: mpsc::Sender) { - let (globals, mut event_queue) = registry_queue_init(&conn).unwrap(); - let qh = event_queue.handle(); - let registry_state = RegistryState::new(&globals); - let seat_state = SeatState::new(&globals, &qh); - let keyboard_layout_state = KeyboardLayoutState::new(®istry_state, &qh); - - let mut app_data = AppData { - seat_state, - registry_state, - keyboard_layout_state, - keyboard: None, - sender, - }; - loop { - event_queue.blocking_dispatch(&mut app_data).unwrap(); - } -} - -sctk::delegate_registry!(AppData); -sctk::delegate_seat!(AppData); -cctk::delegate_keyboard_layout!(AppData); -delegate_noop!(AppData: ignore wl_keyboard::WlKeyboard); diff --git a/src/lib.rs b/src/lib.rs index 91736b9..8535a1e 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -8,8 +8,6 @@ mod wayland; mod common; -mod keyboard_layout_wayland; - mod localize; #[cfg(feature = "logind")] diff --git a/src/locker.rs b/src/locker.rs index 6d913fd..7f489df 100644 --- a/src/locker.rs +++ b/src/locker.rs @@ -4,18 +4,16 @@ use color_eyre::eyre::WrapErr; use cosmic::app::{Core, Settings, Task}; use cosmic::cctk::wayland_protocols::xdg::shell::client::xdg_positioner::Gravity; -use cosmic::iced::core::text::{Ellipsize, EllipsizeHeightLimit}; use cosmic::iced::event::wayland::{OutputEvent, SessionLockEvent}; use cosmic::iced::futures::{self, SinkExt}; use cosmic::iced::platform_specific::shell::wayland::commands::session_lock::{ - destroy_lock_surface, lock, unlock, + destroy_lock_surface, get_lock_surface, lock, unlock, }; use cosmic::iced::runtime::core::window::Id as SurfaceId; use cosmic::iced::runtime::platform_specific::wayland::subsurface::SctkSubsurfaceSettings; use cosmic::iced::{ self, Alignment, Background, Border, Length, Point, Rectangle, Size, Subscription, }; -use cosmic::surface::action::LiveSettings; use cosmic::{Element, executor, surface, theme, widget}; use cosmic_config::CosmicConfigEntry; use cosmic_greeter_daemon::{TimeAppletConfig, UserData}; @@ -35,7 +33,7 @@ use tracing_subscriber::{EnvFilter, fmt}; use wayland_client::Proxy; use wayland_client::protocol::wl_output::WlOutput; -use crate::common::{self, Common, DEFAULT_MENU_ITEM_HEIGHT, MAX_WIDTH}; +use crate::common::{self, Common, DEFAULT_MENU_ITEM_HEIGHT}; use crate::fl; fn lockfile_opt() -> Option { @@ -88,10 +86,6 @@ pub fn main(user: pwd::Passwd) -> Result<(), Box> { .map(widget::image::Handle::from_bytes), user_data, lockfile_opt: lockfile_opt(), - #[cfg(feature = "logind")] - logind_available: crate::logind::is_available(), - #[cfg(not(feature = "logind"))] - logind_available: false, }; let settings = Settings::default().no_main_window(true); @@ -253,7 +247,6 @@ pub struct Flags { user_data: UserData, user_icon: Option, lockfile_opt: Option, - logind_available: bool, } ///TODO: this is custom code that should be better handled by libcosmic @@ -275,7 +268,7 @@ pub enum Message { KeyboardLayout(usize), Inhibit(Arc), Submit(String), - Surface(surface::Action), + Surface(surface::Action), Suspend, TimeAppletConfig(TimeAppletConfig), Error(String), @@ -327,9 +320,9 @@ impl App { .window_size .get(&surface_id) .map(|s| s.width) - .unwrap_or(MAX_WIDTH); - let menu_width = if window_width > MAX_WIDTH { - MAX_WIDTH + .unwrap_or(800.); + let menu_width = if window_width > 800. { + 800. } else { window_width }; @@ -379,7 +372,7 @@ impl App { let dropdown_menu = |items: Vec<_>| { let item_cnt = items.len(); - let items = widget::menu::menu_column::MenuColumn::with_children(items); + let items = widget::column::with_children(items); let items = if item_cnt > 7 { Element::from( widget::scrollable(items) @@ -389,48 +382,31 @@ impl App { Element::from(items) }; - let menu: widget::Container<'_, Message, cosmic::prelude::Theme> = - widget::container(items) - .padding(1) - //TODO: move style to libcosmic - .class(theme::Container::custom(|theme| { - let cosmic = theme.cosmic(); - let component = &cosmic.background(theme.transparent).component; - widget::container::Style { - icon_color: Some(component.on.into()), - text_color: Some(component.on.into()), - background: Some(Background::Color(component.base.into())), - border: Border { - radius: 8.0.into(), - width: 1.0, - color: component.divider.into(), - }, - ..Default::default() - } - })) - .width(Length::Fixed(240.0)); - - if let Some(t) = self.common.rectangle_tracker.as_ref() { - Element::from(t.container((surface_id, true), menu)) - } else { - menu.into() - } + widget::container(items) + .padding(1) + //TODO: move style to libcosmic + .class(theme::Container::custom(|theme| { + let cosmic = theme.cosmic(); + let component = &cosmic.background(false).component; + widget::container::Style { + icon_color: Some(component.on.into()), + text_color: Some(component.on.into()), + background: Some(Background::Color(component.base.into())), + border: Border { + radius: 8.0.into(), + width: 1.0, + color: component.divider.into(), + }, + ..Default::default() + } + })) + .width(Length::Fixed(240.0)) }; let mut input_button = widget::popover( - widget::container( - widget::button::custom( - widget::text( - self.common.active_layouts[self.common.current_keyboard_layout].name(), - ) - .ellipsize(Ellipsize::End(EllipsizeHeightLimit::Lines(1))) - .height(16) - .center(), - ) + widget::button::custom(widget::icon::from_name("input-keyboard-symbolic")) .padding(12.0) .on_press(Message::DropdownToggle(Dropdown::Keyboard)), - ) - .max_width(80), ) .position(widget::popover::Position::Bottom); if matches!(self.dropdown_opt, Some(Dropdown::Keyboard)) { @@ -438,7 +414,7 @@ impl App { for (i, layout) in self.common.active_layouts.iter().enumerate() { items.push(menu_checklist( &layout.description, - i == self.common.current_keyboard_layout, + i == 0, Message::KeyboardLayout(i), )); } @@ -446,7 +422,7 @@ impl App { } //TODO: implement these buttons - let mut button_row = iced::widget::row![ + let button_row = iced::widget::row![ /*TODO: greeter accessibility options widget::button::custom(widget::icon::from_name( "applications-accessibility-symbolic" @@ -454,29 +430,21 @@ impl App { .padding(12.0) .on_press(Message::None), */ - widget::tooltip( - widget::button::custom(widget::icon::from_name("input-keyboard-symbolic")) - .padding(12.0) - .on_press(Message::Common(common::Message::OnScreenKeyboard)), - widget::text(fl!("on-screen-keyboard")), - widget::tooltip::Position::Top, - ), widget::tooltip( input_button, widget::text(fl!("keyboard-layout")), widget::tooltip::Position::Top ), - ]; - if cfg!(feature = "logind") && self.flags.logind_available { - button_row = button_row.push(widget::tooltip( + widget::tooltip( widget::button::custom(widget::icon::from_name("system-suspend-symbolic")) .padding(12.0) .on_press(Message::Suspend), widget::text(fl!("suspend")), - widget::tooltip::Position::Top, - )); - } - let button_row = button_row.padding([16.0, 0.0, 0.0, 0.0]).spacing(8.0); + widget::tooltip::Position::Top + ), + ] + .padding([16.0, 0.0, 0.0, 0.0]) + .spacing(8.0); widget::container(iced::widget::column![ date_time_column, @@ -617,34 +585,30 @@ impl App { .align_x(Alignment::Center) .width(Length::Fill) }; - let menu = widget::layer_container( - iced::widget::row![left_element, right_element].align_y(Alignment::Start), - ) - .layer(cosmic::cosmic_theme::Layer::Background) - .padding(16) - .class(cosmic::theme::Container::Custom(Box::new( - |theme: &cosmic::Theme| { - // Use background appearance as the base - let mut appearance = - widget::container::Catalog::style(theme, &cosmic::theme::Container::Background); - let c: iced::Color = theme.cosmic().background(theme.transparent).base.into(); - appearance.background = Some(iced::Background::Color(c)); - appearance.border = iced::Border::default().rounded(16.0); - appearance - }, - ))) - .width(Length::Fill) - .height(Length::Shrink); - let menu = if let Some(t) = self.common.rectangle_tracker.as_ref() { - Element::from(t.container((surface_id, false), menu)) - } else { - menu.into() - }; + widget::container(widget::column::with_children(vec![ widget::space::vertical() .height(Length::FillPortion(1)) .into(), - menu, + widget::layer_container( + iced::widget::row![left_element, right_element].align_y(Alignment::Start), + ) + .layer(cosmic::cosmic_theme::Layer::Background) + .padding(16) + .class(cosmic::theme::Container::Custom(Box::new( + |theme: &cosmic::Theme| { + // Use background appearance as the base + let mut appearance = widget::container::Catalog::style( + theme, + &cosmic::theme::Container::Background, + ); + appearance.border = iced::Border::default().rounded(16.0); + appearance + }, + ))) + .width(Length::Fill) + .height(Length::Shrink) + .into(), widget::space::vertical() .height(Length::FillPortion(4)) .into(), @@ -680,9 +644,7 @@ impl cosmic::Application for App { } /// Creates the application, and optionally emits command on initialize. - fn init(mut core: Core, flags: Self::Flags) -> (Self, Task) { - core.set_app_type(cosmic::core::AppType::System); - + fn init(core: Core, flags: Self::Flags) -> (Self, Task) { let (mut common, common_task) = Common::init(core); common.on_output_event = Some(Box::new(|output_event, output| { Message::OutputEvent(output_event, output) @@ -705,18 +667,18 @@ impl cosmic::Application for App { authenticating: false, }; - let task = if cfg!(feature = "logind") && app.flags.logind_available { + let task = if cfg!(feature = "logind") { if already_locked { // Recover previously locked state tracing::info!("recovering previous locked state"); app.state = State::Locking; lock() } else { - // When logind is available, wait for lock signal + // When logind feature is used, wait for lock signal Task::none() } } else { - // When logind is not available, lock immediately + // When logind feature not used, lock immediately tracing::info!("locking immediately"); app.state = State::Locking; lock() @@ -730,12 +692,6 @@ impl cosmic::Application for App { match message { Message::None => {} Message::Common(common_message) => { - if matches!(&common_message, common::Message::Prompt(_, _, Some(_))) - && self.authenticating - { - self.authenticating = false; - self.common.prompt_opt = None; - } return self.common.update(common_message); } Message::OutputEvent(output_event, output) => { @@ -758,10 +714,6 @@ impl cosmic::Application for App { return Task::none(); } - self.common - .subsurface_outputs - .insert(subsurface_id, output.clone()); - let size = if let Some((w, h)) = output_info_opt.as_ref().and_then(|info| info.logical_size) { @@ -801,10 +753,10 @@ impl cosmic::Application for App { let unwrapped_size = size .map(|s| (s.0.unwrap_or(1920), s.1.unwrap_or(1080))) .unwrap_or((1920, 1080)); - let (loc, sub_size) = if unwrapped_size.0 as f32 > MAX_WIDTH { + let (loc, sub_size) = if unwrapped_size.0 > 800 { ( Point::new(unwrapped_size.0 as f32 / 2. - 400., 32.), - Size::new(MAX_WIDTH, unwrapped_size.1 as f32 - 32.), + Size::new(800., unwrapped_size.1 as f32 - 32.), ) } else { ( @@ -839,19 +791,11 @@ impl cosmic::Application for App { ); if matches!(self.state, State::Locked { .. }) { - return cosmic::task::message(cosmic::Action::Surface( - cosmic::surface::action::lock( - || LiveSettings { - padding: None, - corners: None, - blur: Some(false), - }, - surface_id, - output, - None:: cosmic::Element<'static, cosmic::Action>>, - ), - )) - .chain(cosmic::task::message(cosmic::Action::Surface(msg))); + return Task::batch([get_lock_surface(surface_id, output).chain({ + cosmic::task::message(cosmic::Action::Cosmic( + cosmic::app::Action::Surface(msg), + )) + })]); } } OutputEvent::Removed => { @@ -882,10 +826,10 @@ impl cosmic::Application for App { let unwrapped_size = size .map(|s| (s.0.unwrap_or(1920), s.1.unwrap_or(1080))) .unwrap_or((1920, 1080)); - let (loc, sub_size) = if unwrapped_size.0 as f32 > MAX_WIDTH { + let (loc, sub_size) = if unwrapped_size.0 > 800 { ( Point::new(unwrapped_size.0 as f32 / 2. - 400., 32.), - Size::new(MAX_WIDTH, unwrapped_size.1 as f32 - 32.), + Size::new(800., unwrapped_size.1 as f32 - 32.), ) } else { (Point::ORIGIN, Size::new(1920., 1080.)) @@ -991,18 +935,7 @@ impl cosmic::Application for App { // Create lock surfaces for (output, surface_id) in self.common.surface_ids.iter() { - commands.push(cosmic::task::message(cosmic::Action::Surface( - cosmic::surface::action::lock( - || LiveSettings { - padding: None, - corners: None, - blur: Some(false), - }, - *surface_id, - output.clone(), - None:: cosmic::Element<'static, cosmic::Action>>, - ), - ))); + commands.push(get_lock_surface(*surface_id, output.clone())); if let Some((rect, name)) = self .common @@ -1012,15 +945,11 @@ impl cosmic::Application for App { .zip(self.common.output_names.get(output)) { let subsurface_id = SurfaceId::unique(); - self.common - .subsurface_outputs - .insert(subsurface_id, output.clone()); let surface_id = *surface_id; self.common.surface_names.insert(surface_id, name.clone()); self.common .surface_names .insert(subsurface_id, name.clone()); - let msg = cosmic::surface::action::subsurface( move |_: &mut App| SctkSubsurfaceSettings { parent: surface_id, @@ -1037,9 +966,11 @@ impl cosmic::Application for App { app.menu(subsurface_id).map(cosmic::Action::App) })), ); - commands.push(cosmic::task::message(cosmic::Action::Surface(msg))); + commands.push(cosmic::task::message(cosmic::Action::Cosmic( + cosmic::app::Action::Surface(msg), + ))); } else { - tracing::error!("no rectangle for subsurface creation..."); + tracing::error!("no rectangle for subsurface..."); } } return Task::batch(commands); @@ -1054,11 +985,11 @@ impl cosmic::Application for App { self.common.window_size.remove(surface_id); commands.push(destroy_lock_surface(*surface_id)); } - if cfg!(feature = "logind") && self.flags.logind_available { + if cfg!(feature = "logind") { return Task::batch(commands); - // When logind is available, stick around for more lock signals + // When using logind feature, stick around for more lock signals } else { - // When logind is not available, exit immediately after unlocking + // When not using logind feature, exit immediately after unlocking //TODO: cleaner method to exit? process::exit(0); } @@ -1078,10 +1009,8 @@ impl cosmic::Application for App { Message::DropdownToggle(dropdown) => { if self.dropdown_opt == Some(dropdown) { self.dropdown_opt = None; - return self.common.dropdown_blur_rects(false); } else { self.dropdown_opt = Some(dropdown); - return self.common.dropdown_blur_rects(true); } } Message::Inhibit(inhibit) => match self.state { @@ -1093,19 +1022,15 @@ impl cosmic::Application for App { } }, Message::KeyboardLayout(layout_i) => { - if let Some(keyboard_layout) = &self.common.keyboard_layout { - keyboard_layout.set_group(layout_i as u32); + if layout_i < self.common.active_layouts.len() { + self.common.active_layouts.swap(0, layout_i); + self.common.set_xkb_config(&self.flags.user_data); } - self.common.current_keyboard_layout = layout_i; if self.dropdown_opt == Some(Dropdown::Keyboard) { - self.dropdown_opt = None; - return self.common.dropdown_blur_rects(false); + self.dropdown_opt = None } } Message::Submit(value) => { - if value.is_empty() { - return Task::none(); - } self.common.error_opt = None; self.authenticating = true; match self.value_tx_opt.take() { @@ -1202,7 +1127,9 @@ impl cosmic::Application for App { } } Message::Surface(a) => { - return cosmic::task::message(cosmic::Action::Surface(a)); + return cosmic::task::message(cosmic::Action::Cosmic( + cosmic::app::Action::Surface(a), + )); } } Task::none() @@ -1214,8 +1141,17 @@ impl cosmic::Application for App { } /// Creates a view after each update. - fn view_window(&self, _surface_id: SurfaceId) -> Element<'_, Self::Message> { - widget::space::horizontal().into() + fn view_window(&self, surface_id: SurfaceId) -> Element<'_, Self::Message> { + let img = self + .common + .surface_images + .get(&surface_id) + .unwrap_or(&self.common.fallback_background); + widget::image(img) + .content_fit(iced::ContentFit::Cover) + .width(Length::Fill) + .height(Length::Fill) + .into() } fn subscription(&self) -> Subscription { @@ -1254,7 +1190,7 @@ impl cosmic::Application for App { ); #[cfg(feature = "logind")] - if self.flags.logind_available { + { subscriptions.push(crate::logind::subscription()); } diff --git a/src/logind.rs b/src/logind.rs index 74da8e4..c5561f3 100644 --- a/src/logind.rs +++ b/src/logind.rs @@ -13,27 +13,6 @@ use zbus::Connection; use crate::common; use crate::locker::Message; -/// Checks whether logind (either elogind or systemd-logind) is reachable on the system bus. -pub fn is_available() -> bool { - fn ping() -> zbus::Result<()> { - let connection = zbus::blocking::Connection::system()?; - connection.call_method( - Some("org.freedesktop.login1"), - "/org/freedesktop/login1", - Some("org.freedesktop.DBus.Peer"), - "Ping", - &(), - )?; - Ok(()) - } - if let Err(err) = ping() { - tracing::info!("logind not available: {}", err); - false - } else { - true - } -} - pub async fn power_off() -> zbus::Result<()> { let connection = Connection::system().await?; let manager = ManagerProxy::new(&connection).await?; diff --git a/src/main.rs b/src/main.rs index 7aa05a7..7a2b73e 100644 --- a/src/main.rs +++ b/src/main.rs @@ -28,9 +28,6 @@ fn main() -> Result<(), Box> { } } - // Enable jpeg-xl support for image-rs. - let _ = jxl_oxide::integration::register_image_decoding_hook(); - match pwd::Passwd::current_user() { Some(current_user) => match current_user.name.as_str() { "cosmic-greeter" => greeter::main(),