aleleba/deckcraft
1
0
Fork 0
mirror of https://github.com/storytold/deckcraft.git synced 2026-10-30 21:47:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into dc-font-cap

Browse Source
This commit is contained in:
Harrison Booth
2026-10-28 13:34:37 -05:00
parent 352086304e c2f3397483
commit 22d9796786
5 changed files with 54 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+28 -28
View File
@@ -983,7 +983,7 @@ checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f"
[[package]]
name = "deckcraft"
version = "0.11.1"
version = "0.12.0"
dependencies = [
"arboard",
"chrono",
@@ -1005,7 +1005,7 @@ dependencies = [
[[package]]
name = "deckcraft-anim"
version = "0.11.1"
version = "0.12.0"
dependencies = [
"deckcraft-geom",
"deckcraft-model",
@@ -1014,7 +1014,7 @@ dependencies = [
[[package]]
name = "deckcraft-av1"
version = "0.11.1"
version = "0.12.0"
dependencies = [
"deckcraft-bitstream",
"rayon",
@@ -1023,14 +1023,14 @@ dependencies = [
[[package]]
name = "deckcraft-bitstream"
version = "0.11.1"
version = "0.12.0"
dependencies = [
"craft-media",
]
[[package]]
name = "deckcraft-cli"
version = "0.11.1"
version = "0.12.0"
dependencies = [
"deckcraft-engine",
"deckcraft-mcp",
@@ -1040,14 +1040,14 @@ dependencies = [
[[package]]
name = "deckcraft-color"
version = "0.11.1"
version = "0.12.0"
dependencies = [
"serde",
]
[[package]]
name = "deckcraft-engine"
version = "0.11.1"
version = "0.12.0"
dependencies = [
"chrono",
"deckcraft-anim",
@@ -1073,7 +1073,7 @@ dependencies = [
[[package]]
name = "deckcraft-fonts"
version = "0.11.1"
version = "0.12.0"
dependencies = [
"epaint_default_fonts",
"harfrust 0.13.3",
@@ -1085,7 +1085,7 @@ dependencies = [
[[package]]
name = "deckcraft-format"
version = "0.11.1"
version = "0.12.0"
dependencies = [
"deckcraft-model",
"serde",
@@ -1096,7 +1096,7 @@ dependencies = [
[[package]]
name = "deckcraft-geom"
version = "0.11.1"
version = "0.12.0"
dependencies = [
"kurbo",
"serde",
@@ -1104,7 +1104,7 @@ dependencies = [
[[package]]
name = "deckcraft-h264"
version = "0.11.1"
version = "0.12.0"
dependencies = [
"deckcraft-bitstream",
"rayon",
@@ -1113,7 +1113,7 @@ dependencies = [
[[package]]
name = "deckcraft-hevc"
version = "0.11.1"
version = "0.12.0"
dependencies = [
"deckcraft-bitstream",
"rayon",
@@ -1122,21 +1122,21 @@ dependencies = [
[[package]]
name = "deckcraft-isobmff"
version = "0.11.1"
version = "0.12.0"
dependencies = [
"craft-media",
]
[[package]]
name = "deckcraft-matroska"
version = "0.11.1"
version = "0.12.0"
dependencies = [
"craft-media",
]
[[package]]
name = "deckcraft-mcp"
version = "0.11.1"
version = "0.12.0"
dependencies = [
"deckcraft-engine",
"deckcraft-render",
@@ -1146,7 +1146,7 @@ dependencies = [
[[package]]
name = "deckcraft-media"
version = "0.11.1"
version = "0.12.0"
dependencies = [
"deckcraft-av1",
"deckcraft-h264",
@@ -1164,7 +1164,7 @@ dependencies = [
[[package]]
name = "deckcraft-metafile"
version = "0.11.1"
version = "0.12.0"
dependencies = [
"image",
"kurbo",
@@ -1173,7 +1173,7 @@ dependencies = [
[[package]]
name = "deckcraft-model"
version = "0.11.1"
version = "0.12.0"
dependencies = [
"deckcraft-color",
"deckcraft-geom",
@@ -1185,15 +1185,15 @@ dependencies = [
[[package]]
name = "deckcraft-ogg"
version = "0.11.1"
version = "0.12.0"
[[package]]
name = "deckcraft-opus"
version = "0.11.1"
version = "0.12.0"
[[package]]
name = "deckcraft-pdf"
version = "0.11.1"
version = "0.12.0"
dependencies = [
"craft-pdf",
"deckcraft-fonts",
@@ -1211,7 +1211,7 @@ dependencies = [
[[package]]
name = "deckcraft-pptx"
version = "0.11.1"
version = "0.12.0"
dependencies = [
"deckcraft-color",
"deckcraft-engine",
@@ -1227,7 +1227,7 @@ dependencies = [
[[package]]
name = "deckcraft-render"
version = "0.11.1"
version = "0.12.0"
dependencies = [
"deckcraft-anim",
"deckcraft-color",
@@ -1246,7 +1246,7 @@ dependencies = [
[[package]]
name = "deckcraft-text"
version = "0.11.1"
version = "0.12.0"
dependencies = [
"chrono",
"deckcraft-color",
@@ -1260,7 +1260,7 @@ dependencies = [
[[package]]
name = "deckcraft-ui-egui"
version = "0.11.1"
version = "0.12.0"
dependencies = [
"craft-ui",
"craft-update",
@@ -1285,7 +1285,7 @@ dependencies = [
[[package]]
name = "deckcraft-vp9"
version = "0.11.1"
version = "0.12.0"
dependencies = [
"deckcraft-bitstream",
"rayon",
@@ -1294,7 +1294,7 @@ dependencies = [
[[package]]
name = "deckcraft-web"
version = "0.11.1"
version = "0.12.0"
dependencies = [
"deckcraft-engine",
"deckcraft-ui-egui",
@@ -6176,7 +6176,7 @@ checksum = "9440ea3e5aeabb0ac63af70daf835274065238cdd0cec83418f417eae38bacee"
[[package]]
name = "xtask"
version = "0.11.1"
version = "0.12.0"
dependencies = [
"serde_json",
]
Cargo.toml
+1 -1
View File
@@ -4,7 +4,7 @@ members = ["crates/*", "apps/*", "xtask"]
default-members = ["crates/*", "apps/deckcraft", "apps/deckcraft-cli"]
[workspace.package]
version = "0.11.1"
version = "0.12.0"
edition = "2024"
license = "MIT OR Apache-2.0"
rust-version = "1.95"
packaging/linux/flatpak/ai.storyteller.deckcraft.bundle.yml
+3 -3
View File
@@ -31,9 +31,9 @@ finish-args:
# document portal, so picked files work anywhere without broad filesystem access. Documents is
# granted so decks passed by path (the command line, Open Recent) work in the usual place.
- --filesystem=xdg-documents
# Deliberately not granted: network (the optional --control server listens on 127.0.0.1 in
# the sandbox; `flatpak override --user --share=network ai.storyteller.deckcraft` exposes it to
# host agents) and home/host filesystem access.
# Network: update checks reach GitHub. The optional --control server still listens on 127.0.0.1
# only. Home/host filesystem access is deliberately not granted.
- --share=network
modules:
- name: deckcraft
buildsystem: simple
packaging/linux/flatpak/ai.storyteller.deckcraft.yml
+3 -3
View File
@@ -32,9 +32,9 @@ finish-args:
# document portal, so picked files work anywhere without broad filesystem access. Documents is
# granted so decks passed by path (the command line, Open Recent) work in the usual place.
- --filesystem=xdg-documents
# Deliberately not granted: network (the optional --control server listens on 127.0.0.1 in
# the sandbox; `flatpak override --user --share=network ai.storyteller.deckcraft` exposes it to
# host agents) and home/host filesystem access.
# Network: update checks reach GitHub. The optional --control server still listens on 127.0.0.1
# only. Home/host filesystem access is deliberately not granted.
- --share=network
build-options:
append-path: /usr/lib/sdk/rust-stable/bin
modules:
packaging/macos/package.sh
+19 -4
View File
@@ -80,6 +80,21 @@ sign() {
codesign --force --sign "$IDENTITY" ${kc[@]+"${kc[@]}"} "${ts[@]}" "$@"
}
# `stapler staple` and `stapler validate` both fetch the ticket from Apple's CloudKit, and a dropped
# connection there (NSURLErrorDomain -1005, "Error 68") fails them although notarization worked.
# Both are idempotent, so retry with a pause; a missing or bad ticket still fails every try.
stapler_retry() {
local try
for try in 1 2 3 4; do
xcrun stapler "$1" "$2" && return 0
[[ "$try" = 4 ]] && break
echo "stapler $1 failed (try $try of 4); retrying in $((try * 20)) s" >&2
sleep $((try * 20))
done
echo "error: stapler $1 $(basename "$2") failed 4 times" >&2
exit 1
}
notarize() {
local file="$1" out id status
echo "==> notarizing $(basename "$file") (this can take a few minutes)"
@@ -121,8 +136,8 @@ codesign --verify --strict --deep --verbose=2 "$APP"
if [[ "$NOTARIZE" = 1 ]]; then
ditto -c -k --keepParent "$APP" "$WORK/DeckCraft-notarize.zip"
notarize "$WORK/DeckCraft-notarize.zip"
xcrun stapler staple "$APP"
xcrun stapler validate "$APP"
stapler_retry staple "$APP"
stapler_retry validate "$APP"
spctl --assess --type execute -vvv "$APP"
fi
@@ -147,8 +162,8 @@ sign "$DMG"
codesign --verify --strict --verbose=2 "$DMG"
if [[ "$NOTARIZE" = 1 ]]; then
notarize "$DMG"
xcrun stapler staple "$DMG"
xcrun stapler validate "$DMG"
stapler_retry staple "$DMG"
stapler_retry validate "$DMG"
spctl --assess --type open --context context:primary-signature -vvv "$DMG"
fi