Add the real AUR PKGBUILD as packaging/aur

app/install_arch.sh generates a PKGBUILD into a mktemp dir with no source=() and
a package() that copies from hardcoded absolute paths under /home/kuhy. That
only ever works on one machine, so it cannot be published. This PKGBUILD builds
from the GitHub release tarball (v1.0.1) instead, and fixes what AUR review
would reject: license=('MIT') with the text actually installed to
/usr/share/licenses, real depends (glibc/bash/hicolor-icon-theme, found by
namcap), and the desktop entry plus icons installed into the package rather than
into ~/.local/share after the fact.

The app lives in app/ while LICENSE is at the repo root, so build()/package()
cd into the subdir and install the license from an absolute $srcdir path.
v1.0.0 was already taken by an older commit predating the LICENSE, hence v1.0.1.
The README documents the tagging hazard: this clone carries grafted upstream
Flutter SDK tags that must never be pushed with `git push --tags`.

install_arch.sh keeps its working-tree dev loop and is deliberately not wired to
this file. Verified: makepkg -Cf from a clean dir with only packaged Flutter on
PATH, namcap clean, pacman -U, and `diet-guard-app` serving on port 8732.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Aoa1nKWRrAbowz7Hfd3tgL
This commit is contained in:
Krzysztof Rudnicki 2026-08-09 22:54:42 +02:00
parent f0a8337b35
commit 291c60417b
3 changed files with 167 additions and 0 deletions

View File

@ -147,6 +147,10 @@ repos:
entry: bash -c 'printf "%s\0" "$@" | xargs -0 -n 40 shellcheck --severity=warning' --
language: system
types: [shell]
# A PKGBUILD is a makepkg manifest, not a standalone script: it has no
# shebang (SC2148) and its variables are read by makepkg rather than by
# the file itself (SC2034). namcap is what actually lints these.
exclude: '^packaging/aur/PKGBUILD$'
- id: max-file-length
name: Max file length (500 lines)
entry: python3 scripts/check_file_length.py

97
packaging/aur/PKGBUILD Normal file
View File

@ -0,0 +1,97 @@
# Maintainer: Krzysztof Rudnicki <krzysztofrudnicki0@gmail.com>
pkgname=diet-guard-app
# v1.0.0 already existed upstream on an older commit that predates the LICENSE,
# so the first packageable tag is v1.0.1.
pkgver=1.0.1
pkgrel=1
pkgdesc='Diet logging and budget companion (Flutter web in a Chrome app window)'
arch=('x86_64')
url='https://github.com/kuhyx/diet-guard'
license=('MIT')
# A Chrome-family browser renders the UI, but none is a hard dependency: the
# wrapper discovers whichever is installed at run time (Chrome, Chromium,
# Thorium, Brave) and reports clearly if none is present. The deps below are
# the ones actually linked/executed: the Dart AOT binary needs glibc,
# /usr/bin/diet-guard-app is a bash script, and the icons are installed into
# the hicolor theme hierarchy.
depends=('glibc' 'bash' 'hicolor-icon-theme')
optdepends=('google-chrome: renders the app window'
'chromium: renders the app window')
makedepends=('flutter') # flutter-bin provides `flutter`; either satisfies this
# !strip is LOAD-BEARING: the wrapper is a Dart AOT executable with its snapshot
# embedded in the ELF. Stripping discards the snapshot and the binary degrades
# to a bare dartaotruntime that refuses to run ("is not an AOT snapshot").
# !debug because Flutter/Dart AOT release binaries carry no extractable DWARF.
options=('!strip' '!debug')
source=("$pkgname-$pkgver.tar.gz::$url/archive/refs/tags/v$pkgver.tar.gz")
sha256sums=('bfe51056e6b154890b86568d7462ec0f8caf47e4e826e246081eb158be45d22e')
# The Flutter app lives in the repo's app/ subdirectory, so the tarball
# extracts as diet-guard-$pkgver/app/ while LICENSE sits at the repo root.
_srcdir="diet-guard-$pkgver"
build() {
cd "$_srcdir/app"
# makepkg builds as an unprivileged user with no writable default pub cache;
# keep it inside $srcdir so the build is self-contained and leaves no trace.
export PUB_CACHE="$srcdir/.pub-cache"
flutter build web --release
# `dart build cli`, NOT `dart compile exe`: dependencies with native build
# hooks are something `dart compile` refuses to handle.
dart build cli -o build/cli
}
package() {
cd "$_srcdir/app"
local bundle="build/cli/bundle"
# Preserve the bundle's bin/ + lib/ layout: the executable resolves its
# native libraries from ../lib and the web assets from ../web.
install -dm755 "$pkgdir/opt/diet-guard-app"
cp -r "$bundle/bin" "$pkgdir/opt/diet-guard-app/bin"
# lib/ exists only when a dependency ships native code; this app has none,
# so the bundle is bin/-only and copying lib/ unconditionally would fail.
if [[ -d "$bundle/lib" ]]; then
cp -r "$bundle/lib" "$pkgdir/opt/diet-guard-app/lib"
fi
chmod 755 "$pkgdir/opt/diet-guard-app/bin/diet_guard_desktop"
install -dm755 "$pkgdir/opt/diet-guard-app/web"
cp -r build/web/. "$pkgdir/opt/diet-guard-app/web/"
install -dm755 "$pkgdir/usr/bin"
cat > "$pkgdir/usr/bin/diet-guard-app" <<'WRAPPER'
#!/bin/bash
exec /opt/diet-guard-app/bin/diet_guard_desktop "$@"
WRAPPER
chmod 755 "$pkgdir/usr/bin/diet-guard-app"
# Desktop entry written inline. Do NOT call install_desktop_entry.sh: it
# targets ~/.local/share and its dev fallback points Exec at the repo's run.sh.
# StartupWMClass is diet_guard_app (underscores) while the icon is
# diet-guard-app (hyphens); they genuinely differ. The WM class must match
# what Chrome gets from the wrapper's --class flag.
install -Dm644 /dev/stdin "$pkgdir/usr/share/applications/diet-guard-app.desktop" <<'DESKTOP'
[Desktop Entry]
Type=Application
Name=diet guard
Comment=Diet logging and budget companion
Exec=/usr/bin/diet-guard-app
Icon=diet-guard-app
Terminal=false
Categories=Utility;
StartupWMClass=diet_guard_app
DESKTOP
local size
for size in 16 24 32 48 64 128 256 512; do
install -Dm644 "desktop/icons/$size/diet-guard-app.png" \
"$pkgdir/usr/share/icons/hicolor/${size}x${size}/apps/diet-guard-app.png"
done
# No gtk-update-icon-cache / update-desktop-database here: pacman hooks own
# that, and namcap flags calling them from package().
# LICENSE lives at the repo root, not in app/ — reference it absolutely.
install -Dm644 "$srcdir/$_srcdir/LICENSE" \
"$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}

66
packaging/aur/README.md Normal file
View File

@ -0,0 +1,66 @@
# AUR packaging
`PKGBUILD` here is the source of truth for the `diet-guard-app` AUR package.
The AUR checkout (`~/aur/diet-guard-app`) is a copy of this file plus a
generated `.SRCINFO`.
## Why the checksum can go stale
`source=` points at the GitHub tarball for tag `v$pkgver`, and `sha256sums`
is the hash of that tarball. A tarball contains this very file, so the
checksum for tag vX cannot be committed *before* vX is tagged. The copy here
is therefore a **template**: after pushing a new tag, run `updpkgsums` in the
AUR checkout to fill in the real hash, and copy the result back here.
## Tagging hazard (read before tagging)
This repo has grafted upstream Flutter SDK history, so the **local** clone
carries hundreds of tags (`flutter-N.N-candidate.N`, `vN.N.N-N.N.pre`, and a
`v1.16.3` that points at a 2020 `[flutter_tools]` commit) that do not belong to
this app. The remote has only a handful.
- **Never run `git push --tags` here.** It would publish all of them.
- Always push one tag explicitly: `git push origin v1.2.3`.
- Resolve the next free version with `git ls-remote --tags origin`, never with
the local `git tag`.
`v1.0.0` on the remote points at an older commit that predates the LICENSE, so
the first packageable tag was `v1.0.1`.
## Release flow
```bash
# 1. bump `version:` in app/pubspec.yaml, commit, push
# 2. tag and push the SINGLE tag
git tag v1.2.3 && git push origin v1.2.3
# 3. sync + checksum + build + verify
cp packaging/aur/PKGBUILD ~/aur/diet-guard-app/PKGBUILD
cd ~/aur/diet-guard-app
# bump pkgver to match the tag, then:
updpkgsums
makepkg -Cf
namcap ./*.pkg.tar.zst
sudo pacman -U ./diet-guard-app-*.pkg.tar.zst
diet-guard-app # must print: diet_guard desktop serving on http://localhost:8732
# 4. publish
makepkg --printsrcinfo > .SRCINFO
git add PKGBUILD .SRCINFO && git commit && git push # branch is `master`
```
## Notes
- The Flutter app lives in `app/`, so the tarball extracts as
`diet-guard-$pkgver/app/` while `LICENSE` sits at the repo root. `build()`
and `package()` `cd` into the subdir; the license is installed from an
absolute `$srcdir` path.
- `StartupWMClass` is `diet_guard_app` (underscores) while the icon name is
`diet-guard-app` (hyphens). They genuinely differ — the WM class must match
what Chrome gets from the wrapper's `--class` flag.
- `install_arch.sh` is deliberately **not** wired to this PKGBUILD. That script
builds the working tree for local development; this one builds a downloaded
release tarball. Merging them would destroy the dev loop.
- `options=('!strip')` is load-bearing — see the comment in the PKGBUILD.
- Building requires network access (`pub get`, plus a git fetch of the shared
`crdt_sync` dependency). The tracked `pubspec.lock` pins what gets resolved.