From d4aad0e8cdfbda3e431328653f613c151dda628e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Hlusi=C4=8Dka?= Date: Fri, 30 Jan 2026 00:37:46 +0100 Subject: [PATCH] Use patched versions of some dependencies --- firmware/Cargo.lock | 41 +++++++++++++++++-------------- firmware/acid-firmware/Cargo.toml | 11 ++++++--- 2 files changed, 29 insertions(+), 23 deletions(-) diff --git a/firmware/Cargo.lock b/firmware/Cargo.lock index 06e9916..09d29cf 100644 --- a/firmware/Cargo.lock +++ b/firmware/Cargo.lock @@ -38,7 +38,7 @@ dependencies = [ "esp-sync", "gix", "hmac", - "i-slint-common 1.14.1 (registry+https://github.com/rust-lang/crates.io-index)", + "i-slint-common", "i-slint-core", "indoc", "itertools 0.14.0", @@ -957,6 +957,7 @@ checksum = "0b396d1f76d455557e1218ec8066ae14bba60b4b36ecd55577ba979f5db7ecaa" [[package]] name = "const-field-offset" version = "0.1.5" +source = "git+https://github.com/Limeth/slint?rev=c2e5d05df2476557a299a78664e148d2fe62427d#c2e5d05df2476557a299a78664e148d2fe62427d" dependencies = [ "const-field-offset-macro", "field-offset", @@ -965,6 +966,7 @@ dependencies = [ [[package]] name = "const-field-offset-macro" version = "0.1.5" +source = "git+https://github.com/Limeth/slint?rev=c2e5d05df2476557a299a78664e148d2fe62427d#c2e5d05df2476557a299a78664e148d2fe62427d" dependencies = [ "proc-macro2", "quote", @@ -3822,11 +3824,12 @@ dependencies = [ [[package]] name = "i-slint-backend-linuxkms" version = "1.14.1" +source = "git+https://github.com/Limeth/slint?rev=c2e5d05df2476557a299a78664e148d2fe62427d#c2e5d05df2476557a299a78664e148d2fe62427d" dependencies = [ "bytemuck", "calloop 0.14.3", "drm", - "i-slint-common 1.14.1", + "i-slint-common", "i-slint-core", "input", "memmap2", @@ -3837,11 +3840,12 @@ dependencies = [ [[package]] name = "i-slint-backend-selector" version = "1.14.1" +source = "git+https://github.com/Limeth/slint?rev=c2e5d05df2476557a299a78664e148d2fe62427d#c2e5d05df2476557a299a78664e148d2fe62427d" dependencies = [ "cfg-if", "i-slint-backend-linuxkms", "i-slint-backend-winit", - "i-slint-common 1.14.1", + "i-slint-common", "i-slint-core", "i-slint-core-macros", ] @@ -3849,6 +3853,7 @@ dependencies = [ [[package]] name = "i-slint-backend-winit" version = "1.14.1" +source = "git+https://github.com/Limeth/slint?rev=c2e5d05df2476557a299a78664e148d2fe62427d#c2e5d05df2476557a299a78664e148d2fe62427d" dependencies = [ "bytemuck", "cfg-if", @@ -3856,7 +3861,7 @@ dependencies = [ "copypasta", "derive_more", "futures", - "i-slint-common 1.14.1", + "i-slint-common", "i-slint-core", "i-slint-core-macros", "i-slint-renderer-skia", @@ -3882,27 +3887,23 @@ dependencies = [ [[package]] name = "i-slint-common" version = "1.14.1" +source = "git+https://github.com/Limeth/slint?rev=c2e5d05df2476557a299a78664e148d2fe62427d#c2e5d05df2476557a299a78664e148d2fe62427d" dependencies = [ "fontique", "ttf-parser 0.25.1", ] -[[package]] -name = "i-slint-common" -version = "1.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3566194c13f8dcf6e9f41a2090c96f08cf3f59b60c91380a86c1ed72f6e7d19" - [[package]] name = "i-slint-compiler" version = "1.14.1" +source = "git+https://github.com/Limeth/slint?rev=c2e5d05df2476557a299a78664e148d2fe62427d#c2e5d05df2476557a299a78664e148d2fe62427d" dependencies = [ "by_address", "codemap", "codemap-diagnostic", "derive_more", "fontdue", - "i-slint-common 1.14.1", + "i-slint-common", "image", "itertools 0.14.0", "linked_hash_set", @@ -3924,6 +3925,7 @@ dependencies = [ [[package]] name = "i-slint-core" version = "1.14.1" +source = "git+https://github.com/Limeth/slint?rev=c2e5d05df2476557a299a78664e148d2fe62427d#c2e5d05df2476557a299a78664e148d2fe62427d" dependencies = [ "auto_enums", "bitflags 2.10.0", @@ -3935,7 +3937,7 @@ dependencies = [ "derive_more", "euclid", "fontdue", - "i-slint-common 1.14.1", + "i-slint-common", "i-slint-core-macros", "image", "integer-sqrt", @@ -3970,6 +3972,7 @@ dependencies = [ [[package]] name = "i-slint-core-macros" version = "1.14.1" +source = "git+https://github.com/Limeth/slint?rev=c2e5d05df2476557a299a78664e148d2fe62427d#c2e5d05df2476557a299a78664e148d2fe62427d" dependencies = [ "quote", "serde_json", @@ -3979,6 +3982,7 @@ dependencies = [ [[package]] name = "i-slint-renderer-skia" version = "1.14.1" +source = "git+https://github.com/Limeth/slint?rev=c2e5d05df2476557a299a78664e148d2fe62427d#c2e5d05df2476557a299a78664e148d2fe62427d" dependencies = [ "bytemuck", "cfg-if", @@ -3987,7 +3991,7 @@ dependencies = [ "derive_more", "glow", "glutin", - "i-slint-common 1.14.1", + "i-slint-common", "i-slint-core", "i-slint-core-macros", "lyon_path", @@ -6734,6 +6738,7 @@ checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589" [[package]] name = "slint" version = "1.14.1" +source = "git+https://github.com/Limeth/slint?rev=c2e5d05df2476557a299a78664e148d2fe62427d#c2e5d05df2476557a299a78664e148d2fe62427d" dependencies = [ "const-field-offset", "i-slint-backend-selector", @@ -6751,8 +6756,7 @@ dependencies = [ [[package]] name = "slint-build" version = "1.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6f9e30dfc58198894a4a4fe38d126a24ed4121d11cd8564643f3b7915752adc" +source = "git+https://github.com/Limeth/slint?rev=c2e5d05df2476557a299a78664e148d2fe62427d#c2e5d05df2476557a299a78664e148d2fe62427d" dependencies = [ "derive_more", "i-slint-compiler", @@ -6763,6 +6767,7 @@ dependencies = [ [[package]] name = "slint-macros" version = "1.14.1" +source = "git+https://github.com/Limeth/slint?rev=c2e5d05df2476557a299a78664e148d2fe62427d#c2e5d05df2476557a299a78664e148d2fe62427d" dependencies = [ "i-slint-compiler", "proc-macro2", @@ -7670,6 +7675,7 @@ dependencies = [ [[package]] name = "vtable" version = "0.3.0" +source = "git+https://github.com/Limeth/slint?rev=c2e5d05df2476557a299a78664e148d2fe62427d#c2e5d05df2476557a299a78664e148d2fe62427d" dependencies = [ "const-field-offset", "portable-atomic", @@ -7680,6 +7686,7 @@ dependencies = [ [[package]] name = "vtable-macro" version = "0.3.0" +source = "git+https://github.com/Limeth/slint?rev=c2e5d05df2476557a299a78664e148d2fe62427d#c2e5d05df2476557a299a78664e148d2fe62427d" dependencies = [ "proc-macro2", "quote", @@ -8765,7 +8772,3 @@ dependencies = [ "syn 2.0.114", "winnow", ] - -[[patch.unused]] -name = "scrypt" -version = "0.12.0-rc.8" diff --git a/firmware/acid-firmware/Cargo.toml b/firmware/acid-firmware/Cargo.toml index ac0305b..7e7d1bd 100644 --- a/firmware/acid-firmware/Cargo.toml +++ b/firmware/acid-firmware/Cargo.toml @@ -66,9 +66,6 @@ bitflags = "2.10.0" paste = { package = "pastey", version = "0.2.1" } itertools = { version = "0.14.0", default-features = false } bytemuck = "1.24.0" -slint = { version = "1.14.1", default-features = false, features = ["compat-1-2", "libm", "log", "unsafe-single-threaded", "renderer-software"]} -i-slint-common = "1.14.1" -i-slint-core = { version = "1.14.1", default-features = false } critical-section = "1.2.0" cfg-if = "1.0.4" xkbcommon = { git = "https://github.com/Limeth/xkbcommon-rs", branch = "esp32s3", default-features = false, features = ["c-lib-wrap"] } @@ -90,6 +87,12 @@ chrono = { version = "0.4.43", default-features = false, features = ["alloc", "s tinyvec = { version = "1.10.0", default-features = false, features = ["alloc"] } esp-metadata-generated = { version = "0.3.0", features = ["esp32s3"] } +# A fork of slint with patches for `allocator_api` support. +# Don't forget to change `slint-build` in build dependencies, if this is changed. +slint = { version = "1.14.1", git = "https://github.com/Limeth/slint", rev = "c2e5d05df2476557a299a78664e148d2fe62427d", default-features = false, features = ["compat-1-2", "libm", "log", "unsafe-single-threaded", "renderer-software"]} +i-slint-common = { version = "1.14.1", git = "https://github.com/Limeth/slint", rev = "c2e5d05df2476557a299a78664e148d2fe62427d" } +i-slint-core = { version = "1.14.1", git = "https://github.com/Limeth/slint", rev = "c2e5d05df2476557a299a78664e148d2fe62427d", default-features = false } + # Crates for serial UART CLI embedded-cli = { version = "0.2.1", default-features = false, features = ["help", "macros"] } embedded-io = "0.7" @@ -115,7 +118,7 @@ json = "0.12" const-gen = "1.6" embuild = "0.33" cc = "1.2.9" -slint-build = "1.14.1" +slint-build = { version = "1.14.1", git = "https://github.com/Limeth/slint", rev = "c2e5d05df2476557a299a78664e148d2fe62427d" } gix = { version = "0.78", default-features = false, features = ["max-performance", "status"] } indoc = "2.0.7"