From b380b1bf32089e7586f4e86e65d106dec3e31324 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vuka=C5=A1in=20Vojinovi=C4=87?= <150025636+git-f0x@users.noreply.github.com> Date: Thu, 11 Sep 2025 16:24:07 +0200 Subject: [PATCH] chore: update dependencies Also switches to the `about` widget. --- Cargo.lock | 881 ++++++++++++---------------------------- Cargo.toml | 17 +- build.rs | 17 - i18n/en/cosmic_edit.ftl | 3 +- src/main.rs | 56 +-- 5 files changed, 298 insertions(+), 676 deletions(-) delete mode 100644 build.rs diff --git a/Cargo.lock b/Cargo.lock index aa43eb1..400658b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "ab_glyph" @@ -152,15 +152,6 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" -[[package]] -name = "aligned-array" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e05c92d086290f52938013f6242ac62bf7d401fab8ad36798a609faa65c3fd2c" -dependencies = [ - "generic-array", -] - [[package]] name = "aligned-vec" version = "0.6.4" @@ -218,12 +209,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - [[package]] name = "android_system_properties" version = "0.1.5" @@ -375,7 +360,7 @@ dependencies = [ "wayland-backend", "wayland-client", "wayland-protocols", - "zbus 5.10.0", + "zbus 5.11.0", ] [[package]] @@ -395,7 +380,7 @@ dependencies = [ "wayland-backend", "wayland-client", "wayland-protocols", - "zbus 5.10.0", + "zbus 5.11.0", ] [[package]] @@ -478,8 +463,8 @@ dependencies = [ "futures-io", "futures-lite 2.6.1", "parking", - "polling 3.7.4", - "rustix 1.0.8", + "polling 3.10.0", + "rustix 1.1.2", "slab", "windows-sys 0.60.2", ] @@ -536,7 +521,7 @@ dependencies = [ "cfg-if", "event-listener 5.4.1", "futures-lite 2.6.1", - "rustix 1.0.8", + "rustix 1.1.2", ] [[package]] @@ -562,7 +547,7 @@ dependencies = [ "cfg-if", "futures-core", "futures-io", - "rustix 1.0.8", + "rustix 1.1.2", "signal-hook-registry", "slab", "windows-sys 0.60.2", @@ -902,21 +887,11 @@ checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" [[package]] name = "bzip2" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49ecfb22d906f800d4fe833b6282cf4dc1c298f5057ca0b5445e5c209735ca47" +checksum = "bea8dcd42434048e4f7a304411d9273a411f647446c1234a65ce0554923f4cff" dependencies = [ - "bzip2-sys", -] - -[[package]] -name = "bzip2-sys" -version = "0.1.13+1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225bff33b2141874fe80d71e07d6eec4f85c5c216453dd96388240f96e1acc14" -dependencies = [ - "cc", - "pkg-config", + "libbz2-rs-sys", ] [[package]] @@ -937,7 +912,7 @@ checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec" dependencies = [ "bitflags 2.9.4", "log", - "polling 3.7.4", + "polling 3.10.0", "rustix 0.38.44", "slab", "thiserror 1.0.69", @@ -950,8 +925,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb9f6e1368bd4621d2c86baa7e37de77a938adf5221e5dd3d6133340101b309e" dependencies = [ "bitflags 2.9.4", - "polling 3.7.4", - "rustix 1.0.8", + "polling 3.10.0", + "rustix 1.1.2", "slab", "tracing", ] @@ -975,7 +950,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "138efcf0940a02ebf0cc8d1eff41a1682a46b431630f4c52450d6265876021fa" dependencies = [ "calloop 0.14.3", - "rustix 1.0.8", + "rustix 1.1.2", "wayland-backend", "wayland-client", ] @@ -1049,17 +1024,16 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "chrono" -version = "0.4.41" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d" +checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2" dependencies = [ - "android-tzdata", "iana-time-zone", "js-sys", "num-traits", "pure-rust-locales", "wasm-bindgen", - "windows-link 0.1.3", + "windows-link 0.2.0", ] [[package]] @@ -1205,54 +1179,37 @@ dependencies = [ [[package]] name = "compio" -version = "0.14.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c52183b7eefcaa6441fe810885a34fcdec7378e2883673fc3d74ca6e9ff738b" +checksum = "362c95e8e1a569b50b7e6642156eccd3678f03b4afa59834f18fad8af5649587" dependencies = [ "compio-buf", - "compio-dispatcher", "compio-driver", "compio-fs", "compio-io", "compio-log", "compio-macros", "compio-net", - "compio-process", - "compio-quic", "compio-runtime", - "compio-signal", ] [[package]] name = "compio-buf" -version = "0.5.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d14413106aad7dd931df3c4724110dabd731c81d52ba18edb4f2d57e7beb611b" +checksum = "5881ed3b06004d5e505746e6780dbbaf76fc508201e57bb5c84fcb4d69b8c23e" dependencies = [ "arrayvec", "bytes", "libc", ] -[[package]] -name = "compio-dispatcher" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ae8fab55190537c8634232f395302011ce39c18facbd4b85363df41114677ac" -dependencies = [ - "compio-driver", - "compio-runtime", - "flume", - "futures-channel", -] - [[package]] name = "compio-driver" -version = "0.7.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469f8e58596d82e2a0e17cb8216094cc75e8285fc7048907767cdb0337286f19" +checksum = "3c15d472da8b8f80cc8068b030fb439dc1cb300ffdf9041a054d226ea3825f1d" dependencies = [ - "aligned-array", "cfg-if", "cfg_aliases 0.2.1", "compio-buf", @@ -1263,16 +1220,16 @@ dependencies = [ "libc", "once_cell", "paste", - "polling 3.7.4", - "socket2 0.5.10", - "windows-sys 0.52.0", + "polling 3.10.0", + "socket2 0.6.0", + "windows-sys 0.61.0", ] [[package]] name = "compio-fs" -version = "0.7.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee2c5ba7c96f0caf3d62ed745278b26eebd4e9296817c4ef2ad6c359629f8ab" +checksum = "ea585c274239b9fd350a484c75a31fd0df5f031805b6664d83a98f5e8b019e2f" dependencies = [ "cfg-if", "cfg_aliases 0.2.1", @@ -1283,14 +1240,14 @@ dependencies = [ "libc", "os_pipe", "widestring", - "windows-sys 0.52.0", + "windows-sys 0.61.0", ] [[package]] name = "compio-io" -version = "0.6.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c18b1d7d4c058e3e92e9265d59f74981fda2693809b1e45f8ed7717d892c8ac" +checksum = "11d44edc43b3d69badbe7d398e61b5910b90aba580eae1ba3a821b11e2daf249" dependencies = [ "compio-buf", "futures-util", @@ -1320,9 +1277,9 @@ dependencies = [ [[package]] name = "compio-net" -version = "0.7.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0882a85c535c7b5d6ea3b9b37cc7421ec3f8ae8b83a09eb53f4295fb87b54995" +checksum = "2e6ea7aa4a9f38d68dd0098a11232236cb3efd0ef3cab50ecdada3d745f1f776" dependencies = [ "cfg-if", "compio-buf", @@ -1332,83 +1289,30 @@ dependencies = [ "either", "libc", "once_cell", - "socket2 0.5.10", + "socket2 0.6.0", "widestring", - "windows-sys 0.52.0", -] - -[[package]] -name = "compio-process" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dc299e4c0a2cdc4455bb4df86c554845d1abe611a1922e4b12a8af2a0fadc35" -dependencies = [ - "cfg-if", - "compio-buf", - "compio-driver", - "compio-io", - "compio-runtime", - "futures-util", - "windows-sys 0.52.0", -] - -[[package]] -name = "compio-quic" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8ab46b819ec5d08936218e9afc64f51ae660d128cd408458b08b457223a0541" -dependencies = [ - "cfg_aliases 0.2.1", - "compio-buf", - "compio-io", - "compio-log", - "compio-net", - "compio-runtime", - "flume", - "futures-util", - "libc", - "quinn-proto", - "rustc-hash 2.1.1", - "rustls", - "thiserror 2.0.16", - "windows-sys 0.52.0", + "windows-sys 0.61.0", ] [[package]] name = "compio-runtime" -version = "0.7.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a95ef126945a166879ef37d494015be13a1e4e452419bc4e5c4c5799f441756a" +checksum = "bd8edfe2c092d238f9eba7d795fcece2a2f0826f69134496dd03a9aa02e59916" dependencies = [ "async-task", "cfg-if", "compio-buf", "compio-driver", "compio-log", + "core_affinity", "crossbeam-queue", "futures-util", "libc", "once_cell", "scoped-tls", - "slab", - "socket2 0.5.10", - "windows-sys 0.52.0", -] - -[[package]] -name = "compio-signal" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd30ba3a28cd73fa49a6e4f1c31c1ad4742fb33802662aadf9ed188ae8a8f0e4" -dependencies = [ - "compio-buf", - "compio-driver", - "compio-runtime", - "libc", - "once_cell", - "os_pipe", - "slab", - "windows-sys 0.52.0", + "socket2 0.6.0", + "windows-sys 0.61.0", ] [[package]] @@ -1466,6 +1370,17 @@ dependencies = [ "libc", ] +[[package]] +name = "core_affinity" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a034b3a7b624016c6e13f5df875747cc25f884156aad2abd12b6c46797971342" +dependencies = [ + "libc", + "num_cpus", + "winapi", +] + [[package]] name = "core_maths" version = "0.1.1" @@ -1475,25 +1390,13 @@ dependencies = [ "libm", ] -[[package]] -name = "cosmic-client-toolkit" -version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-protocols?rev=178eb0b#178eb0b14a0e5c192f64f6dee6c40341a8e5ee51" -dependencies = [ - "cosmic-protocols 0.1.0 (git+https://github.com/pop-os/cosmic-protocols?rev=178eb0b)", - "libc", - "smithay-client-toolkit 0.19.2", - "wayland-client", - "wayland-protocols", -] - [[package]] name = "cosmic-client-toolkit" version = "0.1.0" source = "git+https://github.com/pop-os/cosmic-protocols?rev=6254f50#6254f50abc6dbfccadc6939f80e20081ab5f9d51" dependencies = [ "bitflags 2.9.4", - "cosmic-protocols 0.1.0 (git+https://github.com/pop-os/cosmic-protocols?rev=6254f50)", + "cosmic-protocols", "libc", "smithay-client-toolkit 0.20.0", "wayland-client", @@ -1503,7 +1406,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#ac18f009b4fd2a20d18e2f656cd668c320ba58fd" +source = "git+https://github.com/pop-os/libcosmic.git#e568122083ebc42d11e82b95ecc2e233c00554f7" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -1512,19 +1415,19 @@ dependencies = [ "futures-util", "iced_futures", "known-folders", - "notify 8.2.0", + "notify", "ron", "serde", "tokio", "tracing", "xdg 3.0.0", - "zbus 5.10.0", + "zbus 5.11.0", ] [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#ac18f009b4fd2a20d18e2f656cd668c320ba58fd" +source = "git+https://github.com/pop-os/libcosmic.git#e568122083ebc42d11e82b95ecc2e233c00554f7" dependencies = [ "quote", "syn 2.0.106", @@ -1541,14 +1444,14 @@ dependencies = [ "env_logger", "fork", "grep", - "i18n-embed 0.15.4", - "i18n-embed-fl 0.9.4", + "i18n-embed", + "i18n-embed-fl", "icu_collator", "icu_provider 1.5.0", "ignore", "libcosmic", "log", - "notify 6.1.1", + "notify", "open", "paste", "patch", @@ -1558,18 +1461,17 @@ dependencies = [ "syntect", "tokio", "two-face", - "vergen", ] [[package]] name = "cosmic-files" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-files.git#27d9e5dd6bf81d05faa2d5813f19b0cc97d91b8b" +source = "git+https://github.com/pop-os/cosmic-files.git#ca9ffe0d726a4fb4494b03843871026f6a6ae1e2" dependencies = [ "anyhow", "chrono", "compio", - "cosmic-client-toolkit 0.1.0 (git+https://github.com/pop-os/cosmic-protocols?rev=178eb0b)", + "cosmic-client-toolkit", "dirs 6.0.0", "env_logger", "flate2", @@ -1579,8 +1481,8 @@ dependencies = [ "gio", "glib", "glob", - "i18n-embed 0.15.4", - "i18n-embed-fl 0.9.4", + "i18n-embed", + "i18n-embed-fl", "icu", "icu_collator", "icu_provider 1.5.0", @@ -1594,11 +1496,10 @@ dependencies = [ "mime_guess", "notify-debouncer-full", "num_cpus", - "once_cell", "open", "ordermap", "paste", - "png 0.17.16", + "png 0.18.0", "procfs", "recently-used-xbel", "regex", @@ -1612,7 +1513,6 @@ dependencies = [ "trash", "url", "uzers", - "vergen", "walkdir", "wayland-client", "xdg-mime", @@ -1632,20 +1532,6 @@ dependencies = [ "xdg 2.5.2", ] -[[package]] -name = "cosmic-protocols" -version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-protocols?rev=178eb0b#178eb0b14a0e5c192f64f6dee6c40341a8e5ee51" -dependencies = [ - "bitflags 2.9.4", - "wayland-backend", - "wayland-client", - "wayland-protocols", - "wayland-protocols-wlr", - "wayland-scanner", - "wayland-server", -] - [[package]] name = "cosmic-protocols" version = "0.1.0" @@ -1665,7 +1551,7 @@ name = "cosmic-settings-daemon" version = "0.1.0" source = "git+https://github.com/pop-os/dbus-settings-bindings#3b86984332be2c930a3536ab714b843c851fa8ca" dependencies = [ - "zbus 5.10.0", + "zbus 5.11.0", ] [[package]] @@ -1681,22 +1567,22 @@ dependencies = [ [[package]] name = "cosmic-text" version = "0.14.2" -source = "git+https://github.com/pop-os/cosmic-text.git#3c1f6c9e8a24166fd77c09298d0ec8ee036c7e19" +source = "git+https://github.com/pop-os/cosmic-text.git#355b7febb17ecb0522346fcc5aff6ea78e33e78a" dependencies = [ "bitflags 2.9.4", "cosmic_undo_2", "fontdb 0.23.0", + "harfrust", "log", "modit", "rangemap", "rustc-hash 1.1.0", - "rustybuzz", - "self_cell 1.2.0", + "self_cell", + "skrifa 0.36.0", "smol_str", "swash", "syntect", "sys-locale", - "ttf-parser 0.21.1", "unicode-bidi", "unicode-linebreak", "unicode-script", @@ -1706,7 +1592,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#ac18f009b4fd2a20d18e2f656cd668c320ba58fd" +source = "git+https://github.com/pop-os/libcosmic.git#e568122083ebc42d11e82b95ecc2e233c00554f7" dependencies = [ "almost", "cosmic-config", @@ -2247,12 +2133,12 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" [[package]] name = "errno" -version = "0.3.13" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad" +checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.60.2", + "windows-sys 0.61.0", ] [[package]] @@ -2437,6 +2323,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d" dependencies = [ "crc32fast", + "libz-rs-sys", "miniz_oxide", ] @@ -2452,39 +2339,13 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8" -[[package]] -name = "fluent" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb74634707bebd0ce645a981148e8fb8c7bccd4c33c652aeffd28bf2f96d555a" -dependencies = [ - "fluent-bundle 0.15.3", - "unic-langid", -] - [[package]] name = "fluent" version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8137a6d5a2c50d6b0ebfcb9aaa91a28154e0a70605f112d30cb0cd4a78670477" dependencies = [ - "fluent-bundle 0.16.0", - "unic-langid", -] - -[[package]] -name = "fluent-bundle" -version = "0.15.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fe0a21ee80050c678013f82edf4b705fe2f26f1f9877593d13198612503f493" -dependencies = [ - "fluent-langneg", - "fluent-syntax 0.11.1", - "intl-memoizer", - "intl_pluralrules", - "rustc-hash 1.1.0", - "self_cell 0.10.3", - "smallvec", + "fluent-bundle", "unic-langid", ] @@ -2495,11 +2356,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "01203cb8918f5711e73891b347816d932046f95f54207710bda99beaeb423bf4" dependencies = [ "fluent-langneg", - "fluent-syntax 0.12.0", + "fluent-syntax", "intl-memoizer", "intl_pluralrules", "rustc-hash 2.1.1", - "self_cell 1.2.0", + "self_cell", "smallvec", "unic-langid", ] @@ -2513,15 +2374,6 @@ dependencies = [ "unic-langid", ] -[[package]] -name = "fluent-syntax" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a530c4694a6a8d528794ee9bbd8ba0122e779629ac908d15ad5a7ae7763a33d" -dependencies = [ - "thiserror 1.0.69", -] - [[package]] name = "fluent-syntax" version = "0.12.0" @@ -2532,18 +2384,6 @@ dependencies = [ "thiserror 2.0.16", ] -[[package]] -name = "flume" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095" -dependencies = [ - "futures-core", - "futures-sink", - "nanorand", - "spin", -] - [[package]] name = "fnv" version = "1.0.7" @@ -2800,7 +2640,7 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc257fdb4038301ce4b9cd1b3b51704509692bb3ff716a410cbd07925d9dae55" dependencies = [ - "rustix 1.0.8", + "rustix 1.1.2", "windows-targets 0.52.6", ] @@ -2811,10 +2651,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" dependencies = [ "cfg-if", - "js-sys", "libc", "wasi 0.11.1+wasi-snapshot-preview1", - "wasm-bindgen", ] [[package]] @@ -2824,11 +2662,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" dependencies = [ "cfg-if", - "js-sys", "libc", "r-efi", - "wasi 0.14.4+wasi-0.2.4", - "wasm-bindgen", + "wasi 0.14.5+wasi-0.2.4", ] [[package]] @@ -2849,9 +2685,9 @@ checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "gio" -version = "0.20.12" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e27e276e7b6b8d50f6376ee7769a71133e80d093bdc363bd0af71664228b831" +checksum = "52b5e3f390d01b79e30da451dd00e27cd1ac2de81658e3abf6c1fc3229b24c5f" dependencies = [ "futures-channel", "futures-core", @@ -2866,15 +2702,15 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.20.10" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "521e93a7e56fc89e84aea9a52cfc9436816a4b363b030260b699950ff1336c83" +checksum = "a03f2234671e5a588cfe1f59c2b22c103f5772ea351be9cc824a9ce0d06d99fd" dependencies = [ "glib-sys", "gobject-sys", "libc", "system-deps 7.0.5", - "windows-sys 0.59.0", + "windows-sys 0.60.2", ] [[package]] @@ -2896,9 +2732,9 @@ checksum = "151665d9be52f9bb40fc7966565d39666f2d1e69233571b71b87791c7e0528b3" [[package]] name = "glib" -version = "0.20.12" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc4b6e352d4716d84d7dde562dd9aee2a7d48beb872dd9ece7f2d1515b2d683" +checksum = "60bdc26493257b5794ba9301f7cbaf7ab0d69a570bfbefa4d7d360e781cb5205" dependencies = [ "bitflags 2.9.4", "futures-channel", @@ -2917,9 +2753,9 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.20.12" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8084af62f09475a3f529b1629c10c429d7600ee1398ae12dd3bf175d74e7145" +checksum = "e772291ebea14c28eb11bb75741f62f4a4894f25e60ce80100797b6b010ef0f9" dependencies = [ "heck 0.5.0", "proc-macro-crate 3.3.0", @@ -2930,9 +2766,9 @@ dependencies = [ [[package]] name = "glib-sys" -version = "0.20.10" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ab79e1ed126803a8fb827e3de0e2ff95191912b8db65cee467edb56fc4cc215" +checksum = "dc7c43cff6a7dc43821e45ebf172399437acd6716fa2186b6852d2b397bf622d" dependencies = [ "libc", "system-deps 7.0.5", @@ -2980,9 +2816,9 @@ dependencies = [ [[package]] name = "gobject-sys" -version = "0.20.10" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec9aca94bb73989e3cfdbf8f2e0f1f6da04db4d291c431f444838925c4c63eda" +checksum = "3e9a190eef2bce144a6aa8434e306974c6062c398e0a33a146d60238f9062d5c" dependencies = [ "glib-sys", "libc", @@ -3160,6 +2996,19 @@ dependencies = [ "thiserror 1.0.69", ] +[[package]] +name = "harfrust" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "406a98b615ed380f2195fa8fb2ed3083e64b2a6329d710e06f95a42466f0f0c4" +dependencies = [ + "bitflags 2.9.4", + "bytemuck", + "core_maths", + "read-fonts 0.34.0", + "smallvec", +] + [[package]] name = "hashbrown" version = "0.15.5" @@ -3243,27 +3092,6 @@ dependencies = [ "unic-langid", ] -[[package]] -name = "i18n-embed" -version = "0.15.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "669ffc2c93f97e6ddf06ddbe999fcd6782e3342978bb85f7d3c087c7978404c4" -dependencies = [ - "arc-swap", - "fluent 0.16.1", - "fluent-langneg", - "fluent-syntax 0.11.1", - "i18n-embed-impl", - "intl-memoizer", - "locale_config", - "log", - "parking_lot 0.12.4", - "rust-embed", - "thiserror 1.0.69", - "unic-langid", - "walkdir", -] - [[package]] name = "i18n-embed" version = "0.16.0" @@ -3271,9 +3099,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a217bbb075dcaefb292efa78897fc0678245ca67f265d12c351e42268fcb0305" dependencies = [ "arc-swap", - "fluent 0.17.0", + "fluent", "fluent-langneg", - "fluent-syntax 0.12.0", + "fluent-syntax", "i18n-embed-impl", "intl-memoizer", "log", @@ -3285,25 +3113,6 @@ dependencies = [ "walkdir", ] -[[package]] -name = "i18n-embed-fl" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04b2969d0b3fc6143776c535184c19722032b43e6a642d710fa3f88faec53c2d" -dependencies = [ - "find-crate", - "fluent 0.16.1", - "fluent-syntax 0.11.1", - "i18n-config", - "i18n-embed 0.15.4", - "proc-macro-error2", - "proc-macro2", - "quote", - "strsim", - "syn 2.0.106", - "unic-langid", -] - [[package]] name = "i18n-embed-fl" version = "0.10.0" @@ -3311,10 +3120,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e598ed73b67db92f61e04672e599eef2991a262a40e1666735b8a86d2e7e9f30" dependencies = [ "find-crate", - "fluent 0.17.0", - "fluent-syntax 0.12.0", + "fluent", + "fluent-syntax", "i18n-config", - "i18n-embed 0.16.0", + "i18n-embed", "proc-macro-error2", "proc-macro2", "quote", @@ -3363,7 +3172,7 @@ dependencies = [ [[package]] name = "iced" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#ac18f009b4fd2a20d18e2f656cd668c320ba58fd" +source = "git+https://github.com/pop-os/libcosmic.git#e568122083ebc42d11e82b95ecc2e233c00554f7" dependencies = [ "dnd", "iced_accessibility", @@ -3381,7 +3190,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#ac18f009b4fd2a20d18e2f656cd668c320ba58fd" +source = "git+https://github.com/pop-os/libcosmic.git#e568122083ebc42d11e82b95ecc2e233c00554f7" dependencies = [ "accesskit", "accesskit_winit", @@ -3390,11 +3199,11 @@ dependencies = [ [[package]] name = "iced_core" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#ac18f009b4fd2a20d18e2f656cd668c320ba58fd" +source = "git+https://github.com/pop-os/libcosmic.git#e568122083ebc42d11e82b95ecc2e233c00554f7" dependencies = [ "bitflags 2.9.4", "bytes", - "cosmic-client-toolkit 0.1.0 (git+https://github.com/pop-os/cosmic-protocols?rev=6254f50)", + "cosmic-client-toolkit", "dnd", "glam", "log", @@ -3414,7 +3223,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#ac18f009b4fd2a20d18e2f656cd668c320ba58fd" +source = "git+https://github.com/pop-os/libcosmic.git#e568122083ebc42d11e82b95ecc2e233c00554f7" dependencies = [ "futures", "iced_core", @@ -3440,7 +3249,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#ac18f009b4fd2a20d18e2f656cd668c320ba58fd" +source = "git+https://github.com/pop-os/libcosmic.git#e568122083ebc42d11e82b95ecc2e233c00554f7" dependencies = [ "bitflags 2.9.4", "bytemuck", @@ -3462,7 +3271,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#ac18f009b4fd2a20d18e2f656cd668c320ba58fd" +source = "git+https://github.com/pop-os/libcosmic.git#e568122083ebc42d11e82b95ecc2e233c00554f7" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -3474,10 +3283,10 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#ac18f009b4fd2a20d18e2f656cd668c320ba58fd" +source = "git+https://github.com/pop-os/libcosmic.git#e568122083ebc42d11e82b95ecc2e233c00554f7" dependencies = [ "bytes", - "cosmic-client-toolkit 0.1.0 (git+https://github.com/pop-os/cosmic-protocols?rev=6254f50)", + "cosmic-client-toolkit", "dnd", "iced_core", "iced_futures", @@ -3489,7 +3298,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#ac18f009b4fd2a20d18e2f656cd668c320ba58fd" +source = "git+https://github.com/pop-os/libcosmic.git#e568122083ebc42d11e82b95ecc2e233c00554f7" dependencies = [ "bytemuck", "cosmic-text", @@ -3505,12 +3314,12 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#ac18f009b4fd2a20d18e2f656cd668c320ba58fd" +source = "git+https://github.com/pop-os/libcosmic.git#e568122083ebc42d11e82b95ecc2e233c00554f7" dependencies = [ "as-raw-xcb-connection", "bitflags 2.9.4", "bytemuck", - "cosmic-client-toolkit 0.1.0 (git+https://github.com/pop-os/cosmic-protocols?rev=6254f50)", + "cosmic-client-toolkit", "futures", "glam", "guillotiere", @@ -3536,9 +3345,9 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#ac18f009b4fd2a20d18e2f656cd668c320ba58fd" +source = "git+https://github.com/pop-os/libcosmic.git#e568122083ebc42d11e82b95ecc2e233c00554f7" dependencies = [ - "cosmic-client-toolkit 0.1.0 (git+https://github.com/pop-os/cosmic-protocols?rev=6254f50)", + "cosmic-client-toolkit", "dnd", "iced_renderer", "iced_runtime", @@ -3555,9 +3364,9 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#ac18f009b4fd2a20d18e2f656cd668c320ba58fd" +source = "git+https://github.com/pop-os/libcosmic.git#e568122083ebc42d11e82b95ecc2e233c00554f7" dependencies = [ - "cosmic-client-toolkit 0.1.0 (git+https://github.com/pop-os/cosmic-protocols?rev=6254f50)", + "cosmic-client-toolkit", "dnd", "iced_futures", "iced_graphics", @@ -4152,18 +3961,18 @@ checksum = "d0263a3d970d5c054ed9312c0057b4f3bde9c0b33836d3637361d4a9e6e7a408" [[package]] name = "immutable-chunkmap" -version = "2.1.0" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2194c61e2a29841937e84ec2264a905985c397ccccfbd4783191d3285fa92ef" +checksum = "9a3e98b1520e49e252237edc238a39869da9f3241f2ec19dc788c1d24694d1e4" dependencies = [ "arrayvec", ] [[package]] name = "indexmap" -version = "2.11.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2481980430f9f78649238835720ddccc57e52df14ffce1c6f37391d61b563e9" +checksum = "206a8042aec68fa4a62e8d3f7aa4ceb508177d9324faf261e1959e495b7a1921" dependencies = [ "equivalent", "hashbrown", @@ -4188,17 +3997,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "inotify" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" -dependencies = [ - "bitflags 1.3.2", - "inotify-sys", - "libc", -] - [[package]] name = "inotify" version = "0.11.0" @@ -4657,18 +4455,18 @@ dependencies = [ "smallvec", ] -[[package]] -name = "lazy_static" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" - [[package]] name = "lebe" version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a79a3332a6609480d7d0c9eab957bca6b455b91bb84e66d19f5ff66294b85b8" +[[package]] +name = "libbz2-rs-sys" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c4a545a15244c7d945065b5d392b2d2d7f21526fba56ce51467b06ed445e8f7" + [[package]] name = "libc" version = "0.2.175" @@ -4678,13 +4476,13 @@ checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#ac18f009b4fd2a20d18e2f656cd668c320ba58fd" +source = "git+https://github.com/pop-os/libcosmic.git#e568122083ebc42d11e82b95ecc2e233c00554f7" dependencies = [ "apply", "ashpd 0.12.0", "auto_enums", "chrono", - "cosmic-client-toolkit 0.1.0 (git+https://github.com/pop-os/cosmic-protocols?rev=6254f50)", + "cosmic-client-toolkit", "cosmic-config", "cosmic-freedesktop-icons", "cosmic-settings-daemon", @@ -4692,8 +4490,8 @@ dependencies = [ "css-color", "derive_setters", "futures", - "i18n-embed 0.16.0", - "i18n-embed-fl 0.10.0", + "i18n-embed", + "i18n-embed-fl", "iced", "iced_core", "iced_futures", @@ -4704,6 +4502,7 @@ dependencies = [ "iced_widget", "iced_winit", "image", + "license", "palette", "raw-window-handle", "rfd", @@ -4716,7 +4515,7 @@ dependencies = [ "tracing", "unicode-segmentation", "url", - "zbus 5.10.0", + "zbus 5.11.0", ] [[package]] @@ -4756,6 +4555,26 @@ dependencies = [ "redox_syscall 0.5.17", ] +[[package]] +name = "libz-rs-sys" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "840db8cf39d9ec4dd794376f38acc40d0fc65eec2a8f484f7fd375b84602becd" +dependencies = [ + "zlib-rs", +] + +[[package]] +name = "license" +version = "3.7.0+3.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2db9430f1c0c6079d5650a97674467ff3934cb852400817eeb6c216b0a4eddb" +dependencies = [ + "reword", + "serde", + "serde_json", +] + [[package]] name = "linked-hash-map" version = "0.5.6" @@ -4782,9 +4601,9 @@ checksum = "2a385b1be4e5c3e362ad2ffa73c392e53f031eaa5b7d648e64cd87f27f6063d7" [[package]] name = "linux-raw-sys" -version = "0.9.4" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" +checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039" [[package]] name = "litemap" @@ -4804,19 +4623,6 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5e54036fe321fd421e10d732f155734c4e4afd610dd556d9a82833ab3ee0bed" -[[package]] -name = "locale_config" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934" -dependencies = [ - "lazy_static", - "objc", - "objc-foundation", - "regex", - "winapi", -] - [[package]] name = "lock_api" version = "0.4.13" @@ -4848,12 +4654,6 @@ version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" -[[package]] -name = "lru-slab" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" - [[package]] name = "lyon" version = "1.0.1" @@ -4907,24 +4707,13 @@ dependencies = [ ] [[package]] -name = "lzma-rs" -version = "0.3.0" +name = "lzma-rust2" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "297e814c836ae64db86b36cf2a557ba54368d03f6afcd7d947c266692f71115e" +checksum = "c60a23ffb90d527e23192f1246b14746e2f7f071cb84476dd879071696c18a4a" dependencies = [ - "byteorder", "crc", -] - -[[package]] -name = "lzma-sys" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fda04ab3764e6cde78b9974eec4f779acaba7c4e84b36eca3cf77c581b85d27" -dependencies = [ - "cc", - "libc", - "pkg-config", + "sha2", ] [[package]] @@ -5053,18 +4842,6 @@ dependencies = [ "simd-adler32", ] -[[package]] -name = "mio" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" -dependencies = [ - "libc", - "log", - "wasi 0.11.1+wasi-snapshot-preview1", - "windows-sys 0.48.0", -] - [[package]] name = "mio" version = "1.0.4" @@ -5123,15 +4900,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "nanorand" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" -dependencies = [ - "getrandom 0.2.16", -] - [[package]] name = "ndk" version = "0.9.0" @@ -5229,25 +4997,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" -[[package]] -name = "notify" -version = "6.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" -dependencies = [ - "bitflags 2.9.4", - "crossbeam-channel", - "filetime", - "fsevent-sys", - "inotify 0.9.6", - "kqueue", - "libc", - "log", - "mio 0.8.11", - "walkdir", - "windows-sys 0.48.0", -] - [[package]] name = "notify" version = "8.2.0" @@ -5256,11 +5005,11 @@ checksum = "4d3d07927151ff8575b7087f245456e549fea62edf0ec4e565a5ee50c8402bc3" dependencies = [ "bitflags 2.9.4", "fsevent-sys", - "inotify 0.11.0", + "inotify", "kqueue", "libc", "log", - "mio 1.0.4", + "mio", "notify-types", "walkdir", "windows-sys 0.60.2", @@ -5268,15 +5017,14 @@ dependencies = [ [[package]] name = "notify-debouncer-full" -version = "0.3.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb7fd166739789c9ff169e654dc1501373db9d80a4c3f972817c8a4d7cf8f34e" +checksum = "375bd3a138be7bfeff3480e4a623df4cbfb55b79df617c055cd810ba466fa078" dependencies = [ - "crossbeam-channel", "file-id", "log", - "notify 6.1.1", - "parking_lot 0.12.4", + "notify", + "notify-types", "walkdir", ] @@ -5375,15 +5123,6 @@ dependencies = [ "syn 2.0.106", ] -[[package]] -name = "num_threads" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" -dependencies = [ - "libc", -] - [[package]] name = "objc" version = "0.2.7" @@ -5738,9 +5477,9 @@ dependencies = [ [[package]] name = "ordermap" -version = "0.5.9" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fd6fedcd996c8c97932075cc3811d83f53280f48d5620e4e3cab7f6a12678c4" +checksum = "0dcd63f1ae4b091e314a26627c467dd8810d674ba798abc0e566679955776c63" dependencies = [ "indexmap", "serde", @@ -6105,16 +5844,16 @@ dependencies = [ [[package]] name = "polling" -version = "3.7.4" -source = "git+https://github.com/jackpot51/polling.git?branch=master#320a5ef6d369f4a6493f9779b0cff33dfc6e85ef" +version = "3.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5bd19146350fe804f7cb2669c851c03d69da628803dab0d98018142aaa5d829" dependencies = [ "cfg-if", "concurrent-queue", "hermit-abi 0.5.2", "pin-project-lite", - "rustix 0.38.44", - "tracing", - "windows-sys 0.59.0", + "rustix 1.1.2", + "windows-sys 0.60.2", ] [[package]] @@ -6153,6 +5892,12 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" +[[package]] +name = "ppmd-rust" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c834641d8ad1b348c9ee86dec3b9840d805acd5f24daa5f90c788951a52ff59b" + [[package]] name = "ppv-lite86" version = "0.2.21" @@ -6233,23 +5978,22 @@ dependencies = [ [[package]] name = "procfs" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc5b72d8145275d844d4b5f6d4e1eef00c8cd889edb6035c21675d1bb1f45c9f" +checksum = "25485360a54d6861439d60facef26de713b1e126bf015ec8f98239467a2b82f7" dependencies = [ "bitflags 2.9.4", "chrono", "flate2", - "hex", "procfs-core", - "rustix 0.38.44", + "rustix 1.1.2", ] [[package]] name = "procfs-core" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239df02d8349b06fc07398a3a1697b06418223b1c7725085e801e7c0fc6a12ec" +checksum = "e6401bf7b6af22f78b563665d15a22e9aef27775b79b149a66ca022468a4e405" dependencies = [ "bitflags 2.9.4", "chrono", @@ -6333,26 +6077,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "quinn-proto" -version = "0.11.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31" -dependencies = [ - "bytes", - "getrandom 0.3.3", - "lru-slab", - "rand 0.9.2", - "ring", - "rustc-hash 2.1.1", - "rustls-pki-types", - "slab", - "thiserror 2.0.16", - "tinyvec", - "tracing", - "web-time", -] - [[package]] name = "quote" version = "1.0.40" @@ -6525,6 +6249,17 @@ dependencies = [ "font-types", ] +[[package]] +name = "read-fonts" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8941f8e9d5f8ad3aebea330d01ac68c0167600eb31a86ecd86e97be4d13b51f5" +dependencies = [ + "bytemuck", + "core_maths", + "font-types", +] + [[package]] name = "recently-used-xbel" version = "1.1.0" @@ -6640,6 +6375,15 @@ dependencies = [ "usvg", ] +[[package]] +name = "reword" +version = "7.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2de73ec80cfacafa51b73b0db31d6c3a4718fc6b0d479ef445609704020c1b0" +dependencies = [ + "unicode-segmentation", +] + [[package]] name = "rfd" version = "0.15.4" @@ -6673,20 +6417,6 @@ dependencies = [ "bytemuck", ] -[[package]] -name = "ring" -version = "0.17.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" -dependencies = [ - "cc", - "cfg-if", - "getrandom 0.2.16", - "libc", - "untrusted", - "windows-sys 0.52.0", -] - [[package]] name = "ron" version = "0.11.0" @@ -6796,49 +6526,15 @@ dependencies = [ [[package]] name = "rustix" -version = "1.0.8" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8" +checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e" dependencies = [ "bitflags 2.9.4", "errno", "libc", - "linux-raw-sys 0.9.4", - "windows-sys 0.60.2", -] - -[[package]] -name = "rustls" -version = "0.23.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ebcbd2f03de0fc1122ad9bb24b127a5a6cd51d72604a3f3c50ac459762b6cc" -dependencies = [ - "once_cell", - "rustls-pki-types", - "rustls-webpki", - "subtle", - "zeroize", -] - -[[package]] -name = "rustls-pki-types" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79" -dependencies = [ - "web-time", - "zeroize", -] - -[[package]] -name = "rustls-webpki" -version = "0.103.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a17884ae0c1b773f1ccd2bd4a8c72f16da897310a98b0e84bf349ad5ead92fc" -dependencies = [ - "ring", - "rustls-pki-types", - "untrusted", + "linux-raw-sys 0.11.0", + "windows-sys 0.61.0", ] [[package]] @@ -6855,7 +6551,6 @@ checksum = "cfb9cf8877777222e4a3bc7eb247e398b56baba500c38c1c46842431adc8b55c" dependencies = [ "bitflags 2.9.4", "bytemuck", - "libm", "smallvec", "ttf-parser 0.21.1", "unicode-bidi-mirroring", @@ -6904,15 +6599,6 @@ dependencies = [ "tiny-skia", ] -[[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" @@ -7061,7 +6747,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dbeb4ca4399663735553a09dd17ce7e49a0a0203f03b706b39628c4d913a8607" dependencies = [ "bytemuck", - "read-fonts", + "read-fonts 0.29.3", +] + +[[package]] +name = "skrifa" +version = "0.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37004372610e83ee2a4c69c7d896b41f33da6a3dc1a4fe07dd9b2629a549b1dc" +dependencies = [ + "bytemuck", + "read-fonts 0.34.0", ] [[package]] @@ -7092,14 +6788,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016" dependencies = [ "bitflags 2.9.4", - "bytemuck", "calloop 0.13.0", "calloop-wayland-source 0.3.0", "cursor-icon", "libc", "log", "memmap2 0.9.8", - "pkg-config", "rustix 0.38.44", "thiserror 1.0.69", "wayland-backend", @@ -7109,7 +6803,6 @@ dependencies = [ "wayland-protocols", "wayland-protocols-wlr", "wayland-scanner", - "xkbcommon 0.7.0", "xkeysym", ] @@ -7128,7 +6821,7 @@ dependencies = [ "log", "memmap2 0.9.8", "pkg-config", - "rustix 1.0.8", + "rustix 1.1.2", "thiserror 2.0.16", "wayland-backend", "wayland-client", @@ -7173,16 +6866,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "socket2" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - [[package]] name = "socket2" version = "0.6.0" @@ -7223,15 +6906,6 @@ dependencies = [ "x11rb", ] -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] - [[package]] name = "spirv" version = "0.3.0+sdk-1.3.268.0" @@ -7296,7 +6970,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f745de914febc7c9ab4388dfaf94bbc87e69f57bb41133a9b0c84d4be49856f3" dependencies = [ - "skrifa", + "skrifa 0.31.3", "yazi", "zeno", ] @@ -7427,15 +7101,15 @@ checksum = "e502f78cdbb8ba4718f566c418c52bc729126ffd16baee5baa718cf25dd5a69a" [[package]] name = "tempfile" -version = "3.21.0" +version = "3.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15b61f8f20e3a6f7e0649d825294eaf317edce30f82cf6026e7e4cb9222a7d1e" +checksum = "84fa4d11fadde498443cca10fd3ac23c951f0dc59e080e9f4b93d4df4e4eea53" dependencies = [ "fastrand 2.3.0", "getrandom 0.3.3", "once_cell", - "rustix 1.0.8", - "windows-sys 0.60.2", + "rustix 1.1.2", + "windows-sys 0.61.0", ] [[package]] @@ -7508,9 +7182,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83bde6f1ec10e72d583d91623c939f623002284ef622b87de38cfd546cbf2031" dependencies = [ "deranged", - "libc", "num-conv", - "num_threads", "powerfmt", "serde", "time-core", @@ -7617,7 +7289,7 @@ dependencies = [ "bytes", "io-uring", "libc", - "mio 1.0.4", + "mio", "pin-project-lite", "signal-hook-registry", "slab", @@ -7862,9 +7534,9 @@ checksum = "1df77b101bcc4ea3d78dafc5ad7e4f58ceffe0b2b16bf446aeb50b6cb4157656" [[package]] name = "unicode-ident" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" +checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d" [[package]] name = "unicode-linebreak" @@ -7908,12 +7580,6 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" -[[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - [[package]] name = "url" version = "2.5.7" @@ -8008,18 +7674,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "vergen" -version = "8.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2990d9ea5967266ea0ccf413a4aa5c42a93dbcfda9cb49a97de6931726b12566" -dependencies = [ - "anyhow", - "cfg-if", - "rustversion", - "time", -] - [[package]] name = "version-compare" version = "0.2.0" @@ -8056,9 +7710,18 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] name = "wasi" -version = "0.14.4+wasi-0.2.4" +version = "0.14.5+wasi-0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88a5f4a424faf49c3c2c344f166f0662341d470ea185e939657aaff130f0ec4a" +checksum = "a4494f6290a82f5fe584817a676a34b9d6763e8d9d18204009fb31dceca98fd4" +dependencies = [ + "wasip2", +] + +[[package]] +name = "wasip2" +version = "1.0.0+wasi-0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03fa2761397e5bd52002cd7e73110c71af2109aca4e521a9f40473fe685b0a24" dependencies = [ "wit-bindgen", ] @@ -8158,7 +7821,7 @@ checksum = "673a33c33048a5ade91a6b139580fa174e19fb0d23f396dca9fa15f2e1e49b35" dependencies = [ "cc", "downcast-rs", - "rustix 1.0.8", + "rustix 1.1.2", "scoped-tls", "smallvec", "wayland-sys", @@ -8171,7 +7834,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c66a47e840dc20793f2264eb4b3e4ecb4b75d91c0dd4af04b456128e0bdd449d" dependencies = [ "bitflags 2.9.4", - "rustix 1.0.8", + "rustix 1.1.2", "wayland-backend", "wayland-scanner", ] @@ -8193,7 +7856,7 @@ version = "0.31.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "447ccc440a881271b19e9989f75726d60faa09b95b0200a9b7eb5cc47c3eeb29" dependencies = [ - "rustix 1.0.8", + "rustix 1.1.2", "wayland-client", "xcursor", ] @@ -8283,7 +7946,7 @@ checksum = "fcbd4f3aba6c9fba70445ad2a484c0ef0356c1a9459b1e8e435bedc1971a6222" dependencies = [ "bitflags 2.9.4", "downcast-rs", - "rustix 1.0.8", + "rustix 1.1.2", "wayland-backend", "wayland-scanner", ] @@ -9080,7 +8743,7 @@ dependencies = [ "libc", "libloading", "once_cell", - "rustix 1.0.8", + "rustix 1.1.2", "x11rb-protocol", "xcursor", ] @@ -9098,7 +8761,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af3a19837351dc82ba89f8a125e22a3c475f05aba604acc023d62b2739ae2909" dependencies = [ "libc", - "rustix 1.0.8", + "rustix 1.1.2", ] [[package]] @@ -9132,7 +8795,7 @@ dependencies = [ [[package]] name = "xdg-mime" version = "0.4.0" -source = "git+https://github.com/ellieplayswow/xdg-mime-rs?branch=feature/get-same-as#4f8d07ceedabbe58368a8e7f5547232490860790" +source = "git+https://github.com/ellieplayswow/xdg-mime-rs?branch=feature%2Fget-same-as#4f8d07ceedabbe58368a8e7f5547232490860790" dependencies = [ "dirs-next", "glob", @@ -9197,15 +8860,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" -[[package]] -name = "xz2" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388c44dc09d76f1536602ead6d325eb532f5c122f17782bd57fb47baeeb767e2" -dependencies = [ - "lzma-sys", -] - [[package]] name = "yaml-rust" version = "0.4.5" @@ -9313,9 +8967,9 @@ dependencies = [ [[package]] name = "zbus" -version = "5.10.0" +version = "5.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67a073be99ace1adc48af593701c8015cd9817df372e14a1a6b0ee8f8bf043be" +checksum = "2d07e46d035fb8e375b2ce63ba4e4ff90a7f73cf2ffb0138b29e1158d2eaadf7" dependencies = [ "async-broadcast 0.7.2", "async-executor", @@ -9340,7 +8994,7 @@ dependencies = [ "uds_windows", "windows-sys 0.60.2", "winnow 0.7.13", - "zbus_macros 5.10.0", + "zbus_macros 5.11.0", "zbus_names 4.2.0", "zvariant 5.7.0", ] @@ -9361,9 +9015,9 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "5.10.0" +version = "5.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e80cd713a45a49859dcb648053f63265f4f2851b6420d47a958e5697c68b131" +checksum = "57e797a9c847ed3ccc5b6254e8bcce056494b375b511b3d6edcec0aeb4defaca" dependencies = [ "proc-macro-crate 3.3.0", "proc-macro2", @@ -9532,34 +9186,37 @@ dependencies = [ [[package]] name = "zip" -version = "2.4.2" +version = "5.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fabe6324e908f85a1c52063ce7aa26b68dcb7eb6dbc83a2d148403c9bc3eba50" +checksum = "2f852905151ac8d4d06fdca66520a661c09730a74c6d4e2b0f27b436b382e532" dependencies = [ "aes", "arbitrary", "bzip2", "constant_time_eq", "crc32fast", - "crossbeam-utils", "deflate64", - "displaydoc", "flate2", "getrandom 0.3.3", "hmac", "indexmap", - "lzma-rs", + "lzma-rust2", "memchr", "pbkdf2", + "ppmd-rust", "sha1", - "thiserror 2.0.16", "time", - "xz2", "zeroize", "zopfli", "zstd", ] +[[package]] +name = "zlib-rs" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f06ae92f42f5e5c42443fd094f245eb656abf56dd7cce9b8b263236565e00f2" + [[package]] name = "zopfli" version = "0.8.2" diff --git a/Cargo.toml b/Cargo.toml index f89b127..f237ef7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,16 +6,13 @@ edition = "2024" license = "GPL-3.0-only" rust-version = "1.85" -[build-dependencies] -vergen = { version = "8", features = ["git", "gitcl"] } - [dependencies] dirs = "6" -env_logger = "0.11.6" +env_logger = "0.11.8" grep = "0.3.2" ignore = "0.4.23" -log = "0.4.25" -notify = "6.1.1" +log = "0.4.28" +notify = "8.2.0" open = "5.3.2" paste = "1.0.15" patch = "0.7.0" @@ -28,11 +25,11 @@ two-face = "0.4.3" # Internationalization icu_collator = "1.5" icu_provider = { version = "1.5", features = ["sync"] } -i18n-embed = { version = "0.15", features = [ +i18n-embed = { version = "0.16", features = [ "fluent-system", "desktop-requester", ] } -i18n-embed-fl = "0.9" +i18n-embed-fl = "0.10" rust-embed = "8" [dependencies.cosmic-files] @@ -50,7 +47,7 @@ features = ["syntect", "vi"] git = "https://github.com/pop-os/libcosmic.git" default-features = false #TODO: a11y feature crashes file choser dialog -features = ["dbus-config", "multi-window", "tokio", "winit", "surface-message"] +features = ["about", "dbus-config", "multi-window", "tokio", "winit", "surface-message"] [target.'cfg(unix)'.dependencies] fork = "0.2" @@ -68,8 +65,6 @@ debug = true [patch.crates-io] onig = { git = "https://github.com/rust-onig/rust-onig.git", branch = "main" } onig_sys = { git = "https://github.com/rust-onig/rust-onig.git", branch = "main" } -# https://github.com/smol-rs/polling/pull/235 -polling = { git = "https://github.com/jackpot51/polling.git", branch = "master" } # [patch.'https://github.com/pop-os/libcosmic'] # libcosmic = { path = "../libcosmic" } diff --git a/build.rs b/build.rs deleted file mode 100644 index be10241..0000000 --- a/build.rs +++ /dev/null @@ -1,17 +0,0 @@ -fn main() -> Result<(), Box> { - // Rebuild if i18n files change - println!("cargo:rerun-if-changed=i18n"); - - // Emit version information (if not cached by just vendor) - let mut vergen = vergen::EmitBuilder::builder(); - println!("cargo:rerun-if-env-changed=VERGEN_GIT_COMMIT_DATE"); - if std::env::var_os("VERGEN_GIT_COMMIT_DATE").is_none() { - vergen.git_commit_date(); - } - println!("cargo:rerun-if-env-changed=VERGEN_GIT_SHA"); - if std::env::var_os("VERGEN_GIT_SHA").is_none() { - vergen.git_sha(false); - } - vergen.fail_on_error().emit()?; - Ok(()) -} diff --git a/i18n/en/cosmic_edit.ftl b/i18n/en/cosmic_edit.ftl index c04a49f..c809e20 100644 --- a/i18n/en/cosmic_edit.ftl +++ b/i18n/en/cosmic_edit.ftl @@ -6,7 +6,8 @@ todo = TODO # Context Pages ## About -git-description = Git commit {$hash} on {$date} +repository = Repository +support = Support ## Document statistics document-statistics = Document statistics diff --git a/src/main.rs b/src/main.rs index 2bf292d..ec71de9 100644 --- a/src/main.rs +++ b/src/main.rs @@ -19,7 +19,7 @@ use cosmic::{ stream, window, }, style, theme, - widget::{self, button, icon, nav_bar, segmented_button}, + widget::{self, about::About, button, icon, nav_bar, segmented_button}, }; use cosmic_files::{ dialog::{Dialog, DialogKind, DialogMessage, DialogResult, DialogSettings}, @@ -439,6 +439,7 @@ pub enum Find { pub struct App { core: Core, + about: About, nav_model: segmented_button::SingleSelectModel, tab_model: segmented_button::SingleSelectModel, config_handler: Option, @@ -849,38 +850,6 @@ impl App { ]) } - fn about(&self) -> Element { - let cosmic_theme::Spacing { space_xxs, .. } = self.core().system_theme().cosmic().spacing; - let repository = "https://github.com/pop-os/cosmic-edit"; - let hash = env!("VERGEN_GIT_SHA"); - let short_hash: String = hash.chars().take(7).collect(); - let date = env!("VERGEN_GIT_COMMIT_DATE"); - widget::column::with_children(vec![ - widget::svg(widget::svg::Handle::from_memory( - &include_bytes!( - "../res/icons/hicolor/128x128/apps/com.system76.CosmicEdit.svg" - )[..], - )) - .into(), - widget::text::title3(fl!("cosmic-text-editor")).into(), - widget::button::link(repository) - .on_press(Message::LaunchUrl(repository.to_string())) - .padding(0) - .into(), - widget::button::link(fl!( - "git-description", - hash = short_hash.as_str(), - date = date - )) - .on_press(Message::LaunchUrl(format!("{}/commits/{}", repository, hash))) - .padding(0) - .into(), - ]) - .align_x(Alignment::Center) - .spacing(space_xxs) - .into() - } - fn document_statistics(&self) -> Element { //TODO: calculate in the background let mut character_count = 0; @@ -1367,8 +1336,24 @@ impl Application for App { zoom_steps.push(zoom_step); } + let about = About::default() + .name(fl!("cosmic-text-editor")) + .icon(icon::from_name(Self::APP_ID)) + .version(env!("CARGO_PKG_VERSION")) + .author("System76") + .license("GPL-3.0-only") + .developers([("Jeremy Soller", "jeremy@system76.com")]) + .links([ + (fl!("repository"), "https://github.com/pop-os/cosmic-edit"), + ( + fl!("support"), + "https://github.com/pop-os/cosmic-edit/issues", + ), + ]); + let mut app = App { core, + about, nav_model: nav_bar::Model::builder().build(), tab_model: segmented_button::Model::builder().build(), config_handler: flags.config_handler, @@ -2740,8 +2725,9 @@ impl Application for App { } Some(match self.context_page { - ContextPage::About => context_drawer::context_drawer( - self.about(), + ContextPage::About => context_drawer::about( + &self.about, + Message::LaunchUrl, Message::ToggleContextPage(ContextPage::About), ), ContextPage::DocumentStatistics => context_drawer::context_drawer(