diff --git a/Cargo.lock b/Cargo.lock index aebfa6206..6cc0f672c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1092,26 +1092,26 @@ dependencies = [ [[package]] name = "craft-aep" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=28c95c4a586acd2716b8ee89a34594f403a6fb14#28c95c4a586acd2716b8ee89a34594f403a6fb14" +source = "git+https://github.com/storytold/craft-libs?rev=68b8171b0d2c133d4a99ed3ae621e9ebb74a703f#68b8171b0d2c133d4a99ed3ae621e9ebb74a703f" [[package]] name = "craft-audio" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=28c95c4a586acd2716b8ee89a34594f403a6fb14#28c95c4a586acd2716b8ee89a34594f403a6fb14" +source = "git+https://github.com/storytold/craft-libs?rev=68b8171b0d2c133d4a99ed3ae621e9ebb74a703f#68b8171b0d2c133d4a99ed3ae621e9ebb74a703f" dependencies = [ - "craft-media 0.1.0 (git+https://github.com/storytold/craft-libs?rev=28c95c4a586acd2716b8ee89a34594f403a6fb14)", + "craft-media 0.1.0 (git+https://github.com/storytold/craft-libs?rev=68b8171b0d2c133d4a99ed3ae621e9ebb74a703f)", "thiserror 2.0.21", ] [[package]] name = "craft-docpath" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=28c95c4a586acd2716b8ee89a34594f403a6fb14#28c95c4a586acd2716b8ee89a34594f403a6fb14" +source = "git+https://github.com/storytold/craft-libs?rev=68b8171b0d2c133d4a99ed3ae621e9ebb74a703f#68b8171b0d2c133d4a99ed3ae621e9ebb74a703f" [[package]] name = "craft-dpx" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=28c95c4a586acd2716b8ee89a34594f403a6fb14#28c95c4a586acd2716b8ee89a34594f403a6fb14" +source = "git+https://github.com/storytold/craft-libs?rev=68b8171b0d2c133d4a99ed3ae621e9ebb74a703f#68b8171b0d2c133d4a99ed3ae621e9ebb74a703f" dependencies = [ "thiserror 2.0.21", ] @@ -1119,7 +1119,7 @@ dependencies = [ [[package]] name = "craft-ecproj-format" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=28c95c4a586acd2716b8ee89a34594f403a6fb14#28c95c4a586acd2716b8ee89a34594f403a6fb14" +source = "git+https://github.com/storytold/craft-libs?rev=68b8171b0d2c133d4a99ed3ae621e9ebb74a703f#68b8171b0d2c133d4a99ed3ae621e9ebb74a703f" dependencies = [ "serde", "serde_json", @@ -1129,12 +1129,12 @@ dependencies = [ [[package]] name = "craft-eps" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=28c95c4a586acd2716b8ee89a34594f403a6fb14#28c95c4a586acd2716b8ee89a34594f403a6fb14" +source = "git+https://github.com/storytold/craft-libs?rev=68b8171b0d2c133d4a99ed3ae621e9ebb74a703f#68b8171b0d2c133d4a99ed3ae621e9ebb74a703f" [[package]] name = "craft-exr" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=28c95c4a586acd2716b8ee89a34594f403a6fb14#28c95c4a586acd2716b8ee89a34594f403a6fb14" +source = "git+https://github.com/storytold/craft-libs?rev=68b8171b0d2c133d4a99ed3ae621e9ebb74a703f#68b8171b0d2c133d4a99ed3ae621e9ebb74a703f" dependencies = [ "serde_json", ] @@ -1142,12 +1142,12 @@ dependencies = [ [[package]] name = "craft-fonts-build" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=28c95c4a586acd2716b8ee89a34594f403a6fb14#28c95c4a586acd2716b8ee89a34594f403a6fb14" +source = "git+https://github.com/storytold/craft-libs?rev=68b8171b0d2c133d4a99ed3ae621e9ebb74a703f#68b8171b0d2c133d4a99ed3ae621e9ebb74a703f" [[package]] name = "craft-gif" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=28c95c4a586acd2716b8ee89a34594f403a6fb14#28c95c4a586acd2716b8ee89a34594f403a6fb14" +source = "git+https://github.com/storytold/craft-libs?rev=68b8171b0d2c133d4a99ed3ae621e9ebb74a703f#68b8171b0d2c133d4a99ed3ae621e9ebb74a703f" dependencies = [ "image", ] @@ -1155,7 +1155,7 @@ dependencies = [ [[package]] name = "craft-i18n" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=28c95c4a586acd2716b8ee89a34594f403a6fb14#28c95c4a586acd2716b8ee89a34594f403a6fb14" +source = "git+https://github.com/storytold/craft-libs?rev=68b8171b0d2c133d4a99ed3ae621e9ebb74a703f#68b8171b0d2c133d4a99ed3ae621e9ebb74a703f" dependencies = [ "fixed_decimal", "icu_decimal", @@ -1178,8 +1178,9 @@ dependencies = [ [[package]] name = "craft-lottie" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=28c95c4a586acd2716b8ee89a34594f403a6fb14#28c95c4a586acd2716b8ee89a34594f403a6fb14" +source = "git+https://github.com/storytold/craft-libs?rev=68b8171b0d2c133d4a99ed3ae621e9ebb74a703f#68b8171b0d2c133d4a99ed3ae621e9ebb74a703f" dependencies = [ + "craft-zip", "serde_json", "thiserror 2.0.21", ] @@ -1187,7 +1188,7 @@ dependencies = [ [[package]] name = "craft-media" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=28c95c4a586acd2716b8ee89a34594f403a6fb14#28c95c4a586acd2716b8ee89a34594f403a6fb14" +source = "git+https://github.com/storytold/craft-libs?rev=68b8171b0d2c133d4a99ed3ae621e9ebb74a703f#68b8171b0d2c133d4a99ed3ae621e9ebb74a703f" dependencies = [ "thiserror 2.0.21", ] @@ -1203,7 +1204,7 @@ dependencies = [ [[package]] name = "craft-mesh" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=28c95c4a586acd2716b8ee89a34594f403a6fb14#28c95c4a586acd2716b8ee89a34594f403a6fb14" +source = "git+https://github.com/storytold/craft-libs?rev=68b8171b0d2c133d4a99ed3ae621e9ebb74a703f#68b8171b0d2c133d4a99ed3ae621e9ebb74a703f" dependencies = [ "miniz_oxide 0.9.1", "serde_json", @@ -1212,7 +1213,7 @@ dependencies = [ [[package]] name = "craft-pdf" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=28c95c4a586acd2716b8ee89a34594f403a6fb14#28c95c4a586acd2716b8ee89a34594f403a6fb14" +source = "git+https://github.com/storytold/craft-libs?rev=68b8171b0d2c133d4a99ed3ae621e9ebb74a703f#68b8171b0d2c133d4a99ed3ae621e9ebb74a703f" dependencies = [ "hayro-syntax", "thiserror 2.0.21", @@ -1221,7 +1222,7 @@ dependencies = [ [[package]] name = "craft-psd" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=28c95c4a586acd2716b8ee89a34594f403a6fb14#28c95c4a586acd2716b8ee89a34594f403a6fb14" +source = "git+https://github.com/storytold/craft-libs?rev=68b8171b0d2c133d4a99ed3ae621e9ebb74a703f#68b8171b0d2c133d4a99ed3ae621e9ebb74a703f" dependencies = [ "encoding_rs", "flate2", @@ -1232,7 +1233,7 @@ dependencies = [ [[package]] name = "craft-quit" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=28c95c4a586acd2716b8ee89a34594f403a6fb14#28c95c4a586acd2716b8ee89a34594f403a6fb14" +source = "git+https://github.com/storytold/craft-libs?rev=68b8171b0d2c133d4a99ed3ae621e9ebb74a703f#68b8171b0d2c133d4a99ed3ae621e9ebb74a703f" dependencies = [ "dispatch2", "egui", @@ -1243,19 +1244,21 @@ dependencies = [ [[package]] name = "craft-svg" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=28c95c4a586acd2716b8ee89a34594f403a6fb14#28c95c4a586acd2716b8ee89a34594f403a6fb14" +source = "git+https://github.com/storytold/craft-libs?rev=68b8171b0d2c133d4a99ed3ae621e9ebb74a703f#68b8171b0d2c133d4a99ed3ae621e9ebb74a703f" dependencies = [ "craft-xml", "flate2", "kurbo", "roxmltree", "thiserror 2.0.21", + "vectorcraft-geom", + "vectorcraft-pathops", ] [[package]] name = "craft-ui" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=28c95c4a586acd2716b8ee89a34594f403a6fb14#28c95c4a586acd2716b8ee89a34594f403a6fb14" +source = "git+https://github.com/storytold/craft-libs?rev=68b8171b0d2c133d4a99ed3ae621e9ebb74a703f#68b8171b0d2c133d4a99ed3ae621e9ebb74a703f" dependencies = [ "craft-fonts-build", "craft-i18n", @@ -1276,7 +1279,7 @@ dependencies = [ [[package]] name = "craft-update" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=28c95c4a586acd2716b8ee89a34594f403a6fb14#28c95c4a586acd2716b8ee89a34594f403a6fb14" +source = "git+https://github.com/storytold/craft-libs?rev=68b8171b0d2c133d4a99ed3ae621e9ebb74a703f#68b8171b0d2c133d4a99ed3ae621e9ebb74a703f" dependencies = [ "chrono", "dunce", @@ -1303,9 +1306,9 @@ dependencies = [ [[package]] name = "craft-video" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=28c95c4a586acd2716b8ee89a34594f403a6fb14#28c95c4a586acd2716b8ee89a34594f403a6fb14" +source = "git+https://github.com/storytold/craft-libs?rev=68b8171b0d2c133d4a99ed3ae621e9ebb74a703f#68b8171b0d2c133d4a99ed3ae621e9ebb74a703f" dependencies = [ - "craft-media 0.1.0 (git+https://github.com/storytold/craft-libs?rev=28c95c4a586acd2716b8ee89a34594f403a6fb14)", + "craft-media 0.1.0 (git+https://github.com/storytold/craft-libs?rev=68b8171b0d2c133d4a99ed3ae621e9ebb74a703f)", "rayon", "thiserror 2.0.21", ] @@ -1313,7 +1316,7 @@ dependencies = [ [[package]] name = "craft-webp" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=28c95c4a586acd2716b8ee89a34594f403a6fb14#28c95c4a586acd2716b8ee89a34594f403a6fb14" +source = "git+https://github.com/storytold/craft-libs?rev=68b8171b0d2c133d4a99ed3ae621e9ebb74a703f#68b8171b0d2c133d4a99ed3ae621e9ebb74a703f" dependencies = [ "image", "thiserror 2.0.21", @@ -1322,12 +1325,22 @@ dependencies = [ [[package]] name = "craft-xml" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=28c95c4a586acd2716b8ee89a34594f403a6fb14#28c95c4a586acd2716b8ee89a34594f403a6fb14" +source = "git+https://github.com/storytold/craft-libs?rev=68b8171b0d2c133d4a99ed3ae621e9ebb74a703f#68b8171b0d2c133d4a99ed3ae621e9ebb74a703f" dependencies = [ "quick-xml 0.41.0", "thiserror 2.0.21", ] +[[package]] +name = "craft-zip" +version = "0.1.0" +source = "git+https://github.com/storytold/craft-libs?rev=68b8171b0d2c133d4a99ed3ae621e9ebb74a703f#68b8171b0d2c133d4a99ed3ae621e9ebb74a703f" +dependencies = [ + "flate2", + "thiserror 2.0.21", + "zip 9.1.3", +] + [[package]] name = "crc32fast" version = "1.5.2" @@ -1687,7 +1700,7 @@ name = "effectcraft-export" version = "0.24.1" dependencies = [ "craft-audio", - "craft-media 0.1.0 (git+https://github.com/storytold/craft-libs?rev=28c95c4a586acd2716b8ee89a34594f403a6fb14)", + "craft-media 0.1.0 (git+https://github.com/storytold/craft-libs?rev=68b8171b0d2c133d4a99ed3ae621e9ebb74a703f)", "craft-video", "effectcraft-color", "effectcraft-effects", @@ -1856,7 +1869,7 @@ dependencies = [ "craft-dpx", "craft-exr", "craft-gif", - "craft-media 0.1.0 (git+https://github.com/storytold/craft-libs?rev=28c95c4a586acd2716b8ee89a34594f403a6fb14)", + "craft-media 0.1.0 (git+https://github.com/storytold/craft-libs?rev=68b8171b0d2c133d4a99ed3ae621e9ebb74a703f)", "craft-webp", "effectcraft-color", "effectcraft-effects", @@ -3426,7 +3439,7 @@ checksum = "9f4d0e94ddd48749f06bbe4e5389fb9799a0c45bcaf00495042076ef05e3241a" [[package]] name = "hayro-jbig2" version = "0.3.0" -source = "git+https://github.com/storytold/craft-libs?rev=28c95c4a586acd2716b8ee89a34594f403a6fb14#28c95c4a586acd2716b8ee89a34594f403a6fb14" +source = "git+https://github.com/storytold/craft-libs?rev=68b8171b0d2c133d4a99ed3ae621e9ebb74a703f#68b8171b0d2c133d4a99ed3ae621e9ebb74a703f" dependencies = [ "hayro-ccitt", ] @@ -3440,7 +3453,7 @@ checksum = "c75ab947623ef4ccaa7acf0579edf7cbb5a73838e3839a7be73335e522f433a1" [[package]] name = "hayro-syntax" version = "0.7.2" -source = "git+https://github.com/storytold/craft-libs?rev=28c95c4a586acd2716b8ee89a34594f403a6fb14#28c95c4a586acd2716b8ee89a34594f403a6fb14" +source = "git+https://github.com/storytold/craft-libs?rev=68b8171b0d2c133d4a99ed3ae621e9ebb74a703f#68b8171b0d2c133d4a99ed3ae621e9ebb74a703f" dependencies = [ "hayro-jbig2", "hayro-jpeg2000", @@ -6687,6 +6700,27 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "vectorcraft-geom" +version = "0.18.0" +source = "git+https://github.com/storytold/vectorcraft.git?rev=6b3a6b8788ebcb420d69449199cbdf323888d27e#6b3a6b8788ebcb420d69449199cbdf323888d27e" +dependencies = [ + "kurbo", + "serde", + "thiserror 2.0.21", +] + +[[package]] +name = "vectorcraft-pathops" +version = "0.18.0" +source = "git+https://github.com/storytold/vectorcraft.git?rev=6b3a6b8788ebcb420d69449199cbdf323888d27e#6b3a6b8788ebcb420d69449199cbdf323888d27e" +dependencies = [ + "kurbo", + "linesweeper", + "thiserror 2.0.21", + "vectorcraft-geom", +] + [[package]] name = "vello_common" version = "0.2.0" diff --git a/Cargo.toml b/Cargo.toml index bb30f08c8..44f153665 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,22 +11,22 @@ rust-version = "1.95" repository = "https://github.com/storytold/effectcraft" [workspace.dependencies] -craft-pdf = { git = "https://github.com/storytold/craft-libs", rev = "28c95c4a586acd2716b8ee89a34594f403a6fb14", version = "=0.1.0", default-features = false, features = ["read"] } -craft-docpath = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "28c95c4a586acd2716b8ee89a34594f403a6fb14" } -craft-quit = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "28c95c4a586acd2716b8ee89a34594f403a6fb14" } -craft-ecproj-format = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "28c95c4a586acd2716b8ee89a34594f403a6fb14" } -craft-dpx = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "28c95c4a586acd2716b8ee89a34594f403a6fb14" } -craft-eps = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "28c95c4a586acd2716b8ee89a34594f403a6fb14" } -craft-exr = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "28c95c4a586acd2716b8ee89a34594f403a6fb14" } -craft-gif = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "28c95c4a586acd2716b8ee89a34594f403a6fb14", features = ["frames"] } -craft-psd = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "28c95c4a586acd2716b8ee89a34594f403a6fb14" } -craft-svg = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "28c95c4a586acd2716b8ee89a34594f403a6fb14" } -craft-webp = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "28c95c4a586acd2716b8ee89a34594f403a6fb14", features = ["frames"] } -craft-lottie = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "28c95c4a586acd2716b8ee89a34594f403a6fb14" } -craft-mesh = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "28c95c4a586acd2716b8ee89a34594f403a6fb14", default-features = false, features = ["stl", "obj", "gltf", "fbx"] } -craft-aep = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "28c95c4a586acd2716b8ee89a34594f403a6fb14" } +craft-pdf = { git = "https://github.com/storytold/craft-libs", rev = "68b8171b0d2c133d4a99ed3ae621e9ebb74a703f", version = "=0.1.0", default-features = false, features = ["read"] } +craft-docpath = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "68b8171b0d2c133d4a99ed3ae621e9ebb74a703f" } +craft-quit = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "68b8171b0d2c133d4a99ed3ae621e9ebb74a703f" } +craft-ecproj-format = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "68b8171b0d2c133d4a99ed3ae621e9ebb74a703f" } +craft-dpx = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "68b8171b0d2c133d4a99ed3ae621e9ebb74a703f" } +craft-eps = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "68b8171b0d2c133d4a99ed3ae621e9ebb74a703f" } +craft-exr = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "68b8171b0d2c133d4a99ed3ae621e9ebb74a703f" } +craft-gif = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "68b8171b0d2c133d4a99ed3ae621e9ebb74a703f", features = ["frames"] } +craft-psd = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "68b8171b0d2c133d4a99ed3ae621e9ebb74a703f" } +craft-svg = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "68b8171b0d2c133d4a99ed3ae621e9ebb74a703f" } +craft-webp = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "68b8171b0d2c133d4a99ed3ae621e9ebb74a703f", features = ["frames"] } +craft-lottie = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "68b8171b0d2c133d4a99ed3ae621e9ebb74a703f" } +craft-mesh = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "68b8171b0d2c133d4a99ed3ae621e9ebb74a703f", default-features = false, features = ["stl", "obj", "gltf", "fbx"] } +craft-aep = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "68b8171b0d2c133d4a99ed3ae621e9ebb74a703f" } # craft-update: app-specific pretend versions apply to startup and manual checks. -craft-update = { git = "https://github.com/storytold/craft-libs", version = "=0.1.0", rev = "28c95c4a586acd2716b8ee89a34594f403a6fb14", features = ["egui"] } +craft-update = { git = "https://github.com/storytold/craft-libs", version = "=0.1.0", rev = "68b8171b0d2c133d4a99ed3ae621e9ebb74a703f", features = ["egui"] } # internal effectcraft-time = { path = "crates/time" } effectcraft-geom = { path = "crates/geom" } @@ -90,9 +90,9 @@ same-file = "1.0" tempfile = "3.27" # codecs + containers shared by the Craft apps (crates/media, crates/export); keep all three on one rev. -craft-media = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "28c95c4a586acd2716b8ee89a34594f403a6fb14", default-features = false, features = ["isobmff", "matroska"] } -craft-audio = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "28c95c4a586acd2716b8ee89a34594f403a6fb14", default-features = false, features = ["aac-decode", "aac-encode", "opus-decode"] } -craft-video = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "28c95c4a586acd2716b8ee89a34594f403a6fb14", features = ["h264-encode", "prores", "hevc-encode", "vp9-encode", "av1", "threads"] } +craft-media = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "68b8171b0d2c133d4a99ed3ae621e9ebb74a703f", default-features = false, features = ["isobmff", "matroska"] } +craft-audio = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "68b8171b0d2c133d4a99ed3ae621e9ebb74a703f", default-features = false, features = ["aac-decode", "aac-encode", "opus-decode"] } +craft-video = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "68b8171b0d2c133d4a99ed3ae621e9ebb74a703f", features = ["h264-encode", "prores", "hevc-encode", "vp9-encode", "av1", "threads"] } # footage decoding: FilmCraft's pure-Rust crates, pinned to a revision (plan/adr/0001). # Only `crates/media`, `crates/export` and `crates/interchange` may depend on these. @@ -122,7 +122,7 @@ half = "2.7" # ui # Shared frontend components; keep this dependency above the engine boundary. # Shared UI and the complete egui family select reviewed immutable commits below. -craft-ui = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "28c95c4a586acd2716b8ee89a34594f403a6fb14", features = ["serde"] } +craft-ui = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "68b8171b0d2c133d4a99ed3ae621e9ebb74a703f", features = ["serde"] } # `default_fonts` and `monochrome_emoji_fonts` are explicit: the app's `FontDefinitions::default()` # and its `✔`/`▣` chrome glyphs need both, and kittest's own dev-dependencies do not propagate. egui = { version = "0.37", default-features = false, features = ["default_fonts", "monochrome_emoji_fonts"] } @@ -231,8 +231,8 @@ lto = "thin" codegen-units = 1 [patch.crates-io] -hayro-syntax = { git = "https://github.com/storytold/craft-libs", rev = "28c95c4a586acd2716b8ee89a34594f403a6fb14", version = "=0.7.2" } -hayro-jbig2 = { git = "https://github.com/storytold/craft-libs", rev = "28c95c4a586acd2716b8ee89a34594f403a6fb14", version = "=0.3.0" } +hayro-syntax = { git = "https://github.com/storytold/craft-libs", rev = "68b8171b0d2c133d4a99ed3ae621e9ebb74a703f", version = "=0.7.2" } +hayro-jbig2 = { git = "https://github.com/storytold/craft-libs", rev = "68b8171b0d2c133d4a99ed3ae621e9ebb74a703f", version = "=0.3.0" } ecolor = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" } emath = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" } epaint = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" } diff --git a/xtask/src/pdf_deps.rs b/xtask/src/pdf_deps.rs index 75850cb4a..efbdef61e 100644 --- a/xtask/src/pdf_deps.rs +++ b/xtask/src/pdf_deps.rs @@ -5,7 +5,7 @@ use std::process::Command; use serde_json::Value; -const REV: &str = "28c95c4a586acd2716b8ee89a34594f403a6fb14"; +const REV: &str = "68b8171b0d2c133d4a99ed3ae621e9ebb74a703f"; const PACKAGES: &[(&str, &str)] = &[("craft-pdf", "0.1.0"), ("hayro-syntax", "0.7.2"), ("hayro-jbig2", "0.3.0")]; pub fn run(root: &Path) -> Result<(), String> {