diff --git a/Cargo.lock b/Cargo.lock index a855a97..d7b2492 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -372,23 +372,6 @@ dependencies = [ "libloading", ] -[[package]] -name = "ashpd" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d43c03d9e36dd40cab48435be0b09646da362c278223ca535493877b2c1dee9" -dependencies = [ - "enumflags2", - "futures-channel", - "futures-util", - "rand 0.8.5", - "serde", - "serde_repr", - "tokio", - "url", - "zbus 4.4.0", -] - [[package]] name = "ashpd" version = "0.11.0" @@ -935,9 +918,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "4.0.3" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a334ef7c9e23abf0ce748e8cd309037da93e606ad52eb372e4ce327a0dcfbdfd" +checksum = "874bb8112abecc98cbd6d81ea4fa7e94fb9449648c93cc89aa40c81c24d7de03" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -1170,9 +1153,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.41" +version = "4.5.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be92d32e80243a54711e5d7ce823c35c41c9d929dc4ab58e1276f625841aadf9" +checksum = "ed87a9d530bb41a67537289bafcac159cb3ee28460e0a4571123d2a778a6a882" dependencies = [ "clap_builder", "clap_derive", @@ -1180,9 +1163,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.41" +version = "4.5.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707eab41e9622f9139419d573eca0900137718000c517d47da73045f54331c3d" +checksum = "64f4f3f3c77c94aff3c7e9aac9a2ca1974a5adf392a8bb751e827d6d127ab966" dependencies = [ "anstream", "anstyle", @@ -1507,7 +1490,7 @@ dependencies = [ [[package]] name = "cosmic-comp-config" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-comp#f2d6f70e13f6e7510326ced59ae5db6df705d955" +source = "git+https://github.com/pop-os/cosmic-comp#7ccfd7381e54f07950024648786c64200c6ca925" dependencies = [ "cosmic-config", "input", @@ -1603,7 +1586,7 @@ dependencies = [ [[package]] name = "cosmic-panel-config" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-panel#1985e806e082af798e3b542cdd8bc5b32457fe72" +source = "git+https://github.com/pop-os/cosmic-panel#da27f533d9fad2f1b5e85c523217466c952709ce" dependencies = [ "anyhow", "cosmic-config", @@ -1663,7 +1646,7 @@ dependencies = [ "accounts-zbus", "anyhow", "as-result", - "ashpd 0.9.2", + "ashpd", "async-channel", "async-fn-stream", "bluez-zbus", @@ -1688,8 +1671,8 @@ dependencies = [ "cosmic-settings-wallpaper", "derivative", "derive_setters", - "dirs 5.0.1", - "downcast-rs", + "dirs 6.0.0", + "downcast-rs 2.0.1", "eyre", "fixed_decimal", "fontdb 0.23.0", @@ -1703,7 +1686,7 @@ dependencies = [ "icu", "image", "indexmap 2.10.0", - "itertools 0.13.0", + "itertools 0.14.0", "itoa", "libcosmic", "locale1", @@ -1712,10 +1695,9 @@ dependencies = [ "notify 6.1.1", "num-derive", "num-traits", - "once_cell", "pwhash", "regex", - "ron 0.9.0", + "ron 0.10.1", "rust-embed", "rustix 1.0.8", "secure-string", @@ -1775,7 +1757,7 @@ name = "cosmic-settings-page" version = "0.1.0" dependencies = [ "derive_setters", - "downcast-rs", + "downcast-rs 2.0.1", "libcosmic", "regex", "slab", @@ -1831,7 +1813,7 @@ dependencies = [ "cosmic-config", "cosmic-freedesktop-icons", "cosmic-randr-shell", - "dirs 5.0.1", + "dirs 6.0.0", "eyre", "fast_image_resize", "futures-lite 2.6.0", @@ -1855,7 +1837,7 @@ dependencies = [ "rangemap", "rustc-hash 1.1.0", "rustybuzz", - "self_cell 1.2.0", + "self_cell", "smol_str", "swash", "sys-locale", @@ -2192,7 +2174,7 @@ checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab" dependencies = [ "libc", "option-ext", - "redox_users 0.5.0", + "redox_users 0.5.1", "windows-sys 0.60.2", ] @@ -2261,6 +2243,12 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" +[[package]] +name = "downcast-rs" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea8a8b81cacc08888170eef4d13b775126db426d0b348bee9d18c2c1eaf123cf" + [[package]] name = "dpi" version = "0.1.1" @@ -2307,9 +2295,9 @@ dependencies = [ [[package]] name = "dyn-clone" -version = "1.0.19" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c7a8fb8a9fbf66c1f703fe16184d10ca0ee9d23be5b4436400408ba54a95005" +checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" [[package]] name = "either" @@ -2567,9 +2555,9 @@ checksum = "8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8" [[package]] name = "fluent" -version = "0.16.1" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb74634707bebd0ce645a981148e8fb8c7bccd4c33c652aeffd28bf2f96d555a" +checksum = "8137a6d5a2c50d6b0ebfcb9aaa91a28154e0a70605f112d30cb0cd4a78670477" dependencies = [ "fluent-bundle", "unic-langid", @@ -2577,16 +2565,16 @@ dependencies = [ [[package]] name = "fluent-bundle" -version = "0.15.3" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fe0a21ee80050c678013f82edf4b705fe2f26f1f9877593d13198612503f493" +checksum = "01203cb8918f5711e73891b347816d932046f95f54207710bda99beaeb423bf4" dependencies = [ "fluent-langneg", "fluent-syntax", "intl-memoizer", "intl_pluralrules", - "rustc-hash 1.1.0", - "self_cell 0.10.3", + "rustc-hash 2.1.1", + "self_cell", "smallvec", "unic-langid", ] @@ -2602,11 +2590,12 @@ dependencies = [ [[package]] name = "fluent-syntax" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a530c4694a6a8d528794ee9bbd8ba0122e779629ac908d15ad5a7ae7763a33d" +checksum = "54f0d287c53ffd184d04d8677f590f4ac5379785529e5e08b1c8083acdd5c198" dependencies = [ - "thiserror 1.0.69", + "memchr", + "thiserror 2.0.12", ] [[package]] @@ -3183,9 +3172,9 @@ dependencies = [ [[package]] name = "i18n-embed" -version = "0.15.4" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "669ffc2c93f97e6ddf06ddbe999fcd6782e3342978bb85f7d3c087c7978404c4" +checksum = "a217bbb075dcaefb292efa78897fc0678245ca67f265d12c351e42268fcb0305" dependencies = [ "arc-swap", "fluent", @@ -3193,10 +3182,10 @@ dependencies = [ "fluent-syntax", "i18n-embed-impl", "intl-memoizer", - "locale_config", "log", "parking_lot 0.12.4", "rust-embed", + "sys-locale", "thiserror 1.0.69", "unic-langid", "walkdir", @@ -3204,9 +3193,9 @@ dependencies = [ [[package]] name = "i18n-embed-fl" -version = "0.9.4" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04b2969d0b3fc6143776c535184c19722032b43e6a642d710fa3f88faec53c2d" +checksum = "e598ed73b67db92f61e04672e599eef2991a262a40e1666735b8a86d2e7e9f30" dependencies = [ "find-crate", "fluent", @@ -3246,7 +3235,7 @@ dependencies = [ "js-sys", "log", "wasm-bindgen", - "windows-core 0.57.0", + "windows-core 0.61.2", ] [[package]] @@ -4074,9 +4063,9 @@ dependencies = [ [[package]] name = "infer" -version = "0.16.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc150e5ce2330295b8616ce0e3f53250e53af31759a9dbedad1621ba29151847" +checksum = "a588916bfdfd92e71cacef98a63d9b1f0d74d6599980d11894290e7ddefffcf7" dependencies = [ "cfb", ] @@ -4216,15 +4205,6 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.14.0" @@ -4290,18 +4270,18 @@ dependencies = [ [[package]] name = "jxl-bitstream" -version = "0.6.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4587c2166a289ef21075fbf58e19d898f23833bd4d78691db36cdf0eee7f6cf" +checksum = "eda699770a7f4ea38f8eb21d91b545eb6448be28e540acc7ce84498bcead4903" dependencies = [ "tracing", ] [[package]] name = "jxl-coding" -version = "0.6.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e8cf24db1cec3d7e703df9f5ef3f3b49650607432792ca988b66dd17bb640b2" +checksum = "6748ba8af69b87c68f8dcdf992de959c207962689bc28ddb7906abf4a0b786c9" dependencies = [ "jxl-bitstream", "tracing", @@ -4309,13 +4289,14 @@ dependencies = [ [[package]] name = "jxl-color" -version = "0.10.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d93855433a33d6d06ba412e09438631d2fe4828c119dd1f4c6ba9e0c3d5988c" +checksum = "f316b1358c1711755b3ee8e8cb5c4a1dad12e796233088a7a513440782de80b2" dependencies = [ "jxl-bitstream", "jxl-coding", "jxl-grid", + "jxl-image", "jxl-oxide-common", "jxl-threadpool", "tracing", @@ -4323,9 +4304,9 @@ dependencies = [ [[package]] name = "jxl-frame" -version = "0.12.1" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e53d24902e27ca7af5424a80955f88d82b9d7dae88f12169a2584470bbbfe75c" +checksum = "f30587a9687223a602a408555db47803c907ea47700e1f28eb14cdb3bf1527a9" dependencies = [ "jxl-bitstream", "jxl-coding", @@ -4340,21 +4321,20 @@ dependencies = [ [[package]] name = "jxl-grid" -version = "0.5.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5739f02add3d5c00320140bec6f5a80fac4baa630f88fe4c6a55a0d719718ce3" +checksum = "335e4371396c5729ba80a42798746d198897d3b854ba4f3684efac5f4025d84f" dependencies = [ "tracing", ] [[package]] name = "jxl-image" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5199f6bce2f64494b91c510dfdeb8035bb405f6347837b6293e9eeb9d93f246b" +checksum = "c5f752d62577c702a94dbbce4045caf08cb58639e8a4d56464b40ecf33ffe565" dependencies = [ "jxl-bitstream", - "jxl-color", "jxl-grid", "jxl-oxide-common", "tracing", @@ -4362,9 +4342,9 @@ dependencies = [ [[package]] name = "jxl-jbr" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56cbdbec115aa2f0b22ca3719dec2902b4c75da904cda7a2cdfc21df21b44f24" +checksum = "d91ba39b083a82788a17717edbcc4b08160b51fdffc9fec640deba9e8268da1a" dependencies = [ "brotli-decompressor", "jxl-bitstream", @@ -4380,9 +4360,9 @@ dependencies = [ [[package]] name = "jxl-modular" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d4852fe37dee35f67b2e3912c3eecb7d053379aac0801b5cc489d58ea253af1" +checksum = "3f526ad8af8daea0d1cccce945f18c241f95b391d34443be018de2efbf28b44e" dependencies = [ "jxl-bitstream", "jxl-coding", @@ -4394,9 +4374,9 @@ dependencies = [ [[package]] name = "jxl-oxide" -version = "0.11.4" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91c7a16be632403a5653bae89734e119cc2098ba16b269917cbf9481e05e3166" +checksum = "6e45ccb25d698cdcad3a5573a7181835842711fd951c98fe38986e3cb721e775" dependencies = [ "brotli-decompressor", "jxl-bitstream", @@ -4413,18 +4393,18 @@ dependencies = [ [[package]] name = "jxl-oxide-common" -version = "0.2.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccfd9c5f3807b9dbd0797788a577171bd78f5169a36f4bc3c7bbceaf3991507" +checksum = "b62394c5021b3a9e7e0dbb2d639d555d019090c9946c39f6d3b09d390db4157b" dependencies = [ "jxl-bitstream", ] [[package]] name = "jxl-render" -version = "0.11.3" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9009fe6db8604352b60dc53f5cb37f765196e498238b040d42b16288417328fa" +checksum = "b3f3fece78b2104450bd6d1bdbc48e3b6ef7442ef276be2a08e35b229eeff1a4" dependencies = [ "bytemuck", "jxl-bitstream", @@ -4442,9 +4422,9 @@ dependencies = [ [[package]] name = "jxl-threadpool" -version = "0.1.2" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad9c78eaf899cce165e266300f9963d8d376d4ed95cf4d12dd7066f05542cd88" +checksum = "25f15eb830aa77a7f21148d72e153562a26bfe570139bd4922eab1908dd499d3" dependencies = [ "rayon", "rayon-core", @@ -4453,9 +4433,9 @@ dependencies = [ [[package]] name = "jxl-vardct" -version = "0.10.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c98211ffd56bbcbbdd501f396855123d21008304786b8b11d959a5620e86eb1" +checksum = "3d48ad406543de5d6cd50aaaa8b87534f82991d684d848b3190228e8fa690fff" dependencies = [ "jxl-bitstream", "jxl-coding", @@ -4506,11 +4486,11 @@ checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" [[package]] name = "known-folders" -version = "1.2.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7d9a1740cc8b46e259a0eb787d79d855e79ff10b9855a5eba58868d5da7927c" +checksum = "c644f4623d1c55eb60a9dac35e0858a59f982fb87db6ce34c872372b0a5b728f" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.60.2", ] [[package]] @@ -4584,7 +4564,7 @@ version = "0.1.0" source = "git+https://github.com/pop-os/libcosmic#05874e8ea252be0e6115c268aef18a19019842f4" dependencies = [ "apply", - "ashpd 0.11.0", + "ashpd", "auto_enums", "chrono", "cosmic-client-toolkit", @@ -4639,7 +4619,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667" dependencies = [ "cfg-if", - "windows-targets 0.53.2", + "windows-targets 0.53.3", ] [[package]] @@ -4677,13 +4657,13 @@ dependencies = [ [[package]] name = "libredox" -version = "0.1.6" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4488594b9328dee448adb906d8b126d9b7deb7cf5c22161ee591610bb1be83c0" +checksum = "391290121bad3d37fbddad76d8f5d1c1c314cfc646d143d7e07a3086ddff0ce3" dependencies = [ "bitflags 2.9.1", "libc", - "redox_syscall 0.5.15", + "redox_syscall 0.5.17", ] [[package]] @@ -4762,9 +4742,9 @@ checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956" [[package]] name = "litrs" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" +checksum = "f5e54036fe321fd421e10d732f155734c4e4afd610dd556d9a82833ab3ee0bed" [[package]] name = "locale1" @@ -5161,19 +5141,6 @@ dependencies = [ "libc", ] -[[package]] -name = "nix" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" -dependencies = [ - "bitflags 2.9.1", - "cfg-if", - "cfg_aliases 0.2.1", - "libc", - "memoffset 0.9.1", -] - [[package]] name = "nix" version = "0.30.1" @@ -5562,6 +5529,16 @@ dependencies = [ "objc2-core-foundation", ] +[[package]] +name = "objc2-io-kit" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71c1c64d6120e51cd86033f67176b1cb66780c2efe34dec55176f77befd93c0a" +dependencies = [ + "libc", + "objc2-core-foundation", +] + [[package]] name = "objc2-link-presentation" version = "0.2.2" @@ -5747,9 +5724,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "owned_ttf_parser" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec719bbf3b2a81c109a4e20b1f129b5566b7dce654bc3872f6a05abf82b2c4" +checksum = "36820e9051aca1014ddc75770aab4d68bc1e9e632f0f5627c4086bc216fb583b" dependencies = [ "ttf-parser 0.25.1", ] @@ -5834,7 +5811,7 @@ checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.15", + "redox_syscall 0.5.17", "smallvec", "windows-targets 0.52.6", ] @@ -6306,9 +6283,9 @@ checksum = "c3d6831663a5098ea164f89cff59c6284e95f4e3c76ce9848d4529f5ccca9bde" [[package]] name = "rangemap" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f60fcc7d6849342eff22c4350c8b9a989ee8ceabc4b481253e8946b9fe83d684" +checksum = "f93e7e49bb0bf967717f7bd674458b3d6b0c5f48ec7e3038166026a69fc22223" [[package]] name = "rav1e" @@ -6416,9 +6393,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.15" +version = "0.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8af0dde094006011e6a740d4879319439489813bd0bcdc7d821beaeeff48ec" +checksum = "5407465600fb0548f1442edf71dd20683c6ed326200ace4b1ef0763521bb3b77" dependencies = [ "bitflags 2.9.1", ] @@ -6436,9 +6413,9 @@ dependencies = [ [[package]] name = "redox_users" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd6f9d3d47bdd2ad6945c5015a226ec6155d0bcdfd8f7cd29f86b71f8de99d2b" +checksum = "78eaea1f52c56d57821be178b2d47e09ff26481a6042e8e042fcb0ced068b470" dependencies = [ "getrandom 0.2.16", "libredox", @@ -6555,7 +6532,7 @@ version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef2bee61e6cffa4635c72d7d81a84294e28f0930db0ddcb0f66d10244674ebed" dependencies = [ - "ashpd 0.11.0", + "ashpd", "block2 0.6.1", "dispatch2", "js-sys", @@ -6636,6 +6613,19 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "ron" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "beceb6f7bf81c73e73aeef6dd1356d9a1b2b4909e1f0fc3e59b034f9572d7b7f" +dependencies = [ + "base64 0.22.1", + "bitflags 2.9.1", + "serde", + "serde_derive", + "unicode-ident", +] + [[package]] name = "roxmltree" version = "0.20.0" @@ -6694,9 +6684,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.25" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "989e6739f80c4ad5b13e0fd7fe89531180375b18520cc8c82080e4dc4035b84f" +checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace" [[package]] name = "rustc-hash" @@ -6853,15 +6843,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "self_cell" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14e4d63b804dc0c7ec4a1e52bcb63f02c7ac94476755aa579edac21e01f915d" -dependencies = [ - "self_cell 1.2.0", -] - [[package]] name = "self_cell" version = "1.2.0" @@ -7164,12 +7145,12 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.10" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678" +checksum = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -7352,16 +7333,16 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.31.4" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "355dbe4f8799b304b05e1b0f05fc59b2a18d36645cf169607da45bde2f69a1be" +checksum = "252800745060e7b9ffb7b2badbd8b31cfa4aa2e61af879d0a3bf2a317c20217d" dependencies = [ - "core-foundation-sys", "libc", "memchr", "ntapi", - "rayon", - "windows 0.57.0", + "objc2-core-foundation", + "objc2-io-kit", + "windows 0.61.3", ] [[package]] @@ -7616,9 +7597,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.46.1" +version = "1.47.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cc3a2344dafbe23a245241fe8b09735b521110d30fcefbbd5feb1797ca35d17" +checksum = "43864ed400b6043a4757a25c7a64a8efde741aed79a056a2fb348a406701bb35" dependencies = [ "backtrace", "bytes", @@ -7628,10 +7609,10 @@ dependencies = [ "pin-project-lite", "signal-hook-registry", "slab", - "socket2 0.5.10", + "socket2 0.6.0", "tokio-macros", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -8162,13 +8143,13 @@ dependencies = [ [[package]] name = "wayland-backend" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe770181423e5fc79d3e2a7f4410b7799d5aab1de4372853de3c6aa13ca24121" +checksum = "673a33c33048a5ade91a6b139580fa174e19fb0d23f396dca9fa15f2e1e49b35" dependencies = [ "cc", - "downcast-rs", - "rustix 0.38.44", + "downcast-rs 1.2.1", + "rustix 1.0.8", "scoped-tls", "smallvec", "wayland-sys", @@ -8176,12 +8157,12 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.31.10" +version = "0.31.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978fa7c67b0847dbd6a9f350ca2569174974cd4082737054dbb7fbb79d7d9a61" +checksum = "c66a47e840dc20793f2264eb4b3e4ecb4b75d91c0dd4af04b456128e0bdd449d" dependencies = [ "bitflags 2.9.1", - "rustix 0.38.44", + "rustix 1.0.8", "wayland-backend", "wayland-scanner", ] @@ -8199,20 +8180,20 @@ dependencies = [ [[package]] name = "wayland-cursor" -version = "0.31.10" +version = "0.31.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a65317158dec28d00416cb16705934070aef4f8393353d41126c54264ae0f182" +checksum = "447ccc440a881271b19e9989f75726d60faa09b95b0200a9b7eb5cc47c3eeb29" dependencies = [ - "rustix 0.38.44", + "rustix 1.0.8", "wayland-client", "xcursor", ] [[package]] name = "wayland-protocols" -version = "0.32.8" +version = "0.32.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "779075454e1e9a521794fed15886323ea0feda3f8b0fc1390f5398141310422a" +checksum = "efa790ed75fbfd71283bd2521a1cfdc022aabcc28bdcff00851f9e4ae88d9901" dependencies = [ "bitflags 2.9.1", "wayland-backend", @@ -8223,9 +8204,9 @@ dependencies = [ [[package]] name = "wayland-protocols-plasma" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fd38cdad69b56ace413c6bcc1fbf5acc5e2ef4af9d5f8f1f9570c0c83eae175" +checksum = "a07a14257c077ab3279987c4f8bb987851bf57081b93710381daea94f2c2c032" dependencies = [ "bitflags 2.9.1", "wayland-backend", @@ -8236,9 +8217,9 @@ dependencies = [ [[package]] name = "wayland-protocols-wlr" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cb6cdc73399c0e06504c437fe3cf886f25568dd5454473d565085b36d6a8bbf" +checksum = "efd94963ed43cf9938a090ca4f7da58eb55325ec8200c3848963e98dc25b78ec" dependencies = [ "bitflags 2.9.1", "wayland-backend", @@ -8250,9 +8231,9 @@ dependencies = [ [[package]] name = "wayland-scanner" -version = "0.31.6" +version = "0.31.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "896fdafd5d28145fce7958917d69f2fd44469b1d4e861cb5961bcbeebc6d1484" +checksum = "54cb1e9dc49da91950bdfd8b848c49330536d9d1fb03d4bfec8cae50caa50ae3" dependencies = [ "proc-macro2", "quick-xml", @@ -8261,22 +8242,22 @@ dependencies = [ [[package]] name = "wayland-server" -version = "0.31.9" +version = "0.31.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "485dfb8ccf0daa0d34625d34e6ac15f99e550a7999b6fd88a0835ccd37655785" +checksum = "fcbd4f3aba6c9fba70445ad2a484c0ef0356c1a9459b1e8e435bedc1971a6222" dependencies = [ "bitflags 2.9.1", - "downcast-rs", - "rustix 0.38.44", + "downcast-rs 1.2.1", + "rustix 1.0.8", "wayland-backend", "wayland-scanner", ] [[package]] name = "wayland-sys" -version = "0.31.6" +version = "0.31.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbcebb399c77d5aa9fa5db874806ee7b4eba4e73650948e8f93963f128896615" +checksum = "34949b42822155826b41db8e5d0c1be3a2bd296c747577a43a3e6daefc296142" dependencies = [ "dlib", "log", @@ -8501,12 +8482,24 @@ dependencies = [ [[package]] name = "windows" -version = "0.57.0" +version = "0.61.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143" +checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893" dependencies = [ - "windows-core 0.57.0", - "windows-targets 0.52.6", + "windows-collections", + "windows-core 0.61.2", + "windows-future", + "windows-link", + "windows-numerics", +] + +[[package]] +name = "windows-collections" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8" +dependencies = [ + "windows-core 0.61.2", ] [[package]] @@ -8524,20 +8517,32 @@ version = "0.54.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" dependencies = [ - "windows-result", + "windows-result 0.1.2", "windows-targets 0.52.6", ] [[package]] name = "windows-core" -version = "0.57.0" +version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d" +checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" dependencies = [ - "windows-implement 0.57.0", - "windows-interface 0.57.0", - "windows-result", - "windows-targets 0.52.6", + "windows-implement 0.60.0", + "windows-interface 0.59.1", + "windows-link", + "windows-result 0.3.4", + "windows-strings", +] + +[[package]] +name = "windows-future" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e" +dependencies = [ + "windows-core 0.61.2", + "windows-link", + "windows-threading", ] [[package]] @@ -8553,9 +8558,9 @@ dependencies = [ [[package]] name = "windows-implement" -version = "0.57.0" +version = "0.60.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" +checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" dependencies = [ "proc-macro2", "quote", @@ -8575,9 +8580,9 @@ dependencies = [ [[package]] name = "windows-interface" -version = "0.57.0" +version = "0.59.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" +checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" dependencies = [ "proc-macro2", "quote", @@ -8590,6 +8595,16 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" +[[package]] +name = "windows-numerics" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1" +dependencies = [ + "windows-core 0.61.2", + "windows-link", +] + [[package]] name = "windows-result" version = "0.1.2" @@ -8599,6 +8614,24 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-result" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" +dependencies = [ + "windows-link", +] + +[[package]] +name = "windows-strings" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" +dependencies = [ + "windows-link", +] + [[package]] name = "windows-sys" version = "0.45.0" @@ -8641,7 +8674,7 @@ version = "0.60.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" dependencies = [ - "windows-targets 0.53.2", + "windows-targets 0.53.3", ] [[package]] @@ -8692,10 +8725,11 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.53.2" +version = "0.53.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef" +checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91" dependencies = [ + "windows-link", "windows_aarch64_gnullvm 0.53.0", "windows_aarch64_msvc 0.53.0", "windows_i686_gnu 0.53.0", @@ -8706,6 +8740,15 @@ dependencies = [ "windows_x86_64_msvc 0.53.0", ] +[[package]] +name = "windows-threading" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b66463ad2e0ea3bbf808b7f1d371311c80e115c0b71d60efc142cafbcfb057a6" +dependencies = [ + "windows-link", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" @@ -9060,7 +9103,7 @@ dependencies = [ [[package]] name = "xdg-shell-wrapper-config" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-panel#1985e806e082af798e3b542cdd8bc5b32457fe72" +source = "git+https://github.com/pop-os/cosmic-panel#da27f533d9fad2f1b5e85c523217466c952709ce" dependencies = [ "serde", "wayland-protocols-wlr", @@ -9226,39 +9269,6 @@ dependencies = [ "zvariant 3.15.2", ] -[[package]] -name = "zbus" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725" -dependencies = [ - "async-broadcast 0.7.2", - "async-process 2.4.0", - "async-recursion", - "async-trait", - "enumflags2", - "event-listener 5.4.0", - "futures-core", - "futures-sink", - "futures-util", - "hex", - "nix 0.29.0", - "ordered-stream", - "rand 0.8.5", - "serde", - "serde_repr", - "sha1", - "static_assertions", - "tokio", - "tracing", - "uds_windows", - "windows-sys 0.52.0", - "xdg-home", - "zbus_macros 4.4.0", - "zbus_names 3.0.0", - "zvariant 4.2.0", -] - [[package]] name = "zbus" version = "5.9.0" @@ -9307,19 +9317,6 @@ dependencies = [ "zvariant_utils 1.0.1", ] -[[package]] -name = "zbus_macros" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e" -dependencies = [ - "proc-macro-crate 3.3.0", - "proc-macro2", - "quote", - "syn 2.0.104", - "zvariant_utils 2.1.0", -] - [[package]] name = "zbus_macros" version = "5.9.0" @@ -9346,17 +9343,6 @@ dependencies = [ "zvariant 3.15.2", ] -[[package]] -name = "zbus_names" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" -dependencies = [ - "serde", - "static_assertions", - "zvariant 4.2.0", -] - [[package]] name = "zbus_names" version = "4.2.0" @@ -9518,9 +9504,9 @@ dependencies = [ [[package]] name = "zune-jpeg" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9e525af0a6a658e031e95f14b7f889976b74a11ba0eca5a5fc9ac8a1c43a6a" +checksum = "fc1f7e205ce79eb2da3cd71c5f55f3589785cb7c79f6a03d1c8d1491bda5d089" dependencies = [ "zune-core", ] @@ -9539,20 +9525,6 @@ dependencies = [ "zvariant_derive 3.15.2", ] -[[package]] -name = "zvariant" -version = "4.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe" -dependencies = [ - "endi", - "enumflags2", - "serde", - "static_assertions", - "url", - "zvariant_derive 4.2.0", -] - [[package]] name = "zvariant" version = "5.6.0" @@ -9581,19 +9553,6 @@ dependencies = [ "zvariant_utils 1.0.1", ] -[[package]] -name = "zvariant_derive" -version = "4.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449" -dependencies = [ - "proc-macro-crate 3.3.0", - "proc-macro2", - "quote", - "syn 2.0.104", - "zvariant_utils 2.1.0", -] - [[package]] name = "zvariant_derive" version = "5.6.0" @@ -9618,17 +9577,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "zvariant_utils" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.104", -] - [[package]] name = "zvariant_utils" version = "3.2.0" diff --git a/Cargo.toml b/Cargo.toml index f993fbe..19988c9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,7 +8,7 @@ rust-version = "1.85.0" [workspace.dependencies] cosmic-randr = { git = "https://github.com/pop-os/cosmic-randr" } -tokio = { version = "1.43.0", features = ["macros"] } +tokio = { version = "1.47.0", features = ["macros"] } [workspace.dependencies.libcosmic] features = ["multi-window", "winit", "tokio"] diff --git a/cosmic-settings/Cargo.toml b/cosmic-settings/Cargo.toml index d6c4a36..1fdfe84 100644 --- a/cosmic-settings/Cargo.toml +++ b/cosmic-settings/Cargo.toml @@ -8,13 +8,13 @@ license = "GPL-3.0-only" accounts-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true } anyhow = "1.0" as-result = "0.2.1" -ashpd = { version = "0.9", default-features = false, features = [ +ashpd = { version = "0.11", default-features = false, features = [ "tokio", ], optional = true } -async-channel = "2.3.1" -chrono = "0.4.40" -clap = { version = "4.5.32", features = ["derive"] } -color-eyre = "0.6.3" +async-channel = "2.5.0" +chrono = "0.4.41" +clap = { version = "4.5.42", features = ["derive"] } +color-eyre = "0.6.5" cosmic-bg-config.workspace = true cosmic-comp-config = { workspace = true, optional = true } cosmic-config.workspace = true @@ -31,15 +31,15 @@ cosmic-settings-system = { path = "../pages/system", optional = true } cosmic-settings-wallpaper = { path = "../pages/wallpapers" } cosmic-settings-daemon-config = { git = "https://github.com/pop-os/cosmic-settings-daemon", optional = true } derivative = "2.2.0" -derive_setters = "0.1.6" -dirs = "5.0.1" -downcast-rs = "1.2.1" +derive_setters = "0.1.8" +dirs = "6.0.0" +downcast-rs = "2.0.1" eyre = "0.6.12" -freedesktop-desktop-entry = "0.7.9" +freedesktop-desktop-entry = "0.7.13" futures = "0.3.31" hostname-validator = "1.1.1" hostname1-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true } -i18n-embed-fl = "0.9.3" +i18n-embed-fl = "0.10.0" image = { version = "0.25", default-features = false, features = [ "jpeg", "png", @@ -47,23 +47,22 @@ image = { version = "0.25", default-features = false, features = [ "webp", "hdr", ] } -indexmap = "2.8.0" -itertools = "0.13.0" +indexmap = "2.10.0" +itertools = "0.14.0" itoa = "1.0.15" libcosmic.workspace = true locale1 = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true } mime-apps = { package = "cosmic-mime-apps", git = "https://github.com/pop-os/cosmic-mime-apps", optional = true } notify = "6.1.1" -once_cell = "1.21.1" regex = "1.11.1" -ron = "0.9.0" -rust-embed = "8.6.0" +ron = "0.10.1" +rust-embed = "8.7.2" sctk = { workspace = true, optional = true } secure-string = "0.3.0" serde = { version = "1.0.219", features = ["derive"] } -slab = "0.4.9" +slab = "0.4.10" slotmap = "1.0.7" -static_init = "1.0.3" +static_init = "1.0.4" sunrise = "2.1.0" tachyonix = "0.3.1" timedate-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true } @@ -75,14 +74,14 @@ upower_dbus = { git = "https://github.com/pop-os/dbus-settings-bindings", option bluez-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true } url = "2.5.4" xkb-data = "0.2.1" -zbus = { version = "5.7.1", default-features = false, features = [ +zbus = { version = "5.9.0", default-features = false, features = [ "tokio", ], optional = true } zbus_polkit = { version = "5.0.0", optional = true } fontdb = "0.23.0" fixed_decimal = "0.5.6" mime = "0.3.17" -rustix = { version = "1.0.3", features = ["process"] } +rustix = { version = "1.0.8", features = ["process"] } gettext-rs = { version = "0.7.2", features = [ "gettext-system", ], optional = true } @@ -96,7 +95,7 @@ version = "1.5.0" features = ["experimental", "compiled_data", "icu_datetime_experimental"] [dependencies.i18n-embed] -version = "0.15.3" +version = "0.16.0" features = ["fluent-system", "desktop-requester"] # Contains region-handling logic for Linux diff --git a/cosmic-settings/src/localize.rs b/cosmic-settings/src/localize.rs index a7048ee..25aee1d 100644 --- a/cosmic-settings/src/localize.rs +++ b/cosmic-settings/src/localize.rs @@ -5,14 +5,14 @@ use i18n_embed::{ DefaultLocalizer, LanguageLoader, Localizer, fluent::{FluentLanguageLoader, fluent_language_loader}, }; -use once_cell::sync::Lazy; use rust_embed::RustEmbed; +use std::sync::LazyLock; #[derive(RustEmbed)] #[folder = "../i18n/"] struct Localizations; -pub static LANGUAGE_LOADER: Lazy = Lazy::new(|| { +pub static LANGUAGE_LOADER: LazyLock = LazyLock::new(|| { let loader: FluentLanguageLoader = fluent_language_loader!(); loader diff --git a/cosmic-settings/src/pages/desktop/appearance/drawer.rs b/cosmic-settings/src/pages/desktop/appearance/drawer.rs index aa241cd..6778679 100644 --- a/cosmic-settings/src/pages/desktop/appearance/drawer.rs +++ b/cosmic-settings/src/pages/desktop/appearance/drawer.rs @@ -2,7 +2,6 @@ use cosmic::app::{ContextDrawer, context_drawer}; use cosmic::config::CosmicTk; use cosmic::cosmic_config::{Config, ConfigSet}; use cosmic::cosmic_theme::Spacing; -use cosmic::cosmic_theme::palette::{FromColor, Hsv, Srgb}; use cosmic::iced_core::{Color, Length}; use cosmic::widget::{ ColorPickerModel, color_picker::ColorPickerUpdate, container, flex_row, settings, text, diff --git a/cosmic-settings/src/pages/desktop/appearance/mod.rs b/cosmic-settings/src/pages/desktop/appearance/mod.rs index 7b3036f..675cb06 100644 --- a/cosmic-settings/src/pages/desktop/appearance/mod.rs +++ b/cosmic-settings/src/pages/desktop/appearance/mod.rs @@ -15,9 +15,7 @@ use cosmic::app::ContextDrawer; use cosmic::config::CosmicTk; use cosmic::cosmic_config::{Config, ConfigSet, CosmicConfigEntry}; use cosmic::cosmic_theme::palette::{FromColor, Hsv, Srgb}; -use cosmic::cosmic_theme::{ - CornerRadii, DARK_THEME_BUILDER_ID, Density, LIGHT_THEME_BUILDER_ID, Theme, ThemeBuilder, -}; +use cosmic::cosmic_theme::{CornerRadii, Density, Theme, ThemeBuilder}; #[cfg(feature = "xdg-portal")] use cosmic::dialog::file_chooser::{self, FileFilter}; use cosmic::iced_core::{Alignment, Length}; diff --git a/cosmic-settings/src/pages/desktop/appearance/style.rs b/cosmic-settings/src/pages/desktop/appearance/style.rs index c2460d8..cef84e1 100644 --- a/cosmic-settings/src/pages/desktop/appearance/style.rs +++ b/cosmic-settings/src/pages/desktop/appearance/style.rs @@ -1,4 +1,4 @@ -use cosmic::iced_core::{Alignment, Length}; +use cosmic::iced_core::{Alignment, Length, text::Wrapping}; use cosmic::widget::icon::{from_name, icon}; use cosmic::widget::{button, container, settings, text}; use cosmic::{Apply, Element}; @@ -72,7 +72,7 @@ pub fn section() -> Section { .apply(container) .width(Length::Fixed(191.0)) .class(style_container()), - text::body(&descriptions[round]) + text::body(&descriptions[round]).wrapping(Wrapping::None) ] .spacing(8) .width(Length::FillPortion(1)) @@ -97,7 +97,7 @@ pub fn section() -> Section { .apply(container) .width(Length::Fixed(191.0)) .class(style_container()), - text::body(&descriptions[slightly_round]) + text::body(&descriptions[slightly_round]).wrapping(Wrapping::None) ] .spacing(8) .width(Length::FillPortion(1)) @@ -123,7 +123,7 @@ pub fn section() -> Section { .apply(container) .width(Length::Fixed(191.0)) .class(style_container()), - text::body(&descriptions[square]) + text::body(&descriptions[square]).wrapping(Wrapping::None) ] .spacing(8) .align_x(Alignment::Center) diff --git a/cosmic-settings/src/pages/desktop/panel/applets_inner.rs b/cosmic-settings/src/pages/desktop/panel/applets_inner.rs index 1415dbb..3db02ab 100644 --- a/cosmic-settings/src/pages/desktop/panel/applets_inner.rs +++ b/cosmic-settings/src/pages/desktop/panel/applets_inner.rs @@ -25,10 +25,9 @@ use cosmic::{ }, theme, }; -use once_cell::sync::Lazy; -use std::path::PathBuf; -use std::{borrow::Cow, fmt::Debug, mem, path::Path}; +use std::path::{Path, PathBuf}; +use std::{borrow::Cow, fmt::Debug, mem, sync::LazyLock}; use crate::{app, pages}; use cosmic_panel_config::CosmicPanelConfig; @@ -49,7 +48,7 @@ const MIME_TYPE: &str = "text/uri-list"; // radius is 8.0 const DRAG_START_DISTANCE_SQUARED: f32 = 64.0; -pub static APPLET_DND_ICON_ID: Lazy = Lazy::new(window::Id::unique); +pub static APPLET_DND_ICON_ID: LazyLock = LazyLock::new(window::Id::unique); pub struct Page { pub(crate) entity: page::Entity, diff --git a/cosmic-settings/src/pages/desktop/panel/inner.rs b/cosmic-settings/src/pages/desktop/panel/inner.rs index b86de4a..1096af0 100644 --- a/cosmic-settings/src/pages/desktop/panel/inner.rs +++ b/cosmic-settings/src/pages/desktop/panel/inner.rs @@ -214,7 +214,7 @@ pub(crate) fn style< PanelSize::M => 2, PanelSize::L => 3, PanelSize::XL => 4, - PanelSize::Custom(s) => 2, + PanelSize::Custom(_) => 2, }, |v| { if v == 0 { diff --git a/cosmic-settings/src/pages/display/mod.rs b/cosmic-settings/src/pages/display/mod.rs index 15bcf1b..4c42c17 100644 --- a/cosmic-settings/src/pages/display/mod.rs +++ b/cosmic-settings/src/pages/display/mod.rs @@ -16,17 +16,17 @@ use cosmic_randr_shell::{ AdaptiveSyncAvailability, AdaptiveSyncState, List, Output, OutputKey, Transform, }; use cosmic_settings_page::{self as page, Section, section}; -use once_cell::sync::Lazy; use slab::Slab; use slotmap::{Key, SecondaryMap, SlotMap}; use std::sync::atomic::{AtomicBool, Ordering}; -use std::{collections::BTreeMap, process::ExitStatus, sync::Arc}; +use std::sync::{Arc, LazyLock}; +use std::{collections::BTreeMap, process::ExitStatus}; use tokio::sync::oneshot; static DPI_SCALES: &[u32] = &[50, 75, 100, 125, 150, 175, 200, 225, 250, 275, 300]; -static DPI_SCALE_LABELS: Lazy> = - Lazy::new(|| DPI_SCALES.iter().map(|scale| format!("{scale}%")).collect()); +static DPI_SCALE_LABELS: LazyLock> = + LazyLock::new(|| DPI_SCALES.iter().map(|scale| format!("{scale}%")).collect()); /// Display color depth options #[allow(dead_code)] diff --git a/page/Cargo.toml b/page/Cargo.toml index 90dab4a..91007a7 100644 --- a/page/Cargo.toml +++ b/page/Cargo.toml @@ -4,11 +4,11 @@ version = "0.1.0" edition = "2024" [dependencies] -derive_setters = "0.1.6" +derive_setters = "0.1.8" regex = "1.11.1" slotmap = "1.0.7" libcosmic = { workspace = true } -downcast-rs = "1.2.1" +downcast-rs = "2.0.1" tokio.workspace = true url = "2.5.4" -slab = "0.4.9" +slab = "0.4.10" diff --git a/pages/system/Cargo.toml b/pages/system/Cargo.toml index 52a564c..5115b16 100644 --- a/pages/system/Cargo.toml +++ b/pages/system/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "cosmic-settings-system" version = "0.1.0" -edition = "2021" +edition = "2024" license = "GPL-3.0-only" rust-version.workspace = true @@ -11,9 +11,9 @@ rust-version.workspace = true byte-unit = "5.1.6" const_format = "0.2.34" concat-in-place = "1.1.0" -sysinfo = "0.31.4" -memchr = "2.7.4" +sysinfo = "0.36.1" +memchr = "2.7.5" [dependencies.bumpalo] -version = "3.17.0" +version = "3.19.0" features = ["collections"] diff --git a/pages/wallpapers/Cargo.toml b/pages/wallpapers/Cargo.toml index f1ad1bb..b35009e 100644 --- a/pages/wallpapers/Cargo.toml +++ b/pages/wallpapers/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "cosmic-settings-wallpaper" version = "0.1.0" -edition = "2021" +edition = "2024" rust-version.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -10,7 +10,7 @@ rust-version.workspace = true cosmic-bg-config = { workspace = true } cosmic-config = { workspace = true } cosmic-randr-shell = { workspace = true } -dirs = "5.0.1" +dirs = "6.0.0" eyre = "0.6.12" # Upstream version 5.0.0 has compilation error on Redox's toolchain fast_image_resize = { git = "https://github.com/jackpot51/fast_image_resize.git", features = [ @@ -19,9 +19,9 @@ fast_image_resize = { git = "https://github.com/jackpot51/fast_image_resize.git" freedesktop-icons = { package = "cosmic-freedesktop-icons", git = "https://github.com/pop-os/freedesktop-icons" } futures-lite = "2.6.0" futures-util = "0.3.31" -image = "0.25.5" -infer = "0.16.0" -jxl-oxide = "0.11.3" -tokio = { version = "1.44.1", features = ["sync"] } +image = "0.25.6" +infer = "0.19.0" +jxl-oxide = "0.12.2" +tokio = { version = "1.47.0", features = ["sync"] } tracing = "0.1.41" walkdir = "=2.5.0" diff --git a/pages/wallpapers/src/lib.rs b/pages/wallpapers/src/lib.rs index ec5046f..f0f5a86 100644 --- a/pages/wallpapers/src/lib.rs +++ b/pages/wallpapers/src/lib.rs @@ -1,5 +1,5 @@ pub use cosmic_bg_config::{Color, Config, Entry, Gradient, ScalingMode, Source}; -use eyre::{eyre, OptionExt}; +use eyre::{OptionExt, eyre}; use fast_image_resize::SrcCropping; use futures_lite::Stream; use futures_util::StreamExt; @@ -9,7 +9,7 @@ use jxl_oxide::{EnumColourEncoding, JxlImage, PixelFormat}; use std::os::unix::ffi::OsStrExt; use std::{ borrow::Cow, - collections::{hash_map::DefaultHasher, HashMap}, + collections::{HashMap, hash_map::DefaultHasher}, hash::{Hash, Hasher}, io::Read, path::{Path, PathBuf},