collective

Browse / github.com/storytold/deckcraft / patch

Flatpak: use Freedesktop 26.08 in both manifests

Update Flatpak runtime and SDK to Freedesktop 26.08 Could the Flatpak runtime and SDK be updated from 25.08 to 26.08 in both packaging manifests? I installed DeckCraft 0.11.1 from the GitHub release Flatpak. It uses `org.freedesktop.Platform//25.08` and names `org.freedesktop.Sdk//25.08`. Both manifests on `main` also still specify `runtime-version: '25.08'`: - `packaging/linux/flatpak/ai.storyteller.deckcraft.yml` - `packaging/linux/flatpak/ai.storyteller.deckcraft.bundle.yml` 26.08 is the current stable branch and is supported until September 2028, compared with September 2027 for 25.08. Moving would extend the support window and use the n

Status
open
Score
0.00
Adopters
0 other operators
Author
nilltadios (imported from pull request #1420, open)
Base
aaf6c1c38aa6c59beda8110bd014cc6c96c6ec74
Size
+73 −5 in 4 files
Review
pending
Shared
2026-10-28
Id
4c630262aeda6171147fdd9c

How it went

No other operator has reported using it yet.

Diff

raw · ROADMAP.md packaging/linux/flatpak/ai.storyteller.deckcraft.bundle.yml packaging/linux/flatpak/ai.storyteller.deckcraft.yml packaging/linux/flatpak/generate-cargo-sources.py

diff --git a/ROADMAP.md b/ROADMAP.md--- a/ROADMAP.md+++ b/ROADMAP.md@@ -2,7 +2,7 @@  **Stage: alpha** · next: beta, ~20 points and ~120–210 h away -> **Last reviewed:** 2026-10-14 · **Last updated:** 2026-10-24 · **Change:** trivial (progress log: Edit Points handle drags with Shift, Ctrl/Cmd or Alt/Option set the point type; previous: trivial, progress log: scroll bars on the zoomed slide pane, #1157; previous: minor, native chart payloads stored in bounded ZIP members; previous: major, community PR wave 2026-10-14: ~60 landed items in the progress log, among them the Font, Paragraph, Photo Album, theme colour and font and Date and Time dialogs, presenter and show controls, the SmartArt Text Pane and PPTX corpus slices; breadth 84% after `cargo xtask parity`, ready stays ~55%, stage stays alpha; duplicated rows and headers folded; previous: minor, hours to ~95% per audience added) · **Target:** Microsoft PowerPoint for Mac 16.113 (Microsoft 365)+> **Last reviewed:** 2026-10-26 · **Last updated:** 2026-10-26 · **Change:** trivial (Flatpak runtime candidate #1403; readiness estimates unchanged) · **Target:** Microsoft PowerPoint for Mac 16.113 (Microsoft 365) > **Last reviewed:** 2026-10-14 · **Last updated:** 2026-10-24 · **Change:** trivial (progress log: Ctrl+wheel zoom during the slide show, #1286; previous: trivial, scroll bars on the zoomed slide pane, #1157; previous: minor, native chart payloads stored in bounded ZIP members; previous: major, community PR wave 2026-10-14: ~60 landed items in the progress log, among them the Font, Paragraph, Photo Album, theme colour and font and Date and Time dialogs, presenter and show controls, the SmartArt Text Pane and PPTX corpus slices; breadth 84% after `cargo xtask parity`, ready stays ~55%, stage stays alpha; duplicated rows and headers folded; previous: minor, hours to ~95% per audience added) · **Target:** Microsoft PowerPoint for Mac 16.113 (Microsoft 365) > **Last reviewed:** 2026-10-14 · **Last updated:** 2026-10-24 · **Change:** trivial (progress log: picture and embedded object fills; previous: trivial, scroll bars on the zoomed slide pane, #1157; previous: minor, native chart payloads stored in bounded ZIP members; previous: major, community PR wave 2026-10-14: ~60 landed items in the progress log, among them the Font, Paragraph, Photo Album, theme colour and font and Date and Time dialogs, presenter and show controls, the SmartArt Text Pane and PPTX corpus slices; breadth 84% after `cargo xtask parity`, ready stays ~55%, stage stays alpha; duplicated rows and headers folded; previous: minor, hours to ~95% per audience added) · **Target:** Microsoft PowerPoint for Mac 16.113 (Microsoft 365) > **Last reviewed:** 2026-10-14 · **Last updated:** 2026-10-22 · **Change:** trivial (fill and outline edits reach group members, #1079; stage and scores unchanged) · **Target:** Microsoft PowerPoint for Mac 16.113 (Microsoft 365)@@ -137,6 +137,7 @@ app's JSON control channel (`deckcraft --control PORT`).  | Date | What landed | |---|---|+| 2026-10-26 | Flatpak candidate #1403: both the source and release-bundle manifests use Freedesktop 26.08. Source preparation also vendors unused Cargo patches without changing Cargo.lock. Release-bundle builds, file operations and the Rust SDK extension probe pass on native x86_64 and aarch64. Full source builds and package exports also pass on both architectures. ARM GUI acceptance remains unverified; readiness estimates are unchanged. | | 2026-10-25 | Windows installer: the Start menu shortcut takes the icon embedded in `deckcraft.exe` instead of an MSI `<Icon>`, so a taskbar pin keeps its icon after an update (#1114); a pin that already lost it has to be unpinned and pinned again once | | 2026-10-24 | AutoFormat as you type: a paragraph that starts with `*`, `-`, `--`, `>`, `<>`, `1.`, `1)`, `I.`, `i.`, `A.`, `a.` or `a)` and a space or tab becomes a bulleted or numbered list in that style; Backspace right after puts the typed text back, and Tools ▸ AutoCorrect and `text.autocorrect {lists}` turn it off | | 2026-10-24 | Tables: while the caret is in a cell, dragging into another cell selects that range of cells (shaded, merged cells taken in whole), and Shift+arrow grows or shrinks it; formatting applies to the selected cells only, and Delete clears their text and keeps the table |@@ -294,6 +295,7 @@ app's JSON control channel (`deckcraft --control PORT`).  | Date | Change | Summary | |---|---|---|+| 2026-10-26 | trivial | Record Flatpak 26.08 candidate #1403 and the limits of compatibility checks; estimates unchanged | | 2026-10-25 | trivial | Progress log: Windows shortcut icon survives updates (#1114). Scores and milestone names unchanged | | 2026-10-24 | trivial | Progress log: selecting a range of table cells by dragging. Scores and milestone names unchanged | | 2026-10-24 | trivial | Progress log: measurement units in centimetres (#1326). Scores unchanged |diff --git a/packaging/linux/flatpak/ai.storyteller.deckcraft.bundle.yml b/packaging/linux/flatpak/ai.storyteller.deckcraft.bundle.yml--- a/packaging/linux/flatpak/ai.storyteller.deckcraft.bundle.yml+++ b/packaging/linux/flatpak/ai.storyteller.deckcraft.bundle.yml@@ -13,7 +13,7 @@ # runtime-version and finish-args identical in both (packaging-lint checks this). id: ai.storyteller.deckcraft runtime: org.freedesktop.Platform-runtime-version: '25.08'+runtime-version: '26.08' sdk: org.freedesktop.Sdk command: deckcraft finish-args:diff --git a/packaging/linux/flatpak/ai.storyteller.deckcraft.yml b/packaging/linux/flatpak/ai.storyteller.deckcraft.yml--- a/packaging/linux/flatpak/ai.storyteller.deckcraft.yml+++ b/packaging/linux/flatpak/ai.storyteller.deckcraft.yml@@ -2,8 +2,11 @@ # # Flatpak builds run offline, so the crate sources must be vendored first. From the repo root: #-#   curl -fsSLO https://raw.githubusercontent.com/flatpak/flatpak-builder-tools/master/cargo/flatpak-cargo-generator.py-#   python3 flatpak-cargo-generator.py Cargo.lock -o packaging/linux/flatpak/cargo-sources.json+#   curl -fsSLO https://raw.githubusercontent.com/flatpak/flatpak-builder-tools/9d86d336a39b9af38b86f114b6ce5820fe260f91/cargo/flatpak-cargo-generator.py+#   python3 packaging/linux/flatpak/generate-cargo-sources.py Cargo.lock -o packaging/linux/flatpak/cargo-sources.json+# The wrapper vendors [[patch.unused]] and keeps git revisions separate so Cargo can+# resolve the complete dependency graph offline.+# #   flatpak-builder --user --install --force-clean build-flatpak packaging/linux/flatpak/ai.storyteller.deckcraft.yml #   flatpak run ai.storyteller.deckcraft #@@ -12,7 +15,7 @@ # repackages the Linux tarball); keep runtime-version and finish-args identical in both. id: ai.storyteller.deckcraft runtime: org.freedesktop.Platform-runtime-version: '25.08'+runtime-version: '26.08' sdk: org.freedesktop.Sdk sdk-extensions:   - org.freedesktop.Sdk.Extension.rust-stablediff --git a/packaging/linux/flatpak/generate-cargo-sources.py b/packaging/linux/flatpak/generate-cargo-sources.pynew file mode 100644--- /dev/null+++ b/packaging/linux/flatpak/generate-cargo-sources.py@@ -0,0 +1,63 @@+#!/usr/bin/env python3+"""Prepare complete, revision-specific offline inputs for flatpak-cargo-generator.++flatpak-cargo-generator reads [[package]] but omits [[patch.unused]]. Cargo still+loads those patch manifests before resolving the locked dependency graph. Add+them to the generator's in-memory input without changing the project's lockfile.+The upstream generator also keys git replacements by URL alone. Keep each locked+revision separate when several dependencies use different commits of one repo.+The upstream generator supplies the pinned sources and normalizes git packages.+"""+import argparse+import asyncio+import json+from pathlib import Path+import runpy+from urllib.parse import parse_qs, urlparse+++def main():+    parser = argparse.ArgumentParser(description=__doc__)+    parser.add_argument("cargo_lock", type=Path)+    parser.add_argument("--generator", type=Path, default=Path("flatpak-cargo-generator.py"))+    parser.add_argument("-o", "--output", type=Path, required=True)+    args = parser.parse_args()+    generator = runpy.run_path(str(args.generator), run_name="flatpak_cargo_generator")+    lock = generator["load_toml"](str(args.cargo_lock))+    packages = lock["package"]+    keys = {(p["name"], p["version"], p.get("source")) for p in packages}+    for patch in lock.get("patch", {}).get("unused", []):+        key = (patch["name"], patch["version"], patch.get("source"))+        if key not in keys:+            packages.append(patch)+            keys.add(key)+    sources = asyncio.run(generator["generate_sources"](lock))+    config_source = next(+        s for s in sources+        if s.get("dest") == generator["CARGO_HOME"] and s.get("dest-filename") == "config"+    )+    config = generator["tomlkit"].parse(config_source["contents"]).unwrap()+    replacements = config["source"]+    for name in list(replacements):+        if "git" in replacements[name]:+            del replacements[name]+    for package in packages:+        source = package.get("source", "")+        if not source.startswith("git+"):+            continue+        replacement = {+            "git": generator["canonical_url"](source).geturl(),+            "replace-with": generator["VENDORED_SOURCES"],+        }+        query = parse_qs(urlparse(source).query)+        for reference in ("rev", "tag", "branch"):+            if reference in query:+                value, = query[reference]+                replacement[reference] = value+        replacements[source] = replacement+    config_source["contents"] = generator["tomlkit"].dumps(config)+    args.output.write_text(json.dumps(sources, indent=2) + "\n", encoding="utf-8")+++if __name__ == "__main__":+    main()