limeth/acid
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Use patched versions of some dependencies

Browse source
This commit is contained in:
Jakub Hlusička 2026-01-30 00:37:46 +01:00
parent 3b24825677
commit d4aad0e8cd
2 changed files with 29 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
firmware/Cargo.lock generated
View file

@ -38,7 +38,7 @@ dependencies = [
"esp-sync", "esp-sync",
"gix", "gix",
"hmac", "hmac",
"i-slint-common 1.14.1 (registry+https://github.com/rust-lang/crates.io-index)", "i-slint-common",
"i-slint-core", "i-slint-core",
"indoc", "indoc",
"itertools 0.14.0", "itertools 0.14.0",
@ -957,6 +957,7 @@ checksum = "0b396d1f76d455557e1218ec8066ae14bba60b4b36ecd55577ba979f5db7ecaa"
[[package]] [[package]]
name = "const-field-offset" name = "const-field-offset"
version = "0.1.5" version = "0.1.5"
source = "git+https://github.com/Limeth/slint?rev=c2e5d05df2476557a299a78664e148d2fe62427d#c2e5d05df2476557a299a78664e148d2fe62427d"
dependencies = [ dependencies = [
"const-field-offset-macro", "const-field-offset-macro",
"field-offset", "field-offset",
@ -965,6 +966,7 @@ dependencies = [
[[package]] [[package]]
name = "const-field-offset-macro" name = "const-field-offset-macro"
version = "0.1.5" version = "0.1.5"
source = "git+https://github.com/Limeth/slint?rev=c2e5d05df2476557a299a78664e148d2fe62427d#c2e5d05df2476557a299a78664e148d2fe62427d"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -3822,11 +3824,12 @@ dependencies = [
[[package]] [[package]]
name = "i-slint-backend-linuxkms" name = "i-slint-backend-linuxkms"
version = "1.14.1" version = "1.14.1"
source = "git+https://github.com/Limeth/slint?rev=c2e5d05df2476557a299a78664e148d2fe62427d#c2e5d05df2476557a299a78664e148d2fe62427d"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"calloop 0.14.3", "calloop 0.14.3",
"drm", "drm",
"i-slint-common 1.14.1", "i-slint-common",
"i-slint-core", "i-slint-core",
"input", "input",
"memmap2", "memmap2",
@ -3837,11 +3840,12 @@ dependencies = [
[[package]] [[package]]
name = "i-slint-backend-selector" name = "i-slint-backend-selector"
version = "1.14.1" version = "1.14.1"
source = "git+https://github.com/Limeth/slint?rev=c2e5d05df2476557a299a78664e148d2fe62427d#c2e5d05df2476557a299a78664e148d2fe62427d"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"i-slint-backend-linuxkms", "i-slint-backend-linuxkms",
"i-slint-backend-winit", "i-slint-backend-winit",
"i-slint-common 1.14.1", "i-slint-common",
"i-slint-core", "i-slint-core",
"i-slint-core-macros", "i-slint-core-macros",
] ]
@ -3849,6 +3853,7 @@ dependencies = [
[[package]] [[package]]
name = "i-slint-backend-winit" name = "i-slint-backend-winit"
version = "1.14.1" version = "1.14.1"
source = "git+https://github.com/Limeth/slint?rev=c2e5d05df2476557a299a78664e148d2fe62427d#c2e5d05df2476557a299a78664e148d2fe62427d"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"cfg-if", "cfg-if",
@ -3856,7 +3861,7 @@ dependencies = [
"copypasta", "copypasta",
"derive_more", "derive_more",
"futures", "futures",
"i-slint-common 1.14.1", "i-slint-common",
"i-slint-core", "i-slint-core",
"i-slint-core-macros", "i-slint-core-macros",
"i-slint-renderer-skia", "i-slint-renderer-skia",
@ -3882,27 +3887,23 @@ dependencies = [
[[package]] [[package]]
name = "i-slint-common" name = "i-slint-common"
version = "1.14.1" version = "1.14.1"
source = "git+https://github.com/Limeth/slint?rev=c2e5d05df2476557a299a78664e148d2fe62427d#c2e5d05df2476557a299a78664e148d2fe62427d"
dependencies = [ dependencies = [
"fontique", "fontique",
"ttf-parser 0.25.1", "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]] [[package]]
name = "i-slint-compiler" name = "i-slint-compiler"
version = "1.14.1" version = "1.14.1"
source = "git+https://github.com/Limeth/slint?rev=c2e5d05df2476557a299a78664e148d2fe62427d#c2e5d05df2476557a299a78664e148d2fe62427d"
dependencies = [ dependencies = [
"by_address", "by_address",
"codemap", "codemap",
"codemap-diagnostic", "codemap-diagnostic",
"derive_more", "derive_more",
"fontdue", "fontdue",
"i-slint-common 1.14.1", "i-slint-common",
"image", "image",
"itertools 0.14.0", "itertools 0.14.0",
"linked_hash_set", "linked_hash_set",
@ -3924,6 +3925,7 @@ dependencies = [
[[package]] [[package]]
name = "i-slint-core" name = "i-slint-core"
version = "1.14.1" version = "1.14.1"
source = "git+https://github.com/Limeth/slint?rev=c2e5d05df2476557a299a78664e148d2fe62427d#c2e5d05df2476557a299a78664e148d2fe62427d"
dependencies = [ dependencies = [
"auto_enums", "auto_enums",
"bitflags 2.10.0", "bitflags 2.10.0",
@ -3935,7 +3937,7 @@ dependencies = [
"derive_more", "derive_more",
"euclid", "euclid",
"fontdue", "fontdue",
"i-slint-common 1.14.1", "i-slint-common",
"i-slint-core-macros", "i-slint-core-macros",
"image", "image",
"integer-sqrt", "integer-sqrt",
@ -3970,6 +3972,7 @@ dependencies = [
[[package]] [[package]]
name = "i-slint-core-macros" name = "i-slint-core-macros"
version = "1.14.1" version = "1.14.1"
source = "git+https://github.com/Limeth/slint?rev=c2e5d05df2476557a299a78664e148d2fe62427d#c2e5d05df2476557a299a78664e148d2fe62427d"
dependencies = [ dependencies = [
"quote", "quote",
"serde_json", "serde_json",
@ -3979,6 +3982,7 @@ dependencies = [
[[package]] [[package]]
name = "i-slint-renderer-skia" name = "i-slint-renderer-skia"
version = "1.14.1" version = "1.14.1"
source = "git+https://github.com/Limeth/slint?rev=c2e5d05df2476557a299a78664e148d2fe62427d#c2e5d05df2476557a299a78664e148d2fe62427d"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"cfg-if", "cfg-if",
@ -3987,7 +3991,7 @@ dependencies = [
"derive_more", "derive_more",
"glow", "glow",
"glutin", "glutin",
"i-slint-common 1.14.1", "i-slint-common",
"i-slint-core", "i-slint-core",
"i-slint-core-macros", "i-slint-core-macros",
"lyon_path", "lyon_path",
@ -6734,6 +6738,7 @@ checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
[[package]] [[package]]
name = "slint" name = "slint"
version = "1.14.1" version = "1.14.1"
source = "git+https://github.com/Limeth/slint?rev=c2e5d05df2476557a299a78664e148d2fe62427d#c2e5d05df2476557a299a78664e148d2fe62427d"
dependencies = [ dependencies = [
"const-field-offset", "const-field-offset",
"i-slint-backend-selector", "i-slint-backend-selector",
@ -6751,8 +6756,7 @@ dependencies = [
[[package]] [[package]]
name = "slint-build" name = "slint-build"
version = "1.14.1" version = "1.14.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/Limeth/slint?rev=c2e5d05df2476557a299a78664e148d2fe62427d#c2e5d05df2476557a299a78664e148d2fe62427d"
checksum = "e6f9e30dfc58198894a4a4fe38d126a24ed4121d11cd8564643f3b7915752adc"
dependencies = [ dependencies = [
"derive_more", "derive_more",
"i-slint-compiler", "i-slint-compiler",
@ -6763,6 +6767,7 @@ dependencies = [
[[package]] [[package]]
name = "slint-macros" name = "slint-macros"
version = "1.14.1" version = "1.14.1"
source = "git+https://github.com/Limeth/slint?rev=c2e5d05df2476557a299a78664e148d2fe62427d#c2e5d05df2476557a299a78664e148d2fe62427d"
dependencies = [ dependencies = [
"i-slint-compiler", "i-slint-compiler",
"proc-macro2", "proc-macro2",
@ -7670,6 +7675,7 @@ dependencies = [
[[package]] [[package]]
name = "vtable" name = "vtable"
version = "0.3.0" version = "0.3.0"
source = "git+https://github.com/Limeth/slint?rev=c2e5d05df2476557a299a78664e148d2fe62427d#c2e5d05df2476557a299a78664e148d2fe62427d"
dependencies = [ dependencies = [
"const-field-offset", "const-field-offset",
"portable-atomic", "portable-atomic",
@ -7680,6 +7686,7 @@ dependencies = [
[[package]] [[package]]
name = "vtable-macro" name = "vtable-macro"
version = "0.3.0" version = "0.3.0"
source = "git+https://github.com/Limeth/slint?rev=c2e5d05df2476557a299a78664e148d2fe62427d#c2e5d05df2476557a299a78664e148d2fe62427d"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -8765,7 +8772,3 @@ dependencies = [
"syn 2.0.114", "syn 2.0.114",
"winnow", "winnow",
] ]
[[patch.unused]]
name = "scrypt"
version = "0.12.0-rc.8"

11
firmware/acid-firmware/Cargo.toml
View file

@ -66,9 +66,6 @@ bitflags = "2.10.0"
paste = { package = "pastey", version = "0.2.1" } paste = { package = "pastey", version = "0.2.1" }
itertools = { version = "0.14.0", default-features = false } itertools = { version = "0.14.0", default-features = false }
bytemuck = "1.24.0" 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" critical-section = "1.2.0"
cfg-if = "1.0.4" cfg-if = "1.0.4"
xkbcommon = { git = "https://github.com/Limeth/xkbcommon-rs", branch = "esp32s3", default-features = false, features = ["c-lib-wrap"] } 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"] } tinyvec = { version = "1.10.0", default-features = false, features = ["alloc"] }
esp-metadata-generated = { version = "0.3.0", features = ["esp32s3"] } 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 # Crates for serial UART CLI
embedded-cli = { version = "0.2.1", default-features = false, features = ["help", "macros"] } embedded-cli = { version = "0.2.1", default-features = false, features = ["help", "macros"] }
embedded-io = "0.7" embedded-io = "0.7"
@ -115,7 +118,7 @@ json = "0.12"
const-gen = "1.6" const-gen = "1.6"
embuild = "0.33" embuild = "0.33"
cc = "1.2.9" 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"] } gix = { version = "0.78", default-features = false, features = ["max-performance", "status"] }
indoc = "2.0.7" indoc = "2.0.7"