diff --git a/Cargo.lock b/Cargo.lock index 65db7633..4b9132e7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -449,6 +449,26 @@ dependencies = [ "piper", ] +[[package]] +name = "bstr" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63044e1ae8e69f3b5a92c736ca6269b8d12fa7efe39bf34ddb06d102cf0e2cab" +dependencies = [ + "memchr", + "regex-automata", + "serde", +] + +[[package]] +name = "btoi" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b5ab9db53bcda568284df0fd39f6eac24ad6f7ba7ff1168b9e76eba6576b976" +dependencies = [ + "num-traits", +] + [[package]] name = "bumpalo" version = "3.19.0" @@ -872,7 +892,7 @@ dependencies = [ "wayland-backend", "wayland-scanner", "xcursor", - "xdg 3.0.0", + "xdg", "xdg-user", "xkbcommon 0.9.0", "zbus", @@ -894,13 +914,13 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic/#f44d82a7e83af15270a9ca3beb832f4799699337" +source = "git+https://github.com/pop-os/libcosmic/#3b8ad45950f5d23c8550e18e628f6e70b7089d89" dependencies = [ "atomicwrites", "calloop 0.14.3", "cosmic-config-derive", "cosmic-settings-daemon", - "dirs 6.0.0", + "dirs", "futures-util", "iced_futures", "known-folders", @@ -908,14 +928,14 @@ dependencies = [ "ron", "serde", "tracing", - "xdg 3.0.0", + "xdg", "zbus", ] [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic/#f44d82a7e83af15270a9ca3beb832f4799699337" +source = "git+https://github.com/pop-os/libcosmic/#3b8ad45950f5d23c8550e18e628f6e70b7089d89" dependencies = [ "quote", "syn 2.0.106", @@ -923,15 +943,16 @@ dependencies = [ [[package]] name = "cosmic-freedesktop-icons" -version = "0.3.0" -source = "git+https://github.com/pop-os/freedesktop-icons#8a05c322c482ff3c69cf34bacfee98907ac45307" +version = "0.4.0" +source = "git+https://github.com/pop-os/freedesktop-icons#7a61a704f6d1ec41f71cbe766e3cc484858523fa" dependencies = [ - "dirs 5.0.1", - "ini_core", + "bstr", + "btoi", + "memchr", "memmap2", "thiserror 2.0.17", "tracing", - "xdg 2.5.2", + "xdg", ] [[package]] @@ -992,8 +1013,8 @@ dependencies = [ [[package]] name = "cosmic-text" -version = "0.14.2" -source = "git+https://github.com/pop-os/cosmic-text.git#cffdea2b334e7830a5fd6f95bf5e1784014442a8" +version = "0.15.0" +source = "git+https://github.com/pop-os/cosmic-text.git#7051682e70defcab6b683d6e9db07124a6de0df7" dependencies = [ "bitflags 2.9.4", "fontdb 0.23.0", @@ -1003,7 +1024,7 @@ dependencies = [ "rangemap", "rustc-hash 1.1.0", "self_cell", - "skrifa", + "skrifa 0.39.0", "smol_str", "swash", "sys-locale", @@ -1016,12 +1037,12 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic/#f44d82a7e83af15270a9ca3beb832f4799699337" +source = "git+https://github.com/pop-os/libcosmic/#3b8ad45950f5d23c8550e18e628f6e70b7089d89" dependencies = [ "almost", "cosmic-config", "csscolorparser", - "dirs 6.0.0", + "dirs", "palette", "ron", "serde", @@ -1081,7 +1102,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5fda6aace1fbef3aa217b27f4c8d7d071ef2a70a5ca51050b1f17d40299d3f16" dependencies = [ - "phf", + "phf 0.11.3", "serde", ] @@ -1228,34 +1249,13 @@ dependencies = [ "subtle", ] -[[package]] -name = "dirs" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" -dependencies = [ - "dirs-sys 0.4.1", -] - [[package]] name = "dirs" version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e" dependencies = [ - "dirs-sys 0.5.0", -] - -[[package]] -name = "dirs-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" -dependencies = [ - "libc", - "option-ext", - "redox_users 0.4.6", - "windows-sys 0.48.0", + "dirs-sys", ] [[package]] @@ -1266,7 +1266,7 @@ checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab" dependencies = [ "libc", "option-ext", - "redox_users 0.5.2", + "redox_users", "windows-sys 0.61.2", ] @@ -1743,9 +1743,9 @@ checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" [[package]] name = "font-types" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "511e2c18a516c666d27867d2f9821f76e7d591f762e9fc41dd6cc5c90fe54b0b" +checksum = "39a654f404bbcbd48ea58c617c2993ee91d1cb63727a37bf2323a4edeed1b8c5" dependencies = [ "bytemuck", ] @@ -2161,14 +2161,14 @@ dependencies = [ [[package]] name = "harfrust" -version = "0.3.2" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92c020db12c71d8a12a3fe7607873cade3a01a6287e29d540c8723276221b9d8" +checksum = "e0caaee032384c10dd597af4579c67dee16650d862a9ccbe1233ff1a379abc07" dependencies = [ "bitflags 2.9.4", "bytemuck", "core_maths", - "read-fonts", + "read-fonts 0.36.0", "smallvec", ] @@ -2356,7 +2356,7 @@ dependencies = [ [[package]] name = "iced" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic/#f44d82a7e83af15270a9ca3beb832f4799699337" +source = "git+https://github.com/pop-os/libcosmic/#3b8ad45950f5d23c8550e18e628f6e70b7089d89" dependencies = [ "dnd", "iced_core", @@ -2372,7 +2372,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic/#f44d82a7e83af15270a9ca3beb832f4799699337" +source = "git+https://github.com/pop-os/libcosmic/#3b8ad45950f5d23c8550e18e628f6e70b7089d89" dependencies = [ "bitflags 2.9.4", "bytes", @@ -2395,7 +2395,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic/#f44d82a7e83af15270a9ca3beb832f4799699337" +source = "git+https://github.com/pop-os/libcosmic/#3b8ad45950f5d23c8550e18e628f6e70b7089d89" dependencies = [ "futures", "iced_core", @@ -2420,7 +2420,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic/#f44d82a7e83af15270a9ca3beb832f4799699337" +source = "git+https://github.com/pop-os/libcosmic/#3b8ad45950f5d23c8550e18e628f6e70b7089d89" dependencies = [ "bitflags 2.9.4", "bytemuck", @@ -2442,7 +2442,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic/#f44d82a7e83af15270a9ca3beb832f4799699337" +source = "git+https://github.com/pop-os/libcosmic/#3b8ad45950f5d23c8550e18e628f6e70b7089d89" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2454,7 +2454,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic/#f44d82a7e83af15270a9ca3beb832f4799699337" +source = "git+https://github.com/pop-os/libcosmic/#3b8ad45950f5d23c8550e18e628f6e70b7089d89" dependencies = [ "bytes", "dnd", @@ -2468,7 +2468,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic/#f44d82a7e83af15270a9ca3beb832f4799699337" +source = "git+https://github.com/pop-os/libcosmic/#3b8ad45950f5d23c8550e18e628f6e70b7089d89" dependencies = [ "bytemuck", "cosmic-text", @@ -2484,7 +2484,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic/#f44d82a7e83af15270a9ca3beb832f4799699337" +source = "git+https://github.com/pop-os/libcosmic/#3b8ad45950f5d23c8550e18e628f6e70b7089d89" dependencies = [ "as-raw-xcb-connection", "bitflags 2.9.4", @@ -2515,7 +2515,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic/#f44d82a7e83af15270a9ca3beb832f4799699337" +source = "git+https://github.com/pop-os/libcosmic/#3b8ad45950f5d23c8550e18e628f6e70b7089d89" dependencies = [ "dnd", "iced_renderer", @@ -2695,15 +2695,6 @@ dependencies = [ "serde_core", ] -[[package]] -name = "ini_core" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a467a31a9f439b5262fa99c17084537bff57f24703d5a09a2b5c9657ec73a61" -dependencies = [ - "cfg-if", -] - [[package]] name = "inotify" version = "0.11.0" @@ -2957,7 +2948,7 @@ checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic/#f44d82a7e83af15270a9ca3beb832f4799699337" +source = "git+https://github.com/pop-os/libcosmic/#3b8ad45950f5d23c8550e18e628f6e70b7089d89" dependencies = [ "apply", "auto_enums", @@ -2979,7 +2970,9 @@ dependencies = [ "iced_tiny_skia", "iced_widget", "image", + "log", "palette", + "phf 0.13.1", "raw-window-handle", "rust-embed", "serde", @@ -3331,8 +3324,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1706dc14a2e140dec0a7a07109d9a3d5890b81e85bd6c60b906b249a77adf0ca" dependencies = [ "mime 0.3.17", - "phf", - "phf_shared", + "phf 0.11.3", + "phf_shared 0.11.3", "unicase", ] @@ -3958,7 +3951,7 @@ dependencies = [ "approx 0.5.1", "fast-srgb8", "palette_derive", - "phf", + "phf 0.11.3", "serde", ] @@ -4046,8 +4039,19 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078" dependencies = [ - "phf_macros", - "phf_shared", + "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 0.13.1", + "phf_shared 0.13.1", + "serde", ] [[package]] @@ -4056,24 +4060,47 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d" dependencies = [ - "phf_shared", + "phf_shared 0.11.3", "rand 0.8.5", ] +[[package]] +name = "phf_generator" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "135ace3a761e564ec88c03a77317a7c6b80bb7f7135ef2544dbe054243b89737" +dependencies = [ + "fastrand", + "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", - "phf_shared", + "phf_generator 0.11.3", + "phf_shared 0.11.3", "proc-macro2", "quote", "syn 2.0.106", "unicase", ] +[[package]] +name = "phf_macros" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "812f032b54b1e759ccd5f8b6677695d5268c588701effba24601f6932f8269ef" +dependencies = [ + "phf_generator 0.13.1", + "phf_shared 0.13.1", + "proc-macro2", + "quote", + "syn 2.0.106", +] + [[package]] name = "phf_shared" version = "0.11.3" @@ -4084,6 +4111,15 @@ dependencies = [ "unicase", ] +[[package]] +name = "phf_shared" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e57fef6bc5981e38c2ce2d63bfa546861309f875b8a75f092d1d54ae2d64f266" +dependencies = [ + "siphasher 1.0.1", +] + [[package]] name = "pico-args" version = "0.5.0" @@ -4406,6 +4442,16 @@ name = "read-fonts" version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6717cf23b488adf64b9d711329542ba34de147df262370221940dfabc2c91358" +dependencies = [ + "bytemuck", + "font-types", +] + +[[package]] +name = "read-fonts" +version = "0.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eaa2941a4c05443ee3a7b26ab076a553c343ad5995230cc2b1d3e993bdc6345" dependencies = [ "bytemuck", "core_maths", @@ -4439,17 +4485,6 @@ dependencies = [ "bitflags 2.9.4", ] -[[package]] -name = "redox_users" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" -dependencies = [ - "getrandom 0.2.16", - "libredox", - "thiserror 1.0.69", -] - [[package]] name = "redox_users" version = "0.5.2" @@ -4925,7 +4960,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c31071dedf532758ecf3fed987cdb4bd9509f900e026ab684b4ecb81ea49841" dependencies = [ "bytemuck", - "read-fonts", + "read-fonts 0.35.0", +] + +[[package]] +name = "skrifa" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c9eb0b904a04d09bd68c65d946617b8ff733009999050f3b851c32fb3cfb60e" +dependencies = [ + "bytemuck", + "read-fonts 0.36.0", ] [[package]] @@ -5203,7 +5248,7 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "47846491253e976bdd07d0f9cc24b7daf24720d11309302ccbbc6e6b6e53550a" dependencies = [ - "skrifa", + "skrifa 0.37.0", "yazi", "zeno", ] @@ -6919,12 +6964,6 @@ version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bec9e4a500ca8864c5b47b8b482a73d62e4237670e5b5f1d6b9e3cae50f28f2b" -[[package]] -name = "xdg" -version = "2.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" - [[package]] name = "xdg" version = "3.0.0"