From 11498185905e6cb399659deb8e93a78192745c11 Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Wed, 21 Oct 2026 15:48:53 -0400 Subject: [PATCH] Updated PKGBUILD. --- .../ArchLinux/wine-access-git/PKGBUILD | 15 +++++- .../ArchLinux/wine-access-git/README.md | 51 ++++++++++++------- orca/README.md | 22 ++++++++ 3 files changed, 67 insertions(+), 21 deletions(-) diff --git a/distro-packages/ArchLinux/wine-access-git/PKGBUILD b/distro-packages/ArchLinux/wine-access-git/PKGBUILD index 49cfcac..df83870 100644 --- a/distro-packages/ArchLinux/wine-access-git/PKGBUILD +++ b/distro-packages/ArchLinux/wine-access-git/PKGBUILD @@ -1,13 +1,14 @@ # Maintainer: Storm Dragon pkgname=wine-access-git -pkgver=r52.gc02889b -pkgrel=1 +pkgver=r53.gb57681d +pkgrel=2 pkgdesc='Wine accessibility helper with MSAA, NVDA Controller, and Tolk compatibility for screen readers' arch=('x86_64') url='https://git.stormux.org/storm/wine-access' license=('LGPL-2.1-or-later') depends=('glib2' 'wine' 'libxcb') makedepends=('cmake' 'git' 'pkgconf' 'mingw-w64-gcc') +optdepends=('orca>=51: Orca screen reader integration') provides=('wine-access') conflicts=('wine-access') # Wine's import generation needs native object symbols, which LTO hides. @@ -41,4 +42,14 @@ package() { chmod 755 "$pkgdir/usr/libexec/wine-access/wine-access.exe" install -Dm644 "$srcdir/wine-access/README.md" \ "$pkgdir/usr/share/doc/wine-access/README.md" + install -Dm644 "$srcdir/wine-access/orca/README.md" \ + "$pkgdir/usr/share/doc/wine-access/orca/README.md" + + # Orca discovers user extensions only. Users link this package-owned copy + # into their extension directory and approve it in their own session. + local extension_file + for extension_file in "$srcdir/wine-access/orca/wine_access/"*.py; do + install -Dm644 "$extension_file" \ + "$pkgdir/usr/share/wine-access/orca/wine_access/${extension_file##*/}" + done } diff --git a/distro-packages/ArchLinux/wine-access-git/README.md b/distro-packages/ArchLinux/wine-access-git/README.md index 818ff06..ee773f4 100644 --- a/distro-packages/ArchLinux/wine-access-git/README.md +++ b/distro-packages/ArchLinux/wine-access-git/README.md @@ -6,28 +6,41 @@ Run from this directory: makepkg -si ``` -The default source uses the project's SSH remote on port 1101. Once the -repository exists, your SSH key must have access while it remains private. - -Before the remote exists, build from the committed sources in your local -checkout instead: - -```sh -WINE_ACCESS_GIT_URL=file:///path/to/wine-access makepkg -si -``` - -Git sources include committed files only. Adjust that path if your checkout is -elsewhere. To use HTTPS after the repository becomes public: - -```sh -WINE_ACCESS_GIT_URL=https://git.stormux.org/storm/wine-access.git makepkg -si -``` +The source uses the maintained repository's public HTTPS URL. Git sources +include committed files only. The package installs the Winelib launcher, its sidecar, both native menu hook DLLs, and the 32-bit menu host -under `/usr/libexec/wine-access/`. It provides and conflicts with the older -`cthulhu-wine-access` helper, so pacman -can replace that package in the installation transaction. +under `/usr/libexec/wine-access/`. It provides and conflicts with `wine-access`. + +## Orca extension + +The package also installs a shared copy of the extension under +`/usr/share/wine-access/orca/wine_access/` and its instructions under +`/usr/share/doc/wine-access/orca/README.md`. Orca 51 or later is an optional +dependency; Cthulhu users do not need to install it. + +Orca currently scans each user's extension directory rather than a system +extension directory. To use the packaged copy, run these commands as the user +who runs Orca: + +```sh +mkdir -p "${XDG_DATA_HOME:-$HOME/.local/share}/orca/extensions" +ln -sT /usr/share/wine-access/orca/wine_access \ + "${XDG_DATA_HOME:-$HOME/.local/share}/orca/extensions/wine_access" +orca --approve-extension wine_access +``` + +Restart Orca afterward. If an earlier `wine_access` copy exists in that user +directory, move it aside first; the link command does not replace existing +files or directories. Package upgrades update the shared extension. Approve +it again whenever its contents change, then restart Orca. + +Only one reader's helper can serve a Wine desktop/prefix at a time. Stop +Cthulhu's Wine helper before using Orca for that prefix; disable the Orca +extension before switching back to Cthulhu. + +## Helper discovery Use this package for subsequent updates rather than also installing through `build.sh`. If an earlier local installation exists under diff --git a/orca/README.md b/orca/README.md index f1e8c26..fae74f2 100644 --- a/orca/README.md +++ b/orca/README.md @@ -8,6 +8,28 @@ Controller/Tolk speech and braille, UIA notifications, and dialog messages. ## Install +### Arch Linux package + +The `wine-access-git` package installs the extension's Python files under +`/usr/share/wine-access/orca/wine_access/`. Orca 51 currently discovers +third-party extensions only in the user's extension directory, so each user +links the shared copy and approves it: + +```sh +mkdir -p "${XDG_DATA_HOME:-$HOME/.local/share}/orca/extensions" +ln -sT /usr/share/wine-access/orca/wine_access \ + "${XDG_DATA_HOME:-$HOME/.local/share}/orca/extensions/wine_access" +orca --approve-extension wine_access +``` + +Restart Orca afterward. If `wine_access` already exists in the user extension +directory, move that earlier copy aside before creating the link. The commands +above leave an existing destination untouched. Package upgrades update the +shared copy; approve it again whenever its contents change. Orca 51 or later +must be installed separately; it is an optional package dependency. + +### Manual installation + 1. Build and install the helper as described in the main README. 2. Copy `orca/wine_access/` to `~/.local/share/orca/extensions/`. 3. Approve it with `orca --approve-extension wine_access` and restart Orca.