A few touch ups before tagged release.

This commit is contained in:
Storm Dragon
2026-05-26 00:27:40 -04:00
parent c39f2310e3
commit 46d3c66dc7
14 changed files with 130 additions and 85 deletions
@@ -2,7 +2,7 @@
pkgname=cthulhu-git pkgname=cthulhu-git
_pkgname=cthulhu _pkgname=cthulhu
pkgver=2026.05.14.r396.ge2f9a7c pkgver=2026.05.25.r407.gc39f231
pkgrel=1 pkgrel=1
pkgdesc="Desktop-agnostic screen reader with plugin system, forked from Orca" pkgdesc="Desktop-agnostic screen reader with plugin system, forked from Orca"
url="https://git.stormux.org/storm/cthulhu" url="https://git.stormux.org/storm/cthulhu"
+1 -1
View File
@@ -1,7 +1,7 @@
# Maintainer: Storm Dragon <storm_dragon@stormux.org> # Maintainer: Storm Dragon <storm_dragon@stormux.org>
pkgname=cthulhu pkgname=cthulhu
pkgver=2026.05.14 pkgver=2026.05.25
pkgrel=1 pkgrel=1
pkgdesc="Desktop-agnostic screen reader with plugin system, forked from Orca" pkgdesc="Desktop-agnostic screen reader with plugin system, forked from Orca"
url="https://git.stormux.org/storm/cthulhu" url="https://git.stormux.org/storm/cthulhu"
+27 -35
View File
@@ -3,16 +3,15 @@
# Slackware build script for cthulhu # Slackware build script for cthulhu
# Created based on PKGBUILD from Storm Dragon <storm_dragon@stormux.org> # Created based on PKGBUILD from Storm Dragon <storm_dragon@stormux.org>
cd $(dirname $0) ; CWD=$(pwd) cd "$(dirname "$0")" ; CWD=$(pwd)
PRGNAM=cthulhu PRGNAM=cthulhu
VERSION=${VERSION:-0.4} VERSION=${VERSION:-2026.05.25}
BUILD=${BUILD:-1} BUILD=${BUILD:-1}
TAG=storm TAG=storm
PKGTYPE=txz PKGTYPE=txz
export PYTHON=/usr/bin/python3.11
if [ -z "$ARCH" ]; then if [ -z "${ARCH:-}" ]; then
case "$( uname -m )" in case "$( uname -m )" in
i?86) ARCH=i586 ;; i?86) ARCH=i586 ;;
arm*) ARCH=arm ;; arm*) ARCH=arm ;;
@@ -23,7 +22,7 @@ fi
# If the variable PRINT_PACKAGE_NAME is set, then this script will report what # If the variable PRINT_PACKAGE_NAME is set, then this script will report what
# the name of the created package would be, and then exit. This information # the name of the created package would be, and then exit. This information
# could be useful to other scripts. # could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then if [ -n "${PRINT_PACKAGE_NAME:-}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0 exit 0
fi fi
@@ -48,12 +47,12 @@ fi
set -e set -e
rm -rf $PKG rm -rf "$PKG"
mkdir -p $TMP $PKG $OUTPUT mkdir -p "$TMP" "$PKG" "$OUTPUT"
cd $TMP cd "$TMP"
rm -rf $PRGNAM-$VERSION rm -rf "$PRGNAM-$VERSION"
git clone https://git.stormux.org/storm/cthulhu.git $PRGNAM-$VERSION git clone --branch "$VERSION" --depth 1 https://git.stormux.org/storm/cthulhu.git "$PRGNAM-$VERSION"
cd $PRGNAM-$VERSION cd "$PRGNAM-$VERSION"
chown -R root:root . chown -R root:root .
find -L . \ find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -61,38 +60,31 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
# Prepare the source
NOCONFIGURE=1 ./autogen.sh
CFLAGS="$SLKCFLAGS" \ CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \
./configure \ meson setup _build \
--prefix=/usr \ --prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \ --libdir="/usr/lib${LIBDIRSUFFIX}" \
--sysconfdir=/etc \ --sysconfdir=/etc \
--localstatedir=/var \ --localstatedir=/var \
--mandir=/usr/man \ --mandir=/usr/man \
--docdir=/usr/doc/$PRGNAM-$VERSION \ --buildtype=release
--build=$ARCH-slackware-linux meson compile -C _build
DESTDIR="$PKG" meson install -C _build
make find "$PKG" -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
make install DESTDIR=$PKG
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION rm -f "$PKG/usr/share/icons/hicolor/icon-theme.cache"
cp -a AUTHORS COPYING ChangeLog README.md \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install mkdir -p "$PKG/usr/doc/$PRGNAM-$VERSION"
cat $CWD/slack-desc > $PKG/install/slack-desc cp -a COPYING HACKING README.md README-DEVELOPMENT.md RELEASE-HOWTO \
cat $CWD/doinst.sh > $PKG/install/doinst.sh "$PKG/usr/doc/$PRGNAM-$VERSION"
cat "$CWD/$PRGNAM.SlackBuild" > "$PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild"
cd $PKG mkdir -p "$PKG/install"
# let's avoid a "bad interpreter error cat "$CWD/slack-desc" > "$PKG/install/slack-desc"
sed "s,#!python3.11,#!/usr/bin/python3.11," usr/bin/cthulhu > dummy cat "$CWD/doinst.sh" > "$PKG/install/doinst.sh"
mv dummy usr/bin/cthulhu
chmod 755 usr/bin/cthulhu cd "$PKG"
/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE /sbin/makepkg -l y -c n "$OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+11
View File
@@ -0,0 +1,11 @@
#!/bin/sh
if [ -x /usr/bin/update-desktop-database ]; then
/usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
fi
if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
if [ -x /usr/bin/gtk-update-icon-cache ]; then
/usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
fi
fi
+19
View File
@@ -0,0 +1,19 @@
# HOW TO EDIT THIS FILE:
# The "handy ruler" below makes it easier to edit a package description.
# Line up the first '|' above the ':' following the base package name, and
# the '|' on the right side marks the last column you can put a character in.
# You must make exactly 11 lines for the formatting to be correct. It's also
# customary to leave one space after the ':' except on otherwise blank lines.
|-----handy-ruler------------------------------------------------------|
cthulhu: cthulhu (Screen reader for blind or visually impaired users)
cthulhu:
cthulhu: Cthulhu is a screen reader for individuals who are blind or visually
cthulhu: impaired, forked from Orca. It provides a way to access applications
cthulhu: and toolkits that support the AT-SPI accessibility infrastructure.
cthulhu:
cthulhu: Homepage: https://git.stormux.org/storm/cthulhu
cthulhu:
cthulhu:
cthulhu:
cthulhu:
+8
View File
@@ -25,6 +25,14 @@ This package requires the following packages, all available from SlackBuilds.org
- libwnck3 - libwnck3
- python3-atspi - python3-atspi
- python3-cairo - python3-cairo
- python3-dasbus
- python3-gobject - python3-gobject
- python3-pluggy
- python3-pywayland
- python3-setproctitle - python3-setproctitle
- python3-tomlkit
- speech-dispatcher - speech-dispatcher
BUILD DEPENDENCIES:
- meson
- ninja
+2 -2
View File
@@ -1,10 +1,10 @@
PRGNAM="cthulhu" PRGNAM="cthulhu"
VERSION="0.4" VERSION="2026.05.25"
HOMEPAGE="https://git.stormux.org/storm/cthulhu" HOMEPAGE="https://git.stormux.org/storm/cthulhu"
DOWNLOAD="https://git.stormux.org/storm/cthulhu.git" DOWNLOAD="https://git.stormux.org/storm/cthulhu.git"
MD5SUM="SKIP" MD5SUM="SKIP"
DOWNLOAD_x86_64="" DOWNLOAD_x86_64=""
MD5SUM_x86_64="" MD5SUM_x86_64=""
REQUIRES="at-spi2-core brltty gobject-introspection gstreamer gst-plugins-base gst-plugins-good gtk3 liblouis libwnck3 python3-atspi python3-cairo python3-gobject python3-setproctitle speech-dispatcher" REQUIRES="at-spi2-core brltty gobject-introspection gstreamer gst-plugins-base gst-plugins-good gtk3 liblouis libwnck3 python3-atspi python3-cairo python3-dasbus python3-gobject python3-pluggy python3-pywayland python3-setproctitle python3-tomlkit speech-dispatcher"
MAINTAINER="Storm Dragon" MAINTAINER="Storm Dragon"
EMAIL="storm_dragon@stormux.org" EMAIL="storm_dragon@stormux.org"
+27 -35
View File
@@ -3,16 +3,15 @@
# Slackware build script for cthulhu # Slackware build script for cthulhu
# Created based on PKGBUILD from Storm Dragon <storm_dragon@stormux.org> # Created based on PKGBUILD from Storm Dragon <storm_dragon@stormux.org>
cd $(dirname $0) ; CWD=$(pwd) cd "$(dirname "$0")" ; CWD=$(pwd)
PRGNAM=cthulhu PRGNAM=cthulhu
VERSION=${VERSION:-0.4} VERSION=${VERSION:-2026.05.25}
BUILD=${BUILD:-1} BUILD=${BUILD:-1}
TAG=storm TAG=storm
PKGTYPE=txz PKGTYPE=txz
export PYTHON=/usr/bin/python3.11
if [ -z "$ARCH" ]; then if [ -z "${ARCH:-}" ]; then
case "$( uname -m )" in case "$( uname -m )" in
i?86) ARCH=i586 ;; i?86) ARCH=i586 ;;
arm*) ARCH=arm ;; arm*) ARCH=arm ;;
@@ -23,7 +22,7 @@ fi
# If the variable PRINT_PACKAGE_NAME is set, then this script will report what # If the variable PRINT_PACKAGE_NAME is set, then this script will report what
# the name of the created package would be, and then exit. This information # the name of the created package would be, and then exit. This information
# could be useful to other scripts. # could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then if [ -n "${PRINT_PACKAGE_NAME:-}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0 exit 0
fi fi
@@ -48,12 +47,12 @@ fi
set -e set -e
rm -rf $PKG rm -rf "$PKG"
mkdir -p $TMP $PKG $OUTPUT mkdir -p "$TMP" "$PKG" "$OUTPUT"
cd $TMP cd "$TMP"
rm -rf $PRGNAM-$VERSION rm -rf "$PRGNAM-$VERSION"
git clone https://git.stormux.org/storm/cthulhu.git $PRGNAM-$VERSION git clone --branch "$VERSION" --depth 1 https://git.stormux.org/storm/cthulhu.git "$PRGNAM-$VERSION"
cd $PRGNAM-$VERSION cd "$PRGNAM-$VERSION"
chown -R root:root . chown -R root:root .
find -L . \ find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -61,38 +60,31 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
# Prepare the source
NOCONFIGURE=1 ./autogen.sh
CFLAGS="$SLKCFLAGS" \ CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \
./configure \ meson setup _build \
--prefix=/usr \ --prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \ --libdir="/usr/lib${LIBDIRSUFFIX}" \
--sysconfdir=/etc \ --sysconfdir=/etc \
--localstatedir=/var \ --localstatedir=/var \
--mandir=/usr/man \ --mandir=/usr/man \
--docdir=/usr/doc/$PRGNAM-$VERSION \ --buildtype=release
--build=$ARCH-slackware-linux meson compile -C _build
DESTDIR="$PKG" meson install -C _build
make find "$PKG" -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
make install DESTDIR=$PKG
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION rm -f "$PKG/usr/share/icons/hicolor/icon-theme.cache"
cp -a AUTHORS COPYING ChangeLog README.md \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install mkdir -p "$PKG/usr/doc/$PRGNAM-$VERSION"
cat $CWD/slack-desc > $PKG/install/slack-desc cp -a COPYING HACKING README.md README-DEVELOPMENT.md RELEASE-HOWTO \
cat $CWD/doinst.sh > $PKG/install/doinst.sh "$PKG/usr/doc/$PRGNAM-$VERSION"
cat "$CWD/$PRGNAM.SlackBuild" > "$PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild"
cd $PKG mkdir -p "$PKG/install"
# let's avoid a "bad interpreter error cat "$CWD/slack-desc" > "$PKG/install/slack-desc"
sed "s,#!python3.11,#!/usr/bin/python3.11," usr/bin/cthulhu > dummy cat "$CWD/doinst.sh" > "$PKG/install/doinst.sh"
mv dummy usr/bin/cthulhu
chmod 755 usr/bin/cthulhu cd "$PKG"
/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE /sbin/makepkg -l y -c n "$OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+2
View File
@@ -1,3 +1,5 @@
#!/bin/sh
if [ -x /usr/bin/update-desktop-database ]; then if [ -x /usr/bin/update-desktop-database ]; then
/usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
fi fi
+1 -1
View File
@@ -1,5 +1,5 @@
project('cthulhu', project('cthulhu',
version: '2026.05.14-master', version: '2026.05.25',
meson_version: '>= 1.0.0', meson_version: '>= 1.0.0',
) )
+25 -6
View File
@@ -59,8 +59,11 @@ fi
cthulhuVersionFile="${scriptDir}/src/cthulhu/cthulhuVersion.py" cthulhuVersionFile="${scriptDir}/src/cthulhu/cthulhuVersion.py"
mesonFile="${scriptDir}/meson.build" mesonFile="${scriptDir}/meson.build"
pkgbuildFile="${scriptDir}/distro-packages/Arch-Linux/cthulhu/PKGBUILD" pkgbuildFile="${scriptDir}/distro-packages/Arch-Linux/cthulhu/PKGBUILD"
slackwareBuildFile="${scriptDir}/distro-packages/Slackware/cthulhu.SlackBuild"
slintBuildFile="${scriptDir}/distro-packages/Slint/cthulhu.SlackBuild"
slintInfoFile="${scriptDir}/distro-packages/Slint/cthulhu-info"
for path in "$cthulhuVersionFile" "$mesonFile" "$pkgbuildFile"; do for path in "$cthulhuVersionFile" "$mesonFile" "$pkgbuildFile" "$slackwareBuildFile" "$slintBuildFile" "$slintInfoFile"; do
if [[ ! -f "$path" ]]; then if [[ ! -f "$path" ]]; then
echo "Error: Missing file: $path" >&2 echo "Error: Missing file: $path" >&2
exit 1 exit 1
@@ -68,18 +71,19 @@ for path in "$cthulhuVersionFile" "$mesonFile" "$pkgbuildFile"; do
done done
sed -i "s/^version = \".*\"/version = \"${pythonVersion}\"/" "$cthulhuVersionFile" sed -i "s/^version = \".*\"/version = \"${pythonVersion}\"/" "$cthulhuVersionFile"
if [[ -n "$codeNameValue" ]]; then sed -i "s/^codeName = \".*\"/codeName = \"${codeNameValue}\"/" "$cthulhuVersionFile"
sed -i "s/^codeName = \".*\"/codeName = \"${codeNameValue}\"/" "$cthulhuVersionFile"
fi
sed -i "s/^ version: '.*',/ version: '${fullVersion}',/" "$mesonFile" sed -i "s/^ version: '.*',/ version: '${fullVersion}',/" "$mesonFile"
sed -i "s/^pkgver=.*/pkgver=${pythonVersion}/" "$pkgbuildFile" sed -i "s/^pkgver=.*/pkgver=${pythonVersion}/" "$pkgbuildFile"
sed -i "s/^pkgrel=.*/pkgrel=1/" "$pkgbuildFile" sed -i "s/^pkgrel=.*/pkgrel=1/" "$pkgbuildFile"
sed -i "s/^VERSION=\${VERSION:-.*}/VERSION=\${VERSION:-${pythonVersion}}/" "$slackwareBuildFile"
sed -i "s/^VERSION=\${VERSION:-.*}/VERSION=\${VERSION:-${pythonVersion}}/" "$slintBuildFile"
sed -i "s/^VERSION=\".*\"/VERSION=\"${pythonVersion}\"/" "$slintInfoFile"
if ! rg -q "^version = \"${pythonVersion}\"" "$cthulhuVersionFile"; then if ! rg -q "^version = \"${pythonVersion}\"" "$cthulhuVersionFile"; then
echo "Error: Failed to update ${cthulhuVersionFile}" >&2 echo "Error: Failed to update ${cthulhuVersionFile}" >&2
exit 1 exit 1
fi fi
if [[ -n "$codeNameValue" ]] && ! rg -q "^codeName = \"${codeNameValue}\"" "$cthulhuVersionFile"; then if ! rg -q "^codeName = \"${codeNameValue}\"" "$cthulhuVersionFile"; then
echo "Error: Failed to update codeName in ${cthulhuVersionFile}" >&2 echo "Error: Failed to update codeName in ${cthulhuVersionFile}" >&2
exit 1 exit 1
fi fi
@@ -95,8 +99,23 @@ if ! rg -q "^pkgrel=1$" "$pkgbuildFile"; then
echo "Error: Failed to reset pkgrel in ${pkgbuildFile}" >&2 echo "Error: Failed to reset pkgrel in ${pkgbuildFile}" >&2
exit 1 exit 1
fi fi
if ! rg -q "^VERSION=\\\$\\{VERSION:-${pythonVersion}\\}$" "$slackwareBuildFile"; then
echo "Error: Failed to update ${slackwareBuildFile}" >&2
exit 1
fi
if ! rg -q "^VERSION=\\\$\\{VERSION:-${pythonVersion}\\}$" "$slintBuildFile"; then
echo "Error: Failed to update ${slintBuildFile}" >&2
exit 1
fi
if ! rg -q "^VERSION=\"${pythonVersion}\"$" "$slintInfoFile"; then
echo "Error: Failed to update ${slintInfoFile}" >&2
exit 1
fi
echo "Updated version to ${fullVersion} in:" \ echo "Updated version to ${fullVersion} in:" \
"${cthulhuVersionFile}" \ "${cthulhuVersionFile}" \
"${mesonFile}" \ "${mesonFile}" \
"${pkgbuildFile}" "${pkgbuildFile}" \
"${slackwareBuildFile}" \
"${slintBuildFile}" \
"${slintInfoFile}"
+2 -2
View File
@@ -23,5 +23,5 @@
# Forked from Orca screen reader. # Forked from Orca screen reader.
# Cthulhu project: https://git.stormux.org/storm/cthulhu # Cthulhu project: https://git.stormux.org/storm/cthulhu
version = "2026.05.14" version = "2026.05.25"
codeName = "master" codeName = ""
+2 -1
View File
@@ -30,7 +30,8 @@ __license__ = "LGPL"
# $CTHULHU_VERSION # $CTHULHU_VERSION
# #
version = f"Cthulhu screen reader version {cthulhuVersion.version}-{cthulhuVersion.codeName}" versionSuffix = f"-{cthulhuVersion.codeName}" if cthulhuVersion.codeName else ""
version = f"Cthulhu screen reader version {cthulhuVersion.version}{versionSuffix}"
# The revision if built from git; otherwise an empty string # The revision if built from git; otherwise an empty string
# #
+2 -1
View File
@@ -35,7 +35,8 @@ class DisplayVersion(Plugin):
def _get_version_string(self): def _get_version_string(self):
"""Generate the full version string with AT-SPI and session information.""" """Generate the full version string with AT-SPI and session information."""
msg = f'Cthulhu screen reader version {cthulhuVersion.version}-{cthulhuVersion.codeName}' version_suffix = f'-{cthulhuVersion.codeName}' if cthulhuVersion.codeName else ''
msg = f'Cthulhu screen reader version {cthulhuVersion.version}{version_suffix}'
if cthulhu_platform.revision: if cthulhu_platform.revision:
msg += f' revision {cthulhu_platform.revision}' msg += f' revision {cthulhu_platform.revision}'