[dotCooCoo]

Draft until storytold/craft-libs#687 and #696 merge. The craft-libs pin points at dotCooCoo/craft-libs c7c84230, a branch that is craft-libs main at 0a9d1f48 with #687 and then #696 merged in. When both merge, the pin moves to the craft-libs merge commit on storytold/craft-libs and the pull request is marked ready.

What changes

• Cargo.toml: craft-media, craft-pdf, craft-update, craft-ui and the krilla patch move together from c5a1cbfb to c7c84230. Cargo.lock changes those entries and craft-i18n and craft-fonts-build, and drops zopfli from zip's dependencies. The web app's craft-web-api and craft-web-host stay on their own rev.
• crates/ui-egui/src/dialogs/updates_ui.rs: the check result window now shows whenever the updater's status is not idle, not only after Help ▸ Check for Updates. At the first start after an update it says that the update installed (Status::Updated) or why it failed (Status::InstallFailed). OK dismisses it, Check Again runs a new check, and Restart to Update (Status::Ready) calls Updater::restart_to_update, so the next frame asks the window to close once nothing is unsaved. The new Installing, Ready and Managed statuses are shown by the same window.
• apps/deckcraft/src/main.rs, crates/ui-egui/src/app.rs: on_exit calls the new SlideApp::start_pending_update, which calls Updater::start_pending_update. On Windows the install helper now starts at the app's exit instead of right after the download, so a canceled close keeps the update ready. On macOS on_exit ends the process before the app is dropped, so the updater's own drop would not run there.
• New tests the_start_after_an_update_reports_it_until_dismissed and the_start_after_a_failed_update_reports_why_and_offers_a_new_check: an outcome record written under a temporary folder makes the start show the result window, OK returns the status to idle, and Check Again requests a check. Both fail when the window's answers are ignored.

No other source change was needed for the newer craft-libs crates.

Other craft-libs changes since c5a1cbfb

• craft-media: shared codec identifiers and one ByteSource trait (craft-libs#439), faster bit reader and RBSP unescape (UI: WordArt adjust handles drag a text warp #519, Text: AutoCorrect options, case rules and your own entries #521, UI: keep editor slides on the Retina pixel grid #522), an optional Ogg demuxer (Palette: skip commands that need a value #440, not enabled here), a cap on a Matroska track's content encoding chain (Morph: the same text moves and resizes instead of cross-fading #541).
• craft-pdf and krilla: opening a PDF can be canceled during parsing (Add the Notes Master view (stacked on #572 / #533) #573), and a gray stop in a CMYK gradient is written as exact black (Web: a picked file lands where it was requested (#414) #474).
• craft-update: besides UI: Create New Theme Fonts dialog edits the theme in one step #687 and Media: damaged audio no longer hangs or panics #696, translated dialog text behind the app's translator (Format Shape: 3-D Format and 3-D Rotation controls #508, Design: Variants gallery with four colour variations of the theme #542; DeckCraft sets none, so the dialogs stay English), HTTPS-only agents and redirects (Shapes: Edit Points — drag, add and delete a shape's vertices #514), one asset per name in SHA256SUMS.txt (Pictures: compress pictures to a target resolution #513), standalone updates that stage every file first ([Audit] Native-format load silently ignores missing or corrupt embedded media #392), and zip without zlib-rs on Windows (Export: MP4 and MOV video of the deck, with our own H.264 encoder #608).
• craft-ui: docking move handles have one name each, floating destinations and font bytes are checked (View: indent and tab markers on the ruler #567), and opt-in docking host surfaces that DeckCraft does not use (Text Box and Layouts #470).
• craft-fonts-build: manifest font and license paths stay inside the checkout (Sliders: the shared craft-ui ZoomBar and Slider #267, Pptx: .odp import reads tables, master pages and page backgrounds #527, Format: bound total embedded media when opening a .deckcraft #528).

Overlap

No open pull request moves the craft-libs pin. #1488, #1530, #1549 and #1571 add craft-i18n at c5a1cbfb, the same rev as craft-ui, and #1540 adds it at 92d392cf; whichever merges second needs only the rev in Cargo.toml and Cargo.lock. Earlier pin changes landed together with the change that needed them (#1253, #1377, #1383, #1386, #1457, #1561, #1562), and 9678ed7d moved the pin in a direct commit.

Tested

On Windows 11, on 48e22031 plus this commit, without craft-fonts:

• cargo fmt --all -- --check: clean.
• cargo check --workspace --tests --locked: clean.
• cargo clippy --locked --all-targets -- -D warnings for the 16 crates that depend on craft-libs crates: clean.
• cargo test --locked --no-fail-fast for the same 16 crates: 23 test binaries and 13 doc-test runs, 1570 passed, 0 failed, 6 ignored.
• cargo xtask assets: all 48 asset files attributed. cargo xtask layers: 28 crates, no layering violations.

[coderabbitai]

Caution

Review failed

The pull request is closed.

• Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

Share

• X
• Mastodon
• Reddit
• LinkedIn

[dotCooCoo]

The gate stopped at cargo xtask pdf-deps: the check still expected craft-pdf and krilla from storytold/craft-libs at c5a1cbfb, while this branch pins them to dotCooCoo/craft-libs at c7c84230.

3504a9d sets the expected repository and revision in xtask/src/pdf_deps.rs to the pin in Cargo.toml. When the pin moves to the craft-libs merge commit, the same two constants move with it. Locally, cargo xtask pdf-deps passes, cargo test -p xtask passes 29 tests, and cargo check --workspace --tests --locked is clean. The branch has no conflicts with main.

[dylanmtaylor]

LGTM. craft-libs#696 is merged into main.