From 8094a5cecb64c7ca05b45f1df787ddbb9a7084bf Mon Sep 17 00:00:00 2001 From: drendog Date: Sat, 25 Oct 2025 12:28:47 +0200 Subject: [PATCH] fix: missed slint local fork --- Cargo.lock | 108 +++++++++++++++++++++++++++++++++++++---------------- Cargo.toml | 18 ++++++--- 2 files changed, 88 insertions(+), 38 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 500242d..9dffe4d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 4 [[package]] name = "ab_glyph" -version = "0.2.28" +version = "0.2.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79faae4620f45232f599d9bc7b290f88247a0834162c4495ab2f02d60004adfb" +checksum = "01c0457472c38ea5bd1c3b5ada5e368271cb550be7a4ca4a0b4634e9913f6cc2" dependencies = [ "ab_glyph_rasterizer", "owned_ttf_parser", @@ -14,9 +14,9 @@ dependencies = [ [[package]] name = "ab_glyph_rasterizer" -version = "0.1.8" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" +checksum = "366ffbaa4442f4684d91e2cd7c5ea7c4ed8add41959a31447066e279e432b618" [[package]] name = "adler" @@ -32,9 +32,9 @@ checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" [[package]] name = "ahash" -version = "0.8.11" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75" dependencies = [ "cfg-if", "getrandom", @@ -592,6 +592,8 @@ dependencies = [ [[package]] name = "const-field-offset" version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91fcde4ca1211b5a94b573083c472ee19e86b19a441913f66e1cc5c41daf0255" dependencies = [ "const-field-offset-macro", "field-offset", @@ -600,6 +602,8 @@ dependencies = [ [[package]] name = "const-field-offset-macro" version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5387f5bbc9e9e6c96436ea125afa12614cebf8ac67f49abc08c1e7a891466c90" dependencies = [ "proc-macro2", "quote", @@ -946,7 +950,7 @@ dependencies = [ "log", "rgb", "slotmap", - "ttf-parser 0.25.1", + "ttf-parser", "wasm-bindgen", "web-sys", ] @@ -1025,7 +1029,7 @@ dependencies = [ "log", "slotmap", "tinyvec", - "ttf-parser 0.25.1", + "ttf-parser", ] [[package]] @@ -1219,13 +1223,14 @@ checksum = "5881e4c3c2433fe4905bb19cfd2b5d49d4248274862b68c27c33d9ba4e13f9ec" [[package]] name = "getrandom" -version = "0.2.15" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" dependencies = [ "cfg-if", "libc", - "wasi", + "r-efi", + "wasip2", ] [[package]] @@ -1384,6 +1389,8 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "i-slint-backend-linuxkms" version = "1.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8fd06c00fbdac3dd490cf5c10da7daad3820d775060a19ea277d8ab944a160b" dependencies = [ "calloop 0.14.3", "drm", @@ -1401,6 +1408,8 @@ dependencies = [ [[package]] name = "i-slint-backend-qt" version = "1.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c946891ff0bfa95a5944c7cfc18828b8e123edea1168301f1e1b5505aa82933e" dependencies = [ "const-field-offset", "i-slint-common", @@ -1412,6 +1421,8 @@ dependencies = [ [[package]] name = "i-slint-backend-selector" version = "1.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e138660c634d6bbdf98bb2d0cfa487cda28e032e133a2a2c974f1cc494198765" dependencies = [ "cfg-if", "i-slint-backend-linuxkms", @@ -1425,6 +1436,8 @@ dependencies = [ [[package]] name = "i-slint-backend-winit" version = "1.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69bf9167fb1165942ef1f034e039645b60b07b23c0c76069cb83595f979243a4" dependencies = [ "cfg-if", "cfg_aliases", @@ -1458,14 +1471,18 @@ dependencies = [ [[package]] name = "i-slint-common" version = "1.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3566194c13f8dcf6e9f41a2090c96f08cf3f59b60c91380a86c1ed72f6e7d19" dependencies = [ "fontique", - "ttf-parser 0.25.1", + "ttf-parser", ] [[package]] name = "i-slint-compiler" version = "1.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a301031f6c1da6acdd483641cc44109b34990e5edd67478eb0cbca359ab7ae3f" dependencies = [ "by_address", "codemap", @@ -1489,6 +1506,8 @@ dependencies = [ [[package]] name = "i-slint-core" version = "1.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc140f1218cfc4451b9e8753306c42afbcaf0386cc888e53664c1a5f5330ae19" dependencies = [ "auto_enums", "bitflags 2.10.0", @@ -1532,6 +1551,8 @@ dependencies = [ [[package]] name = "i-slint-core-macros" version = "1.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4c6a3975ccaa66415f5524292750e631879e69178aa97e3928d2396b790d00d" dependencies = [ "quote", "serde_json", @@ -1541,6 +1562,8 @@ dependencies = [ [[package]] name = "i-slint-renderer-femtovg" version = "1.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03d85d77f899ecb1f05c50c659a6d356fba44463686713f1f925c8be48de6afb" dependencies = [ "cfg-if", "const-field-offset", @@ -1554,7 +1577,7 @@ dependencies = [ "lyon_path", "pin-weak", "rgb", - "ttf-parser 0.25.1", + "ttf-parser", "wasm-bindgen", "web-sys", ] @@ -1562,6 +1585,8 @@ dependencies = [ [[package]] name = "i-slint-renderer-skia" version = "1.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e26ed0d42d66c457b7937d7f5ee07d2fbef3691c896a26212a69b30288844ddd" dependencies = [ "bytemuck", "cfg-if", @@ -2574,11 +2599,11 @@ dependencies = [ [[package]] name = "owned_ttf_parser" -version = "0.24.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "490d3a563d3122bf7c911a59b0add9389e5ec0f5f0c3ac6b91ff235a0e6a7f90" +checksum = "36820e9051aca1014ddc75770aab4d68bc1e9e632f0f5627c4086bc216fb583b" dependencies = [ - "ttf-parser 0.24.1", + "ttf-parser", ] [[package]] @@ -2757,6 +2782,12 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "r-efi" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" + [[package]] name = "raw-window-handle" version = "0.6.2" @@ -2941,7 +2972,7 @@ dependencies = [ "core_maths", "log", "smallvec", - "ttf-parser 0.25.1", + "ttf-parser", "unicode-bidi-mirroring", "unicode-ccc", "unicode-properties", @@ -3148,6 +3179,8 @@ dependencies = [ [[package]] name = "slint" version = "1.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c35c4bdca2c42c69b21ceb416aa4ba76c3f54df30e9ce85dcad0742229422a6" dependencies = [ "const-field-offset", "i-slint-backend-selector", @@ -3165,6 +3198,8 @@ dependencies = [ [[package]] name = "slint-interpreter" version = "1.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bff6c49db734e5ef1887ae5a5de0dc91b9aa2e9eb15956dcaaa3e9aac20947f0" dependencies = [ "derive_more", "generativity", @@ -3186,6 +3221,8 @@ dependencies = [ [[package]] name = "slint-macros" version = "1.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6b4b4bada19852716991153ddd93bf133548ac74383a05db8df399b9003bbfe" dependencies = [ "i-slint-compiler", "proc-macro2", @@ -3627,12 +3664,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "ttf-parser" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be21190ff5d38e8b4a2d3b6a3ae57f612cc39c96e83cedeaf7abc338a8bac4a" - [[package]] name = "ttf-parser" version = "0.25.1" @@ -3808,6 +3839,8 @@ checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "vtable" version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "753be81c38dff787d177b5939af1fa16f72f0d0d21a6b7d74ae56e29cd26f2a6" dependencies = [ "const-field-offset", "portable-atomic", @@ -3818,6 +3851,8 @@ dependencies = [ [[package]] name = "vtable-macro" version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cfcf6171aa2b0f85718ca5888ca32f6edf61d1849f8e4b3786ad890e5b68f68" dependencies = [ "proc-macro2", "quote", @@ -3835,10 +3870,13 @@ dependencies = [ ] [[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" +name = "wasip2" +version = "1.0.1+wasi-0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" +dependencies = [ + "wit-bindgen", +] [[package]] name = "wasm-bindgen" @@ -3999,9 +4037,9 @@ dependencies = [ [[package]] name = "wayland-protocols-plasma" -version = "0.3.3" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f79f2d57c7fcc6ab4d602adba364bf59a5c24de57bd194486bf9b8360e06bfc4" +checksum = "a07a14257c077ab3279987c4f8bb987851bf57081b93710381daea94f2c2c032" dependencies = [ "bitflags 2.10.0", "wayland-backend", @@ -4640,6 +4678,12 @@ dependencies = [ "memchr", ] +[[package]] +name = "wit-bindgen" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" + [[package]] name = "write-fonts" version = "0.43.0" @@ -4818,18 +4862,18 @@ checksum = "6df3dc4292935e51816d896edcd52aa30bc297907c26167fec31e2b0c6a32524" [[package]] name = "zerocopy" -version = "0.7.35" +version = "0.8.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.35" +version = "0.8.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 7784206..a80843d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,16 +25,22 @@ glutin = { version = "0.32.3", default-features = false, features = [ ] } log = "0.4.28" raw-window-handle = "0.6.2" -# slint = { version = "1.14.1", default-features = false, features = [ -# "compat-1-2", -# "renderer-femtovg", -# ] } -slint = { path = "../slint/api/rs/slint", default-features = false, features = [ +slint = { version = "1.14.1", default-features = false, features = [ "compat-1-2", "renderer-femtovg", "backend-winit-wayland", ] } -slint-interpreter = { path = "../slint/internal/interpreter", default-features = false, features = ["compat-1-2"] } +# slint = { path = "../slint/api/rs/slint", default-features = false, features = [ +# "compat-1-2", +# "renderer-femtovg", +# "backend-winit-wayland", +# ] } +slint-interpreter = { version = "1.14.1", default-features = false, features = [ + "compat-1-2", +] } +# slint-interpreter = { path = "../slint/internal/interpreter", default-features = false, features = [ +# "compat-1-2", +# ] } smithay-client-toolkit = "0.20.0" thiserror = "2.0.17" wayland-client = "0.31.11"