diff --git a/.golangci.yml b/.golangci.yml index 4a180f2..a0eff15 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -4,7 +4,8 @@ run: # The Braille helper and the DuckDB debug-log sink live behind build tags; # without listing them here those files are silently never analyzed. # Analyzing with these tags needs the same development libraries as the - # Arch PKGBUILD (at-spi2, gtk3, brltty, liblouis, duckdb headers). + # Arch PKGBUILD (at-spi2, gtk3, brltty, liblouis), plus duckdb headers + # until the master-tracking package recipe builds the DuckDB feature. build-tags: - brlapi - duckdb diff --git a/AGENTS.md b/AGENTS.md index cfe0351..8ae14ea 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -19,6 +19,8 @@ Cthulhu is a Go Linux screen reader. `cmd/` contains executables; `internal/` ow ## Build, Test, and Development Commands Use Go 1.24+ with CGO and development libraries listed by the Arch `PKGBUILD`. +Tagged DuckDB builds also need the DuckDB headers while the master-tracking +`cthulhu-git` recipe does not build this unreleased feature. - `go build -o build/cthulhu ./cmd/cthulhu`: build the reader. - `go build -tags brlapi -o build/cthulhu-braille ./cmd/cthulhu-braille`: build the Braille helper. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8be10be..185e2e6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -58,8 +58,9 @@ Start verification with the affected packages; run broader checks when the chang Lint with `golangci-lint run ./...` before submission. The configuration in `.golangci.yml` is v2-schema and already sets the `brlapi` and `duckdb` build tags, so tagged native files are analyzed; that needs the same -development libraries as the Arch `PKGBUILD`, including BrlAPI/liblouis and -the DuckDB headers. Keep `golangci-lint` built with a Go version at least +development libraries as the Arch `PKGBUILD` plus DuckDB headers while the +master-tracking `cthulhu-git` recipe does not build the unreleased DuckDB +feature. Keep `golangci-lint` built with a Go version at least as new as the project toolchain: an older linter cannot decode current export data and reports spurious typecheck errors. Deliberate exclusions (cleanup `Close` calls, test-fixture error handling, style checks that diff --git a/distro-packages/Arch-Linux/cthulhu-git/PKGBUILD b/distro-packages/Arch-Linux/cthulhu-git/PKGBUILD index cd914eb..96ecb28 100644 --- a/distro-packages/Arch-Linux/cthulhu-git/PKGBUILD +++ b/distro-packages/Arch-Linux/cthulhu-git/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=cthulhu-git pkgname=cthulhu-git _pkgname=cthulhu pkgver=2026.10.31.r588.g9680b58 -pkgrel=3 +pkgrel=2 pkgdesc="Desktop-agnostic screen reader with speech, Braille, and Tentacle support" url="https://git.stormux.org/storm/cthulhu" arch=(x86_64 aarch64 armv7h) @@ -45,7 +45,6 @@ optdepends=( 'git: Discover and update Tentacle repositories' 'tesseract: OCR engine for text recognition' 'tesseract-data-eng: English OCR language data' - 'duckdb: DuckDB debug database logging with --debug-db' ) optdepends_x86_64=( # Wine accessibility helpers are supported on x86_64. @@ -55,8 +54,6 @@ makedepends=( git go pkgconf - # Headers only: libduckdb is dlopen'ed at runtime when --debug-db is used. - duckdb ) options=(!debug !lto) source=("${_pkgname}::git+https://git.stormux.org/storm/${_pkgname}.git#branch=master") @@ -85,7 +82,7 @@ build() { export GOCACHE="${GOCACHE:-${srcdir}/go-build}" export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw" - go build -tags duckdb -o build/cthulhu ./cmd/cthulhu + go build -o build/cthulhu ./cmd/cthulhu go build -tags brlapi -o build/cthulhu-braille ./cmd/cthulhu-braille # Include the helper once incoming Remote keyboard support reaches master. if [[ -d cmd/cthulhu-input-helper ]]; then @@ -98,7 +95,7 @@ check() { export CGO_ENABLED=1 export GOPATH="${srcdir}/go" export GOCACHE="${GOCACHE:-${srcdir}/go-build}" - go test -tags 'brlapi duckdb' ./... -count=1 + go test -tags brlapi ./... -count=1 } package() { diff --git a/internal/version/version.go b/internal/version/version.go index 881349c..6a9d065 100644 --- a/internal/version/version.go +++ b/internal/version/version.go @@ -22,7 +22,7 @@ import "strings" const Name = "Cthulhu" const Version = "2026.11.11" -const Channel = "hunter" +const Channel = "testing" var Build = Version