LightCraft: An open-source non-destructive photo editor written by scratch in pure Rust
Release: FreeBSD, Flatpak x86_64/aarch64, AppImage zsync updates; README Downloads (#302)
Brandon Thomasebe54f934ee8
diff --git a/.github/workflows/packaging-lint.yml b/.github/workflows/packaging-lint.ymlindex 2b53ae6cd..0e2388a62 100644--- a/.github/workflows/packaging-lint.yml+++ b/.github/workflows/packaging-lint.yml@@ -54,4 +54,15 @@ jobs:desktop-file-validate packaging/linux/ai.storyteller.lightcraft.desktopsed -e 's/@VERSION@/0.0.0/' -e 's/@DATE@/2026-01-01/' packaging/linux/ai.storyteller.lightcraft.metainfo.xml.in >"$RUNNER_TEMP/ai.storyteller.lightcraft.metainfo.xml"appstreamcli validate --no-net --explain "$RUNNER_TEMP/ai.storyteller.lightcraft.metainfo.xml"- python3 -c "import yaml; m = yaml.safe_load(open('packaging/linux/flatpak/ai.storyteller.lightcraft.yml')); assert m['id'] == 'ai.storyteller.lightcraft' and m['command'] == 'lightcraft'"+ python3 - <<'EOF'+ import yaml+ src = yaml.safe_load(open("packaging/linux/flatpak/ai.storyteller.lightcraft.yml"))+ bundle = yaml.safe_load(open("packaging/linux/flatpak/ai.storyteller.lightcraft.bundle.yml"))+ for m in (src, bundle):+ assert m["id"] == "ai.storyteller.lightcraft" and m["command"] == "lightcraft", m["id"]+ for key in ("runtime", "runtime-version", "sdk", "finish-args"):+ assert src[key] == bundle[key], f"Flatpak manifests disagree on {key}: {src[key]} vs {bundle[key]}"+ print("Flatpak manifests ok")+ EOF+ - name: FreeBSD tarball layout (stub binaries)+ run: bash packaging/freebsd/package.sh --dry-rundiff --git a/.github/workflows/release.yml b/.github/workflows/release.ymlindex 69fcf7da9..efd61ace2 100644--- a/.github/workflows/release.yml+++ b/.github/workflows/release.yml@@ -2,9 +2,11 @@# are configured) and creates or updates the draft GitHub Release "LightCraft v<version>".# See docs/releasing.md.#-# All jobs run in the `release` environment (restricted to the `release` branch), which holds-# the signing secrets. Every secret is optional: missing ones produce unsigned artifacts and a-# warning, never a failed build.+# The signing jobs (macOS, Windows) and the draft-release job run in the `release` environment+# (restricted to the `release` branch), which holds the signing secrets. Every secret is optional:+# missing ones produce unsigned artifacts and a warning, never a failed build. The jobs that sign+# nothing (version, Linux, Flatpak, FreeBSD, web) run without it, so a dispatch on any branch is+# a dry run of them; the release job needs the signed jobs, so a branch run never drafts a release.name: Releaseon:@@ -36,7 +38,7 @@ jobs:version:name: versionruns-on: ubuntu-latest- environment: release+ # No `environment: release` here or on the other jobs that sign nothing: no release secrets.outputs:version: ${{ steps.v.outputs.version }}date: ${{ steps.v.outputs.date }}@@ -174,7 +176,6 @@ jobs:# The oldest GitHub-hosted image, so the binaries only need glibc >= 2.35 (Ubuntu 22.04+,# Debian 12+, Fedora 36+, RHEL 10). See docs/releasing.md.runs-on: ${{ matrix.runner }}- environment: releasestrategy:fail-fast: falsematrix:@@ -198,7 +199,7 @@ jobs:sudo apt-get updatesudo apt-get install -y --no-install-recommends \libxkbcommon-dev libwayland-dev libx11-dev libxrandr-dev libxi-dev libgl1-mesa-dev \- desktop-file-utils appstream python3-yaml+ desktop-file-utils appstream python3-yaml zsynccurl -fsSL -o "$RUNNER_TEMP/nfpm.deb" \"https://github.com/goreleaser/nfpm/releases/download/v${NFPM_VERSION}/nfpm_${NFPM_VERSION}_${{ matrix.deb }}.deb"sudo dpkg -i "$RUNNER_TEMP/nfpm.deb"@@ -223,6 +224,9 @@ jobs:for appimage in dist/release/*.AppImage; dochmod +x "$appimage"APPIMAGE_EXTRACT_AND_RUN=1 "$appimage" --version+ # Update information is embedded, and the .zsync for delta updates sits beside it.+ "$appimage" --appimage-updateinformation | grep -F 'gh-releases-zsync|'+ test -s "$appimage.zsync"done- uses: actions/upload-artifact@v4with:@@ -230,11 +234,98 @@ jobs:path: dist/release/*if-no-files-found: error+ flatpak:+ name: Flatpak ${{ matrix.arch }}+ needs: [version, linux]+ # Repackages the Linux job's tarball (the same binaries as the AppImage/deb/rpm); no Rust+ # build here. 24.04 for a newer flatpak-builder (1.4) than 22.04 ships.+ runs-on: ${{ matrix.runner }}+ strategy:+ fail-fast: false+ matrix:+ include:+ - { arch: x86_64, runner: ubuntu-24.04 }+ - { arch: aarch64, runner: ubuntu-24.04-arm }+ env:+ LIGHTCRAFT_VERSION: ${{ needs.version.outputs.version }}+ LIGHTCRAFT_BUILD_DATE: ${{ needs.version.outputs.date }}+ steps:+ - uses: actions/checkout@v4+ - uses: actions/download-artifact@v4+ with:+ name: release-linux-${{ matrix.arch }}+ path: dist/linux+ - name: Install flatpak-builder+ run: |+ sudo apt-get update+ # librsvg2-common: the SVG pixbuf loader. flatpak-builder runs the host's+ # `appstreamcli compose`, which renders the scalable icon and fails without it.+ sudo apt-get install -y --no-install-recommends flatpak flatpak-builder librsvg2-common+ # Ubuntu 24.04's AppArmor blocks the unprivileged user namespaces bubblewrap needs.+ sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0+ - name: Build the Flatpak bundle+ run: packaging/linux/flatpak-bundle.sh "dist/linux/lightcraft-$LIGHTCRAFT_VERSION-linux-${{ matrix.arch }}.tar.gz"+ - uses: actions/upload-artifact@v4+ with:+ name: release-flatpak-${{ matrix.arch }}+ path: dist/release/*.flatpak+ if-no-files-found: error++ freebsd:+ name: FreeBSD x86_64+ needs: version+ # GitHub has no FreeBSD runners: build in a FreeBSD 14.3 VM, the same image and packages as+ # .github/workflows/freebsd.yml.+ runs-on: ubuntu-latest+ timeout-minutes: 180+ env:+ LIGHTCRAFT_VERSION: ${{ needs.version.outputs.version }}+ LIGHTCRAFT_BUILD_DATE: ${{ needs.version.outputs.date }}+ steps:+ - uses: actions/checkout@v4+ # Fonts (optional build input; required for releases): see craftrules standards/fonts.md.+ - uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4+ with:+ repository: storytold/craft-fonts+ ref: abb83316d96aa59c1cf64784289e378fe9fa5695 # bump deliberately+ path: craft-fonts+ - name: Build and package in a FreeBSD VM (tar.gz)+ # vmactions/freebsd-vm v1.5.9, pinned by commit (it runs our build).+ uses: vmactions/freebsd-vm@c46abacb49f09938ca4e1702d15d836285d694cc+ with:+ release: "14.3"+ usesh: true+ cpu: 4+ mem: 12288+ # Passed into the VM by name; never templated into the script below.+ envs: "LIGHTCRAFT_VERSION LIGHTCRAFT_BUILD_DATE LIGHTCRAFT_BUILD_SHA INPUT_VERSION"+ # The FreeBSD CI packages, plus bash for the packaging script.+ prepare: |+ pkg install -y bash git curl pkgconf cmake python3 libxkbcommon wayland libX11 libXcursor libXrandr libXi libxcb mesa-libs vulkan-loader gtk3 fontconfig freetype2 alsa-lib+ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal --default-toolchain stable+ run: |+ set -e+ . "$HOME/.cargo/env"+ git config --global --add safe.directory "$PWD"+ # Build outside the checkout so only dist/ is copied back out of the VM (copying the+ # target dir back fails on large builds). 4 jobs: more runs the VM out of memory.+ export CARGO_TARGET_DIR=/var/tmp/lightcraft-target CARGO_BUILD_JOBS=4+ if [ -n "$INPUT_VERSION" ]; then cargo xtask version set "$LIGHTCRAFT_VERSION"; fi+ # craft-fonts was checked out next to the sources and synced into the VM with them.+ export CRAFT_FONTS_DIR="$PWD/craft-fonts" CRAFT_FONTS_REQUIRED=1+ bash packaging/freebsd/package.sh+ tar -tzf dist/release/lightcraft-*-freebsd-x86_64.tar.gz \+ | grep -E '/bin/lightcraft$|/bin/lightcraft-cli$|/share/applications/ai\.storyteller\.lightcraft\.desktop$|/share/doc/lightcraft/LICENSE-MIT$'+ - uses: actions/upload-artifact@v4+ with:+ name: release-freebsd-x86_64+ path: dist/release/*+ if-no-files-found: error+web:name: Web (wasm)needs: versionruns-on: ubuntu-latest- environment: releaseenv:LIGHTCRAFT_VERSION: ${{ needs.version.outputs.version }}LIGHTCRAFT_BUILD_DATE: ${{ needs.version.outputs.date }}@@ -276,7 +367,7 @@ jobs:release:name: Draft GitHub Release- needs: [version, macos, windows, linux, web]+ needs: [version, macos, windows, linux, flatpak, freebsd, web]runs-on: ubuntu-latestenvironment: releasepermissions:diff --git a/README.md b/README.mdindex f1f2e4bc8..7d3ab6641 100644--- a/README.md+++ b/README.md@@ -59,6 +59,7 @@<a href="#feature-status">Status</a> ·<a href="#quick-start">Quick start</a> ·<a href="ROADMAP.md">Roadmap</a> ·+ <a href="#downloads">Downloads</a> ·<a href="#the-crafting-apps">Crafting Apps</a></p>@@ -414,6 +415,52 @@ Questions, ideas or a bug you'd like to talk through first? Bring them to [Disco<br>+## Downloads++Every [release](https://github.com/storytold/lightcraft/releases/latest) ships these builds. `<ver>` is the+version number; `SHA256SUMS.txt` lists a checksum for every file.++### macOS++| Build | File | Notes |+|---|---|---|+| App, universal (Apple silicon + Intel) | `lightcraft-<ver>-macos-universal.dmg` | Signed and notarized |+| Command-line tool, universal | `lightcraft-cli-<ver>-macos-universal.zip` | Signed and notarized |++### Windows++| Build | Installer | Portable |+|---|---|---|+| x64 (64-bit Intel/AMD) | `lightcraft-<ver>-windows-x64.msi` | `lightcraft-<ver>-windows-x64-portable.zip` |+| arm64 (Snapdragon and other ARM PCs) | `lightcraft-<ver>-windows-arm64.msi` | `lightcraft-<ver>-windows-arm64-portable.zip` |+| x86 (32-bit) | `lightcraft-<ver>-windows-x86.msi` | `lightcraft-<ver>-windows-x86-portable.zip` |++Installers and executables are code-signed.++### Linux++| Format | x86_64 | aarch64 (ARM64) | Notes |+|---|---|---|---|+| AppImage | `lightcraft-<ver>-linux-x86_64.AppImage` | `lightcraft-<ver>-linux-aarch64.AppImage` | Runs anywhere; updates itself with [AppImageUpdate](https://github.com/AppImageCommunity/AppImageUpdate) (`.zsync` files) |+| Flatpak | `lightcraft-<ver>-linux-x86_64.flatpak` | `lightcraft-<ver>-linux-aarch64.flatpak` | Sandboxed; `flatpak install --user <file>` |+| Debian/Ubuntu | `lightcraft-<ver>-linux-x86_64.deb` | `lightcraft-<ver>-linux-aarch64.deb` | |+| Fedora/RHEL/openSUSE | `lightcraft-<ver>-linux-x86_64.rpm` | `lightcraft-<ver>-linux-aarch64.rpm` | |+| Tarball | `lightcraft-<ver>-linux-x86_64.tar.gz` | `lightcraft-<ver>-linux-aarch64.tar.gz` | Unpack anywhere |++### FreeBSD++| Build | File |+|---|---|+| x86_64 | `lightcraft-<ver>-freebsd-x86_64.tar.gz` |++### Web (WebAssembly)++| Build | File | Notes |+|---|---|---|+| Static site | `lightcraft-web-<ver>.zip` | Runs in a modern browser; host it on any static server |++<br>+## The Crafting AppsLightCraft is one of the **Crafting Apps**: free, open-source creative tools from thediff --git a/docs/releasing.md b/docs/releasing.mdindex b19d975df..cf75fa706 100644--- a/docs/releasing.md+++ b/docs/releasing.md@@ -12,7 +12,7 @@ still apply.For a manual workflow run, the version input can override the workspace version for that run.Use a semantic version such as `1.2.0` or `1.2.0-rc.1`; versions containing a hyphen aremarked as prereleases.-3. Push to `release`, or dispatch the workflow from a branch allowed by the `release` environment.+3. Push to `release`, or dispatch the workflow on `release` (a dispatch on another branch is a dry run; see below).4. Check the workflow run and its artifacts. On success, the workflow creates or updates a **draft**GitHub Release named `LightCraft v<version>`, targeted at the commit that triggered the run.Review the draft and its `SHA256SUMS.txt`, then publish it in GitHub Releases when ready.@@ -22,14 +22,31 @@ release that has already been published, so bump the version before producing an## Builds and artifacts-Release jobs build macOS universal, Windows x86/x64/ARM64, Linux x86_64/aarch64, and the WASM web-app. The platform scripts in [`packaging/`](../packaging/) write their outputs to `dist/release/`:+Release jobs build macOS universal, Windows x86/x64/ARM64, Linux x86_64/aarch64, FreeBSD x86_64,+and the WASM web app. The platform scripts in [`packaging/`](../packaging/) write their outputs to+`dist/release/` (the full list of files is the README's Downloads section):- macOS: app DMG and CLI ZIP.- Windows: MSI installer and portable ZIP for each architecture.-- Linux: AppImage, `.deb`, `.rpm`, and `.tar.gz` for each architecture.+- Linux: AppImage (with its `.AppImage.zsync`), `.deb`, `.rpm`, and `.tar.gz` for each+ architecture (`packaging/linux/package.sh`). Each AppImage embeds+ `gh-releases-zsync|storytold|lightcraft|latest|lightcraft-*-linux-<arch>.AppImage.zsync`, so+ AppImageUpdate fetches only the changed blocks from the latest published (non-pre-) release.+- Flatpak: a single-file `.flatpak` bundle for each architecture, repackaged from that+ architecture's Linux tarball (`packaging/linux/flatpak-bundle.sh` with+ `packaging/linux/flatpak/ai.storyteller.lightcraft.bundle.yml`; no Rust build). The from-source+ manifest `ai.storyteller.lightcraft.yml` is for Flathub; packaging-lint keeps their runtime and+ `finish-args` identical.+- FreeBSD: `lightcraft-<version>-freebsd-x86_64.tar.gz`, a `/usr/local`-style tree built in a+ FreeBSD 14.3 VM (`packaging/freebsd/package.sh`, the same packages as `freebsd.yml`). Install+ with `tar -xzf <file> --strip-components 1 -C /usr/local`.- Web: `lightcraft-web-<version>.zip`.+Only the macOS, Windows and draft-release jobs use the `release` environment. The others sign+nothing, so dispatching the workflow on a branch (`gh workflow run release.yml --ref <branch>`)+dry-runs them: the signing jobs are refused by the environment's branch rule, and the release job,+which needs them, is skipped.+The Linux builds run on Ubuntu 22.04 and target glibc 2.35 or newer. AppImages and binaries mayalso require system libraries for the windowing stack; the `.deb` and `.rpm` packages declaretheir runtime dependencies.diff --git a/packaging/freebsd/package.sh b/packaging/freebsd/package.shnew file mode 100755index 000000000..0f3b928ab--- /dev/null+++ b/packaging/freebsd/package.sh@@ -0,0 +1,100 @@+#!/usr/bin/env bash+# Build and package LightCraft for FreeBSD:+#+# $DIST/lightcraft-<version>-freebsd-x86_64.tar.gz a /usr/local-style tree:+# lightcraft-<version>-freebsd-x86_64/{bin, share/applications, share/icons, share/mime,+# share/metainfo, share/doc/lightcraft}+#+# Install by copying the tree's contents into /usr/local:+# tar -xzf lightcraft-<version>-freebsd-x86_64.tar.gz --strip-components 1 -C /usr/local+#+# Usage: packaging/freebsd/package.sh [--skip-build] [--dry-run]+# --dry-run stage the tree from stub binaries and list it, without building (works on any OS)+#+# Needs: bash, cargo, and the packages installed in .github/workflows/freebsd.yml.+set -euo pipefail+# shellcheck source=../env.sh+. "$(dirname "${BASH_SOURCE[0]}")/../env.sh"+LINUX="$ROOT/packaging/linux"+APP_ID=ai.storyteller.lightcraft++SKIP_BUILD=0+DRY_RUN=0+while [ $# -gt 0 ]; do+ case "$1" in+ --skip-build) SKIP_BUILD=1; shift ;;+ --dry-run) DRY_RUN=1; SKIP_BUILD=1; shift ;;+ -h | --help) sed -n '2,15p' "$0"; exit 0 ;;+ *) echo "unknown argument: $1" >&2; exit 2 ;;+ esac+done++# FreeBSD's uname says amd64; release file names use x86_64 like the Linux and Windows ones.+MACHINE="$(uname -m)"+case "$MACHINE" in+ amd64 | x86_64) ARCH=x86_64 ;;+ arm64 | aarch64) ARCH=aarch64 ;;+ *) echo "unsupported architecture $MACHINE" >&2; exit 2 ;;+esac+if [ "$DRY_RUN" = 0 ] && [ "$(uname -s)" != FreeBSD ]; then+ echo "error: build on FreeBSD (or pass --dry-run to check the tree layout)" >&2+ exit 2+fi+BASENAME="lightcraft-$VERSION-freebsd-$ARCH"++echo "==> LightCraft $VERSION for FreeBSD $ARCH"++# The release VM has 12 GB; full parallelism on the biggest crates runs it out of memory.+export CARGO_BUILD_JOBS="${CARGO_BUILD_JOBS:-4}"+if [ "$SKIP_BUILD" = 0 ]; then+ (cd "$ROOT" && cargo build --release --locked -p lightcraft -p lightcraft-cli)+fi+WORK="$CARGO_TARGET_DIR/freebsd-package"+STAGE="$WORK/$BASENAME"+rm -rf "$WORK"+mkdir -p "$WORK"++BIN="$CARGO_TARGET_DIR/release"+OUT_DIR="$DIST"+if [ "$DRY_RUN" = 1 ]; then+ # Stub binaries, and the tarball stays in the work dir so dist/ only ever holds real builds.+ BIN="$WORK/stub-bin"+ OUT_DIR="$WORK"+ mkdir -p "$BIN"+ for b in lightcraft lightcraft-cli; do+ printf '#!/bin/sh\necho "%s %s (dry-run stub)"\n' "$b" "$VERSION" >"$BIN/$b"+ chmod 755 "$BIN/$b"+ done+fi++# ---- stage a /usr/local-style tree --------------------------------------------------------------+# FreeBSD's install(1) has no -D: create the directories first.+mkdir -p "$STAGE/bin" "$STAGE/share/applications" "$STAGE/share/mime/packages" \+ "$STAGE/share/metainfo" "$STAGE/share/icons" "$STAGE/share/doc/lightcraft"+install -m 755 "$BIN/lightcraft" "$BIN/lightcraft-cli" "$STAGE/bin/"+strip "$STAGE/bin/lightcraft" "$STAGE/bin/lightcraft-cli" 2>/dev/null || true+# The desktop entry, MIME type, metainfo and icons are the freedesktop files Linux ships.+install -m 644 "$LINUX/$APP_ID.desktop" "$STAGE/share/applications/$APP_ID.desktop"+install -m 644 "$LINUX/$APP_ID.mime.xml" "$STAGE/share/mime/packages/$APP_ID.xml"+sed -e "s/@VERSION@/$VERSION/g" -e "s/@DATE@/$LIGHTCRAFT_BUILD_DATE/g" \+ "$LINUX/$APP_ID.metainfo.xml.in" >"$STAGE/share/metainfo/$APP_ID.metainfo.xml"+cp -R "$ROOT/assets/app-icon/hicolor" "$STAGE/share/icons/"+copy_docs "$STAGE/share/doc/lightcraft"++for f in bin/lightcraft bin/lightcraft-cli "share/applications/$APP_ID.desktop" \+ "share/icons/hicolor/256x256/apps/$APP_ID.png" "share/icons/hicolor/scalable/apps/$APP_ID.svg" \+ share/doc/lightcraft/LICENSE-MIT share/doc/lightcraft/LICENSE-APACHE; do+ if [ ! -e "$STAGE/$f" ]; then echo "error: $f is missing from the package" >&2; exit 1; fi+done++# ---- .tar.gz ------------------------------------------------------------------------------------+mkdir -p "$OUT_DIR"+tar -C "$WORK" -czf "$OUT_DIR/$BASENAME.tar.gz" "$BASENAME"+echo "wrote $OUT_DIR/$BASENAME.tar.gz"++"$STAGE/bin/lightcraft-cli" --version+if [ "$DRY_RUN" = 1 ]; then+ echo "==> dry run: tarball contents"+ tar -tzvf "$OUT_DIR/$BASENAME.tar.gz"+fi+echo "==> done"diff --git a/packaging/linux/flatpak-bundle.sh b/packaging/linux/flatpak-bundle.shnew file mode 100755index 000000000..6ad39ebec--- /dev/null+++ b/packaging/linux/flatpak-bundle.sh@@ -0,0 +1,72 @@+#!/usr/bin/env bash+# Repackage a LightCraft Linux tarball as a single-file Flatpak bundle:+#+# $DIST/lightcraft-<version>-linux-<arch>.flatpak+#+# Usage: packaging/linux/flatpak-bundle.sh [--no-test] [TARBALL]+#+# TARBALL defaults to $DIST/lightcraft-<version>-linux-<arch>.tar.gz from package.sh. The bundle+# is built for the host architecture (x86_64 or aarch64), which must match the tarball's.+# Needs flatpak, flatpak-builder and the SVG pixbuf loader (librsvg2-common) for the host's+# `appstreamcli compose`; the freedesktop runtime and SDK named in the manifest are+# installed per-user from Flathub. Unless --no-test, the bundle is then installed per-user and+# `lightcraft-cli --version` is run inside the sandbox as a smoke test.+# Manifest: packaging/linux/flatpak/ai.storyteller.lightcraft.bundle.yml.+set -euo pipefail+# shellcheck source=../env.sh+. "$(dirname "${BASH_SOURCE[0]}")/../env.sh"+HERE="$ROOT/packaging/linux"+APP_ID=ai.storyteller.lightcraft+FLATHUB=https://dl.flathub.org/repo/flathub.flatpakrepo++TEST=1+TARBALL=""+while [ $# -gt 0 ]; do+ case "$1" in+ --no-test) TEST=0; shift ;;+ -h | --help) sed -n '2,14p' "$0"; exit 0 ;;+ -*) echo "unknown argument: $1" >&2; exit 2 ;;+ *) TARBALL="$1"; shift ;;+ esac+done++ARCH="$(uname -m)"+case "$ARCH" in+ x86_64) ;;+ aarch64 | arm64) ARCH=aarch64 ;;+ *) echo "unsupported architecture $ARCH" >&2; exit 2 ;;+esac+BASENAME="lightcraft-$VERSION-linux-$ARCH"+TARBALL="${TARBALL:-$DIST/$BASENAME.tar.gz}"+[ -f "$TARBALL" ] || { echo "error: $TARBALL not found (run packaging/linux/package.sh --formats tar first)" >&2; exit 1; }+for tool in flatpak flatpak-builder; do+ command -v "$tool" >/dev/null || { echo "error: $tool not found (apt install flatpak flatpak-builder librsvg2-common)" >&2; exit 1; }+done++echo "==> LightCraft $VERSION Flatpak bundle for $ARCH from $(basename "$TARBALL")"++WORK="$CARGO_TARGET_DIR/flatpak-bundle"+rm -rf "$WORK"+mkdir -p "$WORK/stage"+tar -xzf "$TARBALL" -C "$WORK/stage" --strip-components=1+[ -x "$WORK/stage/bin/lightcraft" ] || { echo "error: $TARBALL has no bin/lightcraft" >&2; exit 1; }+cp "$HERE/flatpak/$APP_ID.bundle.yml" "$WORK/$APP_ID.yml"++flatpak remote-add --user --if-not-exists flathub "$FLATHUB"+# --disable-rofiles-fuse: no FUSE in containers and CI runners.+flatpak-builder --user --install-deps-from=flathub --disable-rofiles-fuse --force-clean \+ --default-branch=stable --repo="$WORK/repo" --state-dir="$WORK/state" "$WORK/build" "$WORK/$APP_ID.yml"++OUT="$DIST/$BASENAME.flatpak"+# --runtime-repo lets `flatpak install` fetch the freedesktop runtime from Flathub if missing.+flatpak build-bundle --runtime-repo="$FLATHUB" "$WORK/repo" "$OUT" "$APP_ID" stable+echo "wrote $OUT"++if [ "$TEST" = 1 ]; then+ flatpak install --user -y --noninteractive --reinstall "$OUT"+ flatpak info --user "$APP_ID"+ flatpak run --command=lightcraft-cli "$APP_ID" --version+ flatpak run --command=sh "$APP_ID" -c 'ls /app/share/applications /app/share/metainfo /app/share/mime/packages /app/share/icons/hicolor/scalable/apps'+fi+echo "==> done"+ls -lh "$OUT"diff --git a/packaging/linux/flatpak/ai.storyteller.lightcraft.bundle.yml b/packaging/linux/flatpak/ai.storyteller.lightcraft.bundle.ymlnew file mode 100644index 000000000..752e1edec--- /dev/null+++ b/packaging/linux/flatpak/ai.storyteller.lightcraft.bundle.yml@@ -0,0 +1,50 @@+# Flatpak manifest for the single-file bundle attached to every GitHub release+# (lightcraft-<version>-linux-<arch>.flatpak). Build it with packaging/linux/flatpak-bundle.sh.+#+# It repackages the release's own Linux tarball (lightcraft-<version>-linux-<arch>.tar.gz,+# built on Ubuntu 22.04 by package.sh) instead of compiling Rust inside flatpak-builder: no+# network and no vendored crate sources during the build, a few seconds instead of 20+ minutes,+# and byte-for-byte the same binaries as the AppImage/deb/rpm. The script unpacks the tarball+# into `stage/` next to a copy of this file. The binaries need glibc >= 2.35 and load X11,+# Wayland, xkbcommon and Vulkan at runtime; the freedesktop runtime has all of them, and the+# GPU driver comes from its org.freedesktop.Platform.GL extension.+#+# ai.storyteller.lightcraft.yml (same directory) is the from-source manifest for Flathub. Keep+# runtime-version and finish-args identical in both (packaging-lint checks this).+id: ai.storyteller.lightcraft+runtime: org.freedesktop.Platform+runtime-version: '25.08'+sdk: org.freedesktop.Sdk+command: lightcraft+finish-args:+ # Display: Wayland first; X11 only when no Wayland compositor is running.+ - --socket=wayland+ - --socket=fallback-x11+ # X11 shared memory (MIT-SHM). Without it the X11 fallback is slow or fails.+ - --share=ipc+ # GPU access for the wgpu renderer (Vulkan, or GL as a fallback).+ - --device=dri+ # The library lives in ~/Pictures/LightCraft Library by default, and imports usually come from+ # Pictures. Open/Save dialogs go through the file-chooser portal (rfd's xdg-portal backend) and+ # drag-and-drop through the document portal, so picked folders elsewhere work without broad+ # filesystem access.+ - --filesystem=xdg-pictures+ # Deliberately not granted: home/host filesystem access, and network. The network is only for+ # the optional SAM 3 model download (AI Object/Describe masks, docs/ai-masks.md); without it+ # that download fails with an error and everything else works. Users who want it run+ # `flatpak override --user --share=network ai.storyteller.lightcraft`.+modules:+ - name: lightcraft+ buildsystem: simple+ build-commands:+ - install -Dm755 bin/lightcraft /app/bin/lightcraft+ - install -Dm755 bin/lightcraft-cli /app/bin/lightcraft-cli+ - install -Dm644 share/applications/ai.storyteller.lightcraft.desktop /app/share/applications/ai.storyteller.lightcraft.desktop+ # The same MIME definitions the deb/rpm install.+ - install -Dm644 share/mime/packages/ai.storyteller.lightcraft.xml /app/share/mime/packages/ai.storyteller.lightcraft.xml+ # Already has the release's version and date substituted by package.sh.+ - install -Dm644 share/metainfo/ai.storyteller.lightcraft.metainfo.xml /app/share/metainfo/ai.storyteller.lightcraft.metainfo.xml+ - mkdir -p /app/share/icons /app/share/doc && cp -R share/icons/hicolor /app/share/icons/ && cp -R share/doc/lightcraft /app/share/doc/+ sources:+ - type: dir+ path: stagediff --git a/packaging/linux/flatpak/ai.storyteller.lightcraft.yml b/packaging/linux/flatpak/ai.storyteller.lightcraft.ymlindex ed435bbaf..e9dbd244b 100644--- a/packaging/linux/flatpak/ai.storyteller.lightcraft.yml+++ b/packaging/linux/flatpak/ai.storyteller.lightcraft.yml@@ -8,6 +8,10 @@# flatpak run ai.storyteller.lightcraft## For Flathub, replace the `dir` source with a `git` source pinned to a release tag and commit.+#+# ai.storyteller.lightcraft.bundle.yml (same directory) builds the .flatpak attached to every+# release from the prebuilt binaries. Keep runtime-version and finish-args identical in both+# (packaging-lint checks this).id: ai.storyteller.lightcraftruntime: org.freedesktop.Platformruntime-version: '25.08'@@ -16,14 +20,22 @@ sdk-extensions:- org.freedesktop.Sdk.Extension.rust-stablecommand: lightcraftfinish-args:- - --share=ipc+ # Display: Wayland first; X11 only when no Wayland compositor is running.- --socket=wayland- --socket=fallback-x11+ # X11 shared memory (MIT-SHM). Without it the X11 fallback is slow or fails.+ - --share=ipc+ # GPU access for the wgpu renderer (Vulkan, or GL as a fallback).- --device=dri- # Open/Save dialogs use the file-chooser portal (rfd), and drag-and-drop uses the document- # portal, so broad filesystem access isn't needed. Pictures is granted for opening files by- # path from the command line.+ # The library lives in ~/Pictures/LightCraft Library by default, and imports usually come from+ # Pictures. Open/Save dialogs go through the file-chooser portal (rfd's xdg-portal backend) and+ # drag-and-drop through the document portal, so picked folders elsewhere work without broad+ # filesystem access.- --filesystem=xdg-pictures+ # Deliberately not granted: home/host filesystem access, and network. The network is only for+ # the optional SAM 3 model download (AI Object/Describe masks, docs/ai-masks.md); without it+ # that download fails with an error and everything else works. Users who want it run+ # `flatpak override --user --share=network ai.storyteller.lightcraft`.build-options:append-path: /usr/lib/sdk/rust-stable/binmodules:@@ -34,8 +46,9 @@ modules:CARGO_HOME: /run/build/lightcraft/cargoCARGO_NET_OFFLINE: 'true'build-commands:- - cargo --offline build --release --locked -p lightcraft+ - cargo --offline build --release --locked -p lightcraft -p lightcraft-cli- install -Dm755 target/release/lightcraft /app/bin/lightcraft+ - install -Dm755 target/release/lightcraft-cli /app/bin/lightcraft-cli- install -Dm644 packaging/linux/ai.storyteller.lightcraft.desktop /app/share/applications/ai.storyteller.lightcraft.desktop- install -Dm644 packaging/linux/ai.storyteller.lightcraft.mime.xml /app/share/mime/packages/ai.storyteller.lightcraft.xml- mkdir -p /app/share/icons && cp -R assets/app-icon/hicolor /app/share/icons/diff --git a/packaging/linux/nfpm.yaml b/packaging/linux/nfpm.yamlindex 9289b112b..e7103f7f3 100644--- a/packaging/linux/nfpm.yaml+++ b/packaging/linux/nfpm.yaml@@ -17,10 +17,11 @@ vendor: Learning Machines LLChomepage: https://getartcraft.com/apps/lightcraftlicense: MIT OR Apache-2.0description: |-- Open-source, native image editor that works the way Photoshop users expect.- Layers, masks, adjustment layers, layer styles, type and brushes; opens and- saves layered PSD/PSB files; 8/16/32-bit documents; GPU compositing (wgpu).- Includes lightcraft-cli, a headless converter and command runner.+ Open-source, native photo library and raw developer that works the way+ Lightroom users expect. Import, rate, keyword and organise photos; develop+ raw files non-destructively with exposure, tone, color grading, masks and+ presets; GPU processing (wgpu). Includes lightcraft-cli, a headless renderer+ and command runner.# The binaries link only glibc and libgcc_s directly. Windowing (X11/Wayland, xkbcommon) and the# GPU (Vulkan, EGL/GL) are loaded at runtime, so they are dependencies/recommendations herediff --git a/packaging/linux/package.sh b/packaging/linux/package.shindex 9be6a1d3b..e03cab5cd 100755--- a/packaging/linux/package.sh+++ b/packaging/linux/package.sh@@ -2,6 +2,7 @@# Build and package LightCraft for Linux (<arch> is x86_64 or aarch64):## $DIST/lightcraft-<version>-linux-<arch>.AppImage any distro with glibc >= the build host's+# $DIST/lightcraft-<version>-linux-<arch>.AppImage.zsync delta updates (needs zsyncmake)# $DIST/lightcraft-<version>-linux-<arch>.deb Debian, Ubuntu, Mint, Pop!_OS, ...# $DIST/lightcraft-<version>-linux-<arch>.rpm Fedora, openSUSE, RHEL, ...# $DIST/lightcraft-<version>-linux-<arch>.tar.gz plain FHS-style tree (bin/, share/)@@ -10,7 +11,8 @@## Needs: cargo; nfpm for deb/rpm (https://nfpm.goreleaser.com); appimagetool for the AppImage# (downloaded into $CARGO_TARGET_DIR if missing). Build on an old distro (CI: Ubuntu 22.04,-# glibc 2.35) so the binaries run on newer ones. Optional: desktop-file-validate, appstreamcli.+# glibc 2.35) so the binaries run on newer ones. Optional: desktop-file-validate, appstreamcli,+# zsyncmake (the zsync package) for the AppImage's .zsync.set -euo pipefail# shellcheck source=../env.sh. "$(dirname "${BASH_SOURCE[0]}")/../env.sh"@@ -108,11 +110,29 @@ if has appimage; thenchmod +x "$TOOL"fifi- OUT="$DIST/$BASENAME.AppImage"+ # Absolute, because appimagetool runs in $DIST below (CARGO_TARGET_DIR or APPIMAGETOOL may be+ # relative).+ OUT="$(cd "$DIST" && pwd)/$BASENAME.AppImage"+ APPDIR="$(cd "$APPDIR" && pwd)"+ TOOL="$(cd "$(dirname "$TOOL")" && pwd)/$(basename "$TOOL")"+ # A .zsync left by an earlier run would hide a missing zsyncmake and describe another file.+ rm -f "$OUT.zsync"+ # Update information: AppImageUpdate, AppImageLauncher and the like read it from the file and+ # fetch only the blocks that changed in a newer release, through the .zsync published next to+ # each AppImage on GitHub Releases. `latest` is the newest published release that is not a+ # pre-release. A fork's builds point at its own releases through GITHUB_REPOSITORY.+ REPO="${GITHUB_REPOSITORY:-storytold/lightcraft}"+ UPDATE_INFO="gh-releases-zsync|${REPO%%/*}|${REPO#*/}|latest|lightcraft-*-linux-$ARCH.AppImage.zsync"# Extract-and-run: works without FUSE (containers, CI). The output embeds the static runtime,- # so users don't need libfuse2 either.- ARCH="$ARCH" APPIMAGE_EXTRACT_AND_RUN=1 "$TOOL" --no-appstream "$APPDIR" "$OUT"+ # so users don't need libfuse2 either. With zsyncmake on the host (CI installs the zsync+ # package) appimagetool also writes the .zsync, into its working directory, hence the cd.+ (cd "$DIST" && ARCH="$ARCH" APPIMAGE_EXTRACT_AND_RUN=1 "$TOOL" --no-appstream -u "$UPDATE_INFO" "$APPDIR" "$OUT")echo "wrote $OUT"+ if [ -s "$OUT.zsync" ]; then+ echo "wrote $OUT.zsync"+ else+ warn "zsyncmake not found, so $OUT.zsync was not written; AppImage delta updates need it"+ fifi"$STAGE/usr/bin/lightcraft-cli" --version