Keep master-tracking package independent of unreleased DuckDB
This commit is contained in:
1 parent
8cfb9e5593
commit
8592d3be11
5 files changed
+11
-10
No files matched your search
+2
-1
@@ -4,7 +4,8 @@ run:
|
|||||||
# The Braille helper and the DuckDB debug-log sink live behind build tags;
|
# The Braille helper and the DuckDB debug-log sink live behind build tags;
|
||||||
# without listing them here those files are silently never analyzed.
|
# without listing them here those files are silently never analyzed.
|
||||||
# Analyzing with these tags needs the same development libraries as the
|
# 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:
|
build-tags:
|
||||||
- brlapi
|
- brlapi
|
||||||
- duckdb
|
- duckdb
|
||||||
|
|||||||
@@ -19,6 +19,8 @@ Cthulhu is a Go Linux screen reader. `cmd/` contains executables; `internal/` ow
|
|||||||
## Build, Test, and Development Commands
|
## Build, Test, and Development Commands
|
||||||
|
|
||||||
Use Go 1.24+ with CGO and development libraries listed by the Arch `PKGBUILD`.
|
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 -o build/cthulhu ./cmd/cthulhu`: build the reader.
|
||||||
- `go build -tags brlapi -o build/cthulhu-braille ./cmd/cthulhu-braille`: build the Braille helper.
|
- `go build -tags brlapi -o build/cthulhu-braille ./cmd/cthulhu-braille`: build the Braille helper.
|
||||||
|
|||||||
+3
-2
@@ -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
|
Lint with `golangci-lint run ./...` before submission. The configuration in
|
||||||
`.golangci.yml` is v2-schema and already sets the `brlapi` and `duckdb`
|
`.golangci.yml` is v2-schema and already sets the `brlapi` and `duckdb`
|
||||||
build tags, so tagged native files are analyzed; that needs the same
|
build tags, so tagged native files are analyzed; that needs the same
|
||||||
development libraries as the Arch `PKGBUILD`, including BrlAPI/liblouis and
|
development libraries as the Arch `PKGBUILD` plus DuckDB headers while the
|
||||||
the DuckDB headers. Keep `golangci-lint` built with a Go version at least
|
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
|
as new as the project toolchain: an older linter cannot decode current
|
||||||
export data and reports spurious typecheck errors. Deliberate exclusions
|
export data and reports spurious typecheck errors. Deliberate exclusions
|
||||||
(cleanup `Close` calls, test-fixture error handling, style checks that
|
(cleanup `Close` calls, test-fixture error handling, style checks that
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ pkgbase=cthulhu-git
|
|||||||
pkgname=cthulhu-git
|
pkgname=cthulhu-git
|
||||||
_pkgname=cthulhu
|
_pkgname=cthulhu
|
||||||
pkgver=2026.10.31.r588.g9680b58
|
pkgver=2026.10.31.r588.g9680b58
|
||||||
pkgrel=3
|
pkgrel=2
|
||||||
pkgdesc="Desktop-agnostic screen reader with speech, Braille, and Tentacle support"
|
pkgdesc="Desktop-agnostic screen reader with speech, Braille, and Tentacle support"
|
||||||
url="https://git.stormux.org/storm/cthulhu"
|
url="https://git.stormux.org/storm/cthulhu"
|
||||||
arch=(x86_64 aarch64 armv7h)
|
arch=(x86_64 aarch64 armv7h)
|
||||||
@@ -45,7 +45,6 @@ optdepends=(
|
|||||||
'git: Discover and update Tentacle repositories'
|
'git: Discover and update Tentacle repositories'
|
||||||
'tesseract: OCR engine for text recognition'
|
'tesseract: OCR engine for text recognition'
|
||||||
'tesseract-data-eng: English OCR language data'
|
'tesseract-data-eng: English OCR language data'
|
||||||
'duckdb: DuckDB debug database logging with --debug-db'
|
|
||||||
)
|
)
|
||||||
optdepends_x86_64=(
|
optdepends_x86_64=(
|
||||||
# Wine accessibility helpers are supported on x86_64.
|
# Wine accessibility helpers are supported on x86_64.
|
||||||
@@ -55,8 +54,6 @@ makedepends=(
|
|||||||
git
|
git
|
||||||
go
|
go
|
||||||
pkgconf
|
pkgconf
|
||||||
# Headers only: libduckdb is dlopen'ed at runtime when --debug-db is used.
|
|
||||||
duckdb
|
|
||||||
)
|
)
|
||||||
options=(!debug !lto)
|
options=(!debug !lto)
|
||||||
source=("${_pkgname}::git+https://git.stormux.org/storm/${_pkgname}.git#branch=master")
|
source=("${_pkgname}::git+https://git.stormux.org/storm/${_pkgname}.git#branch=master")
|
||||||
@@ -85,7 +82,7 @@ build() {
|
|||||||
export GOCACHE="${GOCACHE:-${srcdir}/go-build}"
|
export GOCACHE="${GOCACHE:-${srcdir}/go-build}"
|
||||||
export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw"
|
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
|
go build -tags brlapi -o build/cthulhu-braille ./cmd/cthulhu-braille
|
||||||
# Include the helper once incoming Remote keyboard support reaches master.
|
# Include the helper once incoming Remote keyboard support reaches master.
|
||||||
if [[ -d cmd/cthulhu-input-helper ]]; then
|
if [[ -d cmd/cthulhu-input-helper ]]; then
|
||||||
@@ -98,7 +95,7 @@ check() {
|
|||||||
export CGO_ENABLED=1
|
export CGO_ENABLED=1
|
||||||
export GOPATH="${srcdir}/go"
|
export GOPATH="${srcdir}/go"
|
||||||
export GOCACHE="${GOCACHE:-${srcdir}/go-build}"
|
export GOCACHE="${GOCACHE:-${srcdir}/go-build}"
|
||||||
go test -tags 'brlapi duckdb' ./... -count=1
|
go test -tags brlapi ./... -count=1
|
||||||
}
|
}
|
||||||
|
|
||||||
package() {
|
package() {
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ import "strings"
|
|||||||
const Name = "Cthulhu"
|
const Name = "Cthulhu"
|
||||||
|
|
||||||
const Version = "2026.11.11"
|
const Version = "2026.11.11"
|
||||||
const Channel = "hunter"
|
const Channel = "testing"
|
||||||
|
|
||||||
var Build = Version
|
var Build = Version
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user