From 0c26025a811b93a4ef4b44828bf6f48ff0799108 Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Tue, 1 Jul 2025 15:55:00 -0400 Subject: [PATCH] Updates to build files. --- HACKING | 2 +- Makefile.am | 4 ++++ autogen.sh | 12 ++++++++---- configure.ac | 13 +++++++++++-- distro-packages/Arch-Linux/PKGBUILD | 10 +++++----- 5 files changed, 29 insertions(+), 12 deletions(-) diff --git a/HACKING b/HACKING index 3d54786..2f3e8c5 100644 --- a/HACKING +++ b/HACKING @@ -1,6 +1,6 @@ Welcome to Cthulhu -We are excited to have you here and welcome your contributions to the Cthulhu screen reader project! This project is a fork of Cthulhu, with a focus on creating an open and collaborative community where contributions are encouraged. +We are excited to have you here and welcome your contributions to the Cthulhu screen reader project! This project is a fork of Orca, with a focus on creating an open and collaborative community where contributions are encouraged. How to Contribute diff --git a/Makefile.am b/Makefile.am index b9a4a76..e4999e0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,10 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} +if BUILD_HELP SUBDIRS = docs icons po src help +else +SUBDIRS = docs icons po src +endif DISTCHECK_CONFIGURE_FLAGS = \ --disable-scrollkeeper diff --git a/autogen.sh b/autogen.sh index b636f0d..21295f9 100755 --- a/autogen.sh +++ b/autogen.sh @@ -32,10 +32,14 @@ autoreconf --verbose --force --install -Wno-portability || { exit 1 } -which yelp-build > /dev/null || { - echo "Try installing the 'yelp-tools' package." - exit 1 -} +# Only check for yelp-build if help documentation will be built +# Skip check if SKIP_YELP environment variable is set +if [ "${SKIP_YELP}" != "1" ]; then + which yelp-build > /dev/null || { + echo "Try installing the 'yelp-tools' package, or set SKIP_YELP=1 to skip documentation." + exit 1 + } +fi cd "$olddir" diff --git a/configure.ac b/configure.ac index 39a5497..88db710 100644 --- a/configure.ac +++ b/configure.ac @@ -24,8 +24,16 @@ GETTEXT_PACKAGE=AC_PACKAGE_TARNAME AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [gettext package]) -# User Documentation -YELP_HELP_INIT +# User Documentation (optional) +AC_ARG_ENABLE([help], + AS_HELP_STRING([--disable-help], [Disable building help documentation])) +AS_IF([test "x$enable_help" != "xno"], [ + YELP_HELP_INIT + BUILD_HELP=yes +], [ + BUILD_HELP=no +]) +AM_CONDITIONAL(BUILD_HELP, test "x$BUILD_HELP" = "xyes") PKG_CHECK_MODULES([PYGOBJECT], [pygobject-3.0 >= pygobject_required_version]) PKG_CHECK_MODULES([ATSPI2], [atspi-2 >= atspi_required_version]) @@ -129,6 +137,7 @@ src/cthulhu/plugins/ByeCthulhu/Makefile src/cthulhu/plugins/HelloCthulhu/Makefile src/cthulhu/plugins/Clipboard/Makefile src/cthulhu/plugins/DisplayVersion/Makefile +src/cthulhu/plugins/IndentationAudio/Makefile src/cthulhu/plugins/hello_world/Makefile src/cthulhu/plugins/self_voice/Makefile src/cthulhu/plugins/SimplePluginSystem/Makefile diff --git a/distro-packages/Arch-Linux/PKGBUILD b/distro-packages/Arch-Linux/PKGBUILD index 25cd308..02038c9 100644 --- a/distro-packages/Arch-Linux/PKGBUILD +++ b/distro-packages/Arch-Linux/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Storm Dragon pkgname=cthulhu -pkgver=0.4 +pkgver=2025.07.01 pkgrel=1 pkgdesc="Screen reader for individuals who are blind or visually impaired forked from Orca" url="https://git.stormux.org/storm/cthulhu" @@ -25,6 +25,7 @@ depends=( python-atspi python-cairo python-gobject + python-pluggy python-setproctitle socat speech-dispatcher @@ -33,15 +34,14 @@ depends=( ) makedepends=( git - itstool - yelp-tools ) source=("git+https://git.stormux.org/storm/cthulhu.git") b2sums=('SKIP') prepare() { cd cthulhu - NOCONFIGURE=1 ./autogen.sh + git checkout testing + NOCONFIGURE=1 SKIP_YELP=1 ./autogen.sh } pkgver() { @@ -51,7 +51,7 @@ pkgver() { build() { cd cthulhu - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-help make }