Fixed some packaging problems.

This commit is contained in:
Storm Dragon
2026-09-03 14:54:04 -04:00
parent e779ba20ff
commit d4bec38c18
10 changed files with 55 additions and 41 deletions
@@ -4,7 +4,7 @@
pkgbase=cthulhu-git
pkgname=cthulhu-git
_pkgname=cthulhu
pkgver=2026.07.18.r465.g050ae25
pkgver=2026.08.06.r474.ge779ba2
pkgrel=1
pkgdesc="Desktop-agnostic screen reader with plugin system, forked from Orca"
url="https://git.stormux.org/storm/cthulhu"
@@ -68,7 +68,7 @@ optdepends=(
)
optdepends_x86_64=(
# The helper is x86_64-only, but this package is architecture-independent.
'cthulhu-wine-access-git: Wine, Proton, NVDA Controller, and Tolk integration'
'cthulhu-wine-access: Wine, Proton, NVDA Controller, and Tolk integration'
)
makedepends=(
git
@@ -10,14 +10,12 @@ url="https://git.stormux.org/storm/cthulhu"
arch=(x86_64)
license=(LGPL-2.1-or-later)
depends=(
"cthulhu-git=${pkgver}"
glib2
wine
)
makedepends=(
cmake
git
meson
)
provides=(cthulhu-wine-access)
conflicts=(cthulhu-wine-access)
@@ -40,9 +38,12 @@ pkgver() {
}
build() {
cd "${_pkgname}"
arch-meson _build -Dwine-access=enabled
meson compile -C _build
local sourceDir="${srcdir}/${_pkgname}"
bash "${sourceDir}/scripts/build-wine-access.sh" \
"${sourceDir}/wine-access" \
"${sourceDir}/_build/wine-access-build" \
"${sourceDir}/_build/cthulhu-wine-access.exe" \
"${sourceDir}/_build/cthulhu-wine-access.exe.so"
}
package() {
@@ -2,30 +2,31 @@
# shellcheck shell=bash disable=SC2034,SC2154,SC2164
pkgname=cthulhu-wine-access
pkgver=2026.08.06
pkgver=2026.09.03
pkgrel=1
pkgdesc="Optional Wine and Proton accessibility bridge for Cthulhu"
url="https://git.stormux.org/storm/cthulhu"
arch=(x86_64)
license=(LGPL-2.1-or-later)
depends=(
"cthulhu=${pkgver}"
glib2
wine
)
makedepends=(
cmake
git
meson
)
source=("git+https://git.stormux.org/storm/cthulhu.git#tag=${pkgver}")
sha512sums=('SKIP')
options=(!lto)
build() {
cd cthulhu
arch-meson _build -Dwine-access=enabled
meson compile -C _build
local sourceDir="${srcdir}/cthulhu"
bash "${sourceDir}/scripts/build-wine-access.sh" \
"${sourceDir}/wine-access" \
"${sourceDir}/_build/wine-access-build" \
"${sourceDir}/_build/cthulhu-wine-access.exe" \
"${sourceDir}/_build/cthulhu-wine-access.exe.so"
}
package() {
+1 -1
View File
@@ -3,7 +3,7 @@
pkgbase=cthulhu
pkgname=cthulhu
pkgver=2026.08.06
pkgver=2026.09.03
pkgrel=1
pkgdesc="Desktop-agnostic screen reader with plugin system, forked from Orca"
url="https://git.stormux.org/storm/cthulhu"