From c4587b07291eaf41b2f2c34c8f2c7f3412c3683f Mon Sep 17 00:00:00 2001 From: funman300 Date: Sat, 18 Apr 2026 23:12:52 -0700 Subject: [PATCH] fix: downgrade iced_fonts to 0.1 for iced 0.13 compatibility iced_fonts 0.3 pulls in iced_widget 0.14 / iced_renderer 0.14 which breaks release builds when used alongside iced 0.13. Pin to 0.1.x which targets iced 0.12/0.13 and drop the unused iced_aw dependency. Co-Authored-By: Claude Sonnet 4.6 --- Cargo.lock | 360 +++++++---------------------------------------------- Cargo.toml | 3 +- src/gui.rs | 2 +- 3 files changed, 46 insertions(+), 319 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c4bddfb..4494846 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -753,15 +753,6 @@ dependencies = [ "libc", ] -[[package]] -name = "core_maths" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77745e017f5edba1a9c1d854f6f3a52dac8a12dd5af5d2f54aecf61e43d80d30" -dependencies = [ - "libm", -] - [[package]] name = "cosmic-text" version = "0.12.1" @@ -769,14 +760,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59fd57d82eb4bfe7ffa9b1cec0c05e2fd378155b47f255a67983cb4afe0e80c2" dependencies = [ "bitflags 2.11.1", - "fontdb 0.16.2", + "fontdb", "log", "rangemap", "rayon", "rustc-hash 1.1.0", "rustybuzz", "self_cell", - "swash 0.1.19", + "swash", "sys-locale", "ttf-parser 0.21.1", "unicode-bidi", @@ -785,30 +776,6 @@ dependencies = [ "unicode-segmentation", ] -[[package]] -name = "cosmic-text" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "173852283a9a57a3cbe365d86e74dc428a09c50421477d5ad6fe9d9509e37737" -dependencies = [ - "bitflags 2.11.1", - "fontdb 0.23.0", - "harfrust", - "linebender_resource_handle", - "log", - "rangemap", - "rustc-hash 1.1.0", - "self_cell", - "skrifa 0.37.0", - "smol_str", - "swash 0.2.7", - "sys-locale", - "unicode-bidi", - "unicode-linebreak", - "unicode-script", - "unicode-segmentation", -] - [[package]] name = "cpufeatures" version = "0.2.17" @@ -1266,24 +1233,6 @@ dependencies = [ "bytemuck", ] -[[package]] -name = "font-types" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39a654f404bbcbd48ea58c617c2993ee91d1cb63727a37bf2323a4edeed1b8c5" -dependencies = [ - "bytemuck", -] - -[[package]] -name = "font-types" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b38ad915f6dadd993ced50848a8291a543bd41ca62bc10740d5e64e2ab4cfd7" -dependencies = [ - "bytemuck", -] - [[package]] name = "fontconfig-parser" version = "0.5.8" @@ -1307,20 +1256,6 @@ dependencies = [ "ttf-parser 0.20.0", ] -[[package]] -name = "fontdb" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "457e789b3d1202543297a350643cf459f836cade38934e7a4cf6a39e7cde2905" -dependencies = [ - "fontconfig-parser", - "log", - "memmap2", - "slotmap", - "tinyvec", - "ttf-parser 0.25.1", -] - [[package]] name = "foreign-types" version = "0.3.2" @@ -1659,19 +1594,6 @@ dependencies = [ "zerocopy", ] -[[package]] -name = "harfrust" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92c020db12c71d8a12a3fe7607873cade3a01a6287e29d540c8723276221b9d8" -dependencies = [ - "bitflags 2.11.1", - "bytemuck", - "core_maths", - "read-fonts 0.35.0", - "smallvec", -] - [[package]] name = "hashbrown" version = "0.12.3" @@ -1876,27 +1798,14 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88acfabc84ec077eaf9ede3457ffa3a104626d79022a9bf7f296093b1d60c73f" dependencies = [ - "iced_core 0.13.2", - "iced_futures 0.13.2", - "iced_renderer 0.13.0", - "iced_widget 0.13.4", + "iced_core", + "iced_futures", + "iced_renderer", + "iced_widget", "iced_winit", "thiserror 1.0.69", ] -[[package]] -name = "iced_aw" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e676b8d322a419c7eef29cac1aa78e8afda6a9d2d4597483d42de3e90378fe2" -dependencies = [ - "cfg-if", - "iced_core 0.14.0", - "iced_fonts", - "iced_widget 0.14.2", - "web-time", -] - [[package]] name = "iced_core" version = "0.13.2" @@ -1917,45 +1826,13 @@ dependencies = [ "web-time", ] -[[package]] -name = "iced_core" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ab1937d699403e7e69252ae743a902bcee9f4ab2052cc4c9a46fcf34729d85" -dependencies = [ - "bitflags 2.11.1", - "bytes", - "glam", - "lilt", - "log", - "num-traits", - "rustc-hash 2.1.2", - "smol_str", - "thiserror 2.0.18", - "web-time", -] - [[package]] name = "iced_fonts" -version = "0.3.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "214cff7c8499e328774216690e58e315a1a5f8f6fdd1035aed6298e62ffc4c1d" +checksum = "df7deb0800a850ee25c8a42559f72c0f249e577feb3aad37b9b65dc1e517e52a" dependencies = [ - "iced_core 0.14.0", - "iced_fonts_macros", - "iced_widget 0.14.2", -] - -[[package]] -name = "iced_fonts_macros" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef5125e110cb19cd1910a28298661c98c5d9ab02eef43594968352940e8752e" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.117", - "ttf-parser 0.25.1", + "iced_core", ] [[package]] @@ -1965,7 +1842,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c04a6745ba2e80f32cf01e034fd00d853aa4f4cd8b91888099cb7aaee0d5d7c" dependencies = [ "futures", - "iced_core 0.13.2", + "iced_core", "log", "rustc-hash 2.1.2", "tokio", @@ -1973,27 +1850,13 @@ dependencies = [ "wasm-timer", ] -[[package]] -name = "iced_futures" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c0c85ccad42dfbec7293c36c018af0ea0dbcc52d137a4a9a0b0f6822a3fdf0a" -dependencies = [ - "futures", - "iced_core 0.14.0", - "log", - "rustc-hash 2.1.2", - "wasm-bindgen-futures", - "wasmtimer", -] - [[package]] name = "iced_glyphon" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41c3bb56f1820ca252bc1d0994ece33d233a55657c0c263ea7cb16895adbde82" dependencies = [ - "cosmic-text 0.12.1", + "cosmic-text", "etagere", "lru", "rustc-hash 2.1.2", @@ -2008,10 +1871,10 @@ checksum = "ba25a18cfa6d5cc160aca7e1b34f73ccdff21680fa8702168c09739767b6c66f" dependencies = [ "bitflags 2.11.1", "bytemuck", - "cosmic-text 0.12.1", + "cosmic-text", "half", - "iced_core 0.13.2", - "iced_futures 0.13.2", + "iced_core", + "iced_futures", "log", "once_cell", "raw-window-handle", @@ -2020,49 +1883,19 @@ dependencies = [ "unicode-segmentation", ] -[[package]] -name = "iced_graphics" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "234ca1c2cec4155055f68fa5fad1b5242c496ac8238d80a259bca382fb44a102" -dependencies = [ - "bitflags 2.11.1", - "bytemuck", - "cosmic-text 0.15.0", - "half", - "iced_core 0.14.0", - "iced_futures 0.14.0", - "log", - "raw-window-handle", - "rustc-hash 2.1.2", - "thiserror 2.0.18", - "unicode-segmentation", -] - [[package]] name = "iced_renderer" version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73558208059f9e622df2bf434e044ee2f838ce75201a023cf0ca3e1244f46c2a" dependencies = [ - "iced_graphics 0.13.0", + "iced_graphics", "iced_tiny_skia", "iced_wgpu", "log", "thiserror 1.0.69", ] -[[package]] -name = "iced_renderer" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "250cc0802408e8c077986ec56c7d07c65f423ee658a4b9fd795a1f2aae5dac05" -dependencies = [ - "iced_graphics 0.14.0", - "log", - "thiserror 2.0.18", -] - [[package]] name = "iced_runtime" version = "0.13.2" @@ -2070,8 +1903,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "348b5b2c61c934d88ca3b0ed1ed913291e923d086a66fa288ce9669da9ef62b5" dependencies = [ "bytes", - "iced_core 0.13.2", - "iced_futures 0.13.2", + "iced_core", + "iced_futures", "raw-window-handle", "thiserror 1.0.69", ] @@ -2083,8 +1916,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c625d368284fcc43b0b36b176f76eff1abebe7959dd58bd8ce6897d641962a50" dependencies = [ "bytemuck", - "cosmic-text 0.12.1", - "iced_graphics 0.13.0", + "cosmic-text", + "iced_graphics", "kurbo", "log", "rustc-hash 2.1.2", @@ -2104,7 +1937,7 @@ dependencies = [ "glam", "guillotiere", "iced_glyphon", - "iced_graphics 0.13.0", + "iced_graphics", "log", "once_cell", "rustc-hash 2.1.2", @@ -2118,7 +1951,7 @@ version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81429e1b950b0e4bca65be4c4278fea6678ea782030a411778f26fa9f8983e1d" dependencies = [ - "iced_renderer 0.13.0", + "iced_renderer", "iced_runtime", "num-traits", "once_cell", @@ -2127,28 +1960,14 @@ dependencies = [ "unicode-segmentation", ] -[[package]] -name = "iced_widget" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1596afa0d3109c2618e8bc12bae6c11d3064df8f95c42dfce570397dbe957ab" -dependencies = [ - "iced_renderer 0.14.0", - "log", - "num-traits", - "rustc-hash 2.1.2", - "thiserror 2.0.18", - "unicode-segmentation", -] - [[package]] name = "iced_winit" version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f44cd4e1c594b6334f409282937bf972ba14d31fedf03c23aa595d982a2fda28" dependencies = [ - "iced_futures 0.13.2", - "iced_graphics 0.13.0", + "iced_futures", + "iced_graphics", "iced_runtime", "log", "rustc-hash 2.1.2", @@ -2497,21 +2316,6 @@ dependencies = [ "redox_syscall 0.7.4", ] -[[package]] -name = "lilt" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f67562e5eff6b20553fa9be1c503356768420994e28f67e3eafe6f41910e57ad" -dependencies = [ - "web-time", -] - -[[package]] -name = "linebender_resource_handle" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4a5ff6bcca6c4867b1c4fd4ef63e4db7436ef363e0ad7531d1558856bae64f4" - [[package]] name = "linux-raw-sys" version = "0.4.15" @@ -3105,9 +2909,9 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "orbclient" -version = "0.3.51" +version = "0.3.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59aed3b33578edcfa1bc96a321d590d31832b6ad55a26f0313362ce687e9abd6" +checksum = "12c6933ddbbd16539a7672e697bb8d41ac3a4e99ac43eeb40c07236bd7fcb2dd" dependencies = [ "libc", "libredox", @@ -3525,28 +3329,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69aacb76b5c29acfb7f90155d39759a29496aebb49395830e928a9703d2eec2f" dependencies = [ "bytemuck", - "font-types 0.7.3", -] - -[[package]] -name = "read-fonts" -version = "0.35.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6717cf23b488adf64b9d711329542ba34de147df262370221940dfabc2c91358" -dependencies = [ - "bytemuck", - "core_maths", - "font-types 0.10.1", -] - -[[package]] -name = "read-fonts" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b634fabf032fab15307ffd272149b622260f55974d9fad689292a5d33df02e5" -dependencies = [ - "bytemuck", - "font-types 0.11.3", + "font-types", ] [[package]] @@ -3998,27 +3781,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e1c44ad1f6c5bdd4eefed8326711b7dbda9ea45dfd36068c427d332aa382cbe" dependencies = [ "bytemuck", - "read-fonts 0.22.7", -] - -[[package]] -name = "skrifa" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c31071dedf532758ecf3fed987cdb4bd9509f900e026ab684b4ecb81ea49841" -dependencies = [ - "bytemuck", - "read-fonts 0.35.0", -] - -[[package]] -name = "skrifa" -version = "0.40.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fbdfe3d2475fbd7ddd1f3e5cf8288a30eb3e5f95832829570cd88115a7434ac" -dependencies = [ - "bytemuck", - "read-fonts 0.37.0", + "read-fonts", ] [[package]] @@ -4213,20 +3976,9 @@ version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cbd59f3f359ddd2c95af4758c18270eddd9c730dde98598023cdabff472c2ca2" dependencies = [ - "skrifa 0.22.3", - "yazi 0.1.6", - "zeno 0.2.3", -] - -[[package]] -name = "swash" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "842f3cd369c2ba38966204f983eaa5e54a8e84a7d7159ed36ade2b6c335aae64" -dependencies = [ - "skrifa 0.40.0", - "yazi 0.2.1", - "zeno 0.3.3", + "skrifa", + "yazi", + "zeno", ] [[package]] @@ -4438,9 +4190,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.52.0" +version = "1.52.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a91135f59b1cbf38c91e73cf3386fca9bb77915c45ce2771460c9d92f0f3d776" +checksum = "b67dee974fe86fd92cc45b7a95fdd2f99a36a6d7b0d431a231178d3d670bbcc6" dependencies = [ "bytes", "libc", @@ -4654,15 +4406,12 @@ name = "ttf-parser" version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2df906b07856748fa3f6e0ad0cbaa047052d4a7dd609e231c4f72cee8c36f31" -dependencies = [ - "core_maths", -] [[package]] name = "typenum" -version = "1.19.0" +version = "1.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" +checksum = "40ce102ab67701b8526c123c1bab5cbe42d7040ccfd0f64af1a385808d2f43de" [[package]] name = "uds_windows" @@ -4684,7 +4433,6 @@ dependencies = [ "directories", "dirs 5.0.1", "iced", - "iced_aw", "iced_fonts", "ksni", "owo-colors", @@ -4829,11 +4577,11 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] name = "wasip2" -version = "1.0.2+wasi-0.2.9" +version = "1.0.3+wasi-0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5" +checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6" dependencies = [ - "wit-bindgen", + "wit-bindgen 0.57.1", ] [[package]] @@ -4842,7 +4590,7 @@ version = "0.4.0+wasi-0.3.0-rc-2026-01-06" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5" dependencies = [ - "wit-bindgen", + "wit-bindgen 0.51.0", ] [[package]] @@ -4949,20 +4697,6 @@ dependencies = [ "semver", ] -[[package]] -name = "wasmtimer" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c598d6b99ea013e35844697fc4670d08339d5cda15588f193c6beedd12f644b" -dependencies = [ - "futures", - "js-sys", - "parking_lot 0.12.5", - "pin-utils", - "slab", - "wasm-bindgen", -] - [[package]] name = "wayland-backend" version = "0.3.15" @@ -5575,6 +5309,12 @@ dependencies = [ "wit-bindgen-rust-macro", ] +[[package]] +name = "wit-bindgen" +version = "0.57.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e" + [[package]] name = "wit-bindgen-core" version = "0.51.0" @@ -5739,12 +5479,6 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c94451ac9513335b5e23d7a8a2b61a7102398b8cca5160829d313e84c9d98be1" -[[package]] -name = "yazi" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e01738255b5a16e78bbb83e7fbba0a1e7dd506905cfc53f4622d89015a03fbb5" - [[package]] name = "yoke" version = "0.8.2" @@ -5836,12 +5570,6 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd15f8e0dbb966fd9245e7498c7e9e5055d9e5c8b676b95bd67091cd11a1e697" -[[package]] -name = "zeno" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6df3dc4292935e51816d896edcd52aa30bc297907c26167fec31e2b0c6a32524" - [[package]] name = "zerocopy" version = "0.8.48" diff --git a/Cargo.toml b/Cargo.toml index 440d68a..70cc8d0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -44,5 +44,4 @@ reqwest = { version = "0.12", features = ["blocking", "json"] } # GUI for the setup wizard iced = { version = "0.13", features = ["tokio"] } -iced_aw = { version = "0.13", default-features = false } -iced_fonts = { version = "0.3", features = ["bootstrap"] } +iced_fonts = { version = "0.1", features = ["bootstrap"] } diff --git a/src/gui.rs b/src/gui.rs index e813f5a..b0432c0 100644 --- a/src/gui.rs +++ b/src/gui.rs @@ -1167,7 +1167,7 @@ pub fn run(config: &Config) -> Result<()> { iced::application(|_: &Dashboard| String::from("umutray"), update, view) .subscription(subscription) .theme(|_| Theme::Dark) - .font(iced_aw::iced_fonts::BOOTSTRAP_FONT_BYTES) + .font(iced_fonts::BOOTSTRAP_FONT_BYTES) .window(iced::window::Settings { size: iced::Size::new(600.0, 560.0), ..Default::default()