From 4748b3a0b93054d528b7287acba77c8c4524a176 Mon Sep 17 00:00:00 2001 From: Christopher Brannon Date: Tue, 20 Oct 2020 16:25:13 -0700 Subject: [PATCH] speech-dispatcher: update to 0.10.1. Includes a patch pulled out of upstream's git repo that fixes a crash under Python 3.9. --- .../0001-Fix-crash-with-python-3.9.patch | 29 +++++++++++++++++++ srcpkgs/speech-dispatcher/template | 21 +++++++++----- 2 files changed, 43 insertions(+), 7 deletions(-) create mode 100644 srcpkgs/speech-dispatcher/patches/0001-Fix-crash-with-python-3.9.patch diff --git a/srcpkgs/speech-dispatcher/patches/0001-Fix-crash-with-python-3.9.patch b/srcpkgs/speech-dispatcher/patches/0001-Fix-crash-with-python-3.9.patch new file mode 100644 index 00000000000..d7123d5d79d --- /dev/null +++ b/srcpkgs/speech-dispatcher/patches/0001-Fix-crash-with-python-3.9.patch @@ -0,0 +1,29 @@ +From 4fe066fefcbb28161b1053326867514a21f421b9 Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro +Date: Fri, 11 Sep 2020 13:15:07 -0500 +Subject: [PATCH] Fix crash with python 3.9 + +Thread.isAlive() was removed in python 3.9. Thread.is_alive() has been +available since python 2.6, so let's use that. + +Fixes #402 +--- + src/api/python/speechd/client.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/api/python/speechd/client.py b/src/api/python/speechd/client.py +index ba7c0496..68200e2f 100644 +--- src/api/python/speechd/client.py ++++ src/api/python/speechd/client.py +@@ -289,7 +289,7 @@ class _SSIP_Connection(object): + and return the triplet (code, msg, data).""" + # TODO: This check is dumb but seems to work. The main thread + # hangs without it, when the Speech Dispatcher connection is lost. +- if not self._communication_thread.isAlive(): ++ if not self._communication_thread.is_alive(): + raise SSIPCommunicationError + self._ssip_reply_semaphore.acquire() + # The list is sorted, read the first item +-- +2.28.0 + diff --git a/srcpkgs/speech-dispatcher/template b/srcpkgs/speech-dispatcher/template index 829754ab3c7..7b775988d11 100644 --- a/srcpkgs/speech-dispatcher/template +++ b/srcpkgs/speech-dispatcher/template @@ -1,17 +1,20 @@ # Template file for 'speech-dispatcher' pkgname=speech-dispatcher -version=0.8.8 -revision=3 +version=0.10.1 +revision=1 +wrksrc="speechd-${version}" build_style=gnu-configure -configure_args="--disable-static" +# Disable support for sundry non-free TTS systems (said support causes +# the pre-pkg step to fail on account of missing shlibs). +configure_args="--disable-static --without-kali --without-ibmtts --without-baratinoo" short_desc="High-level device independent layer for speech synthesis interface" maintainer="Orphaned " -license="GPL-2, LGPL-2.1, GFDL-1.2" +license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later" homepage="http://devel.freebsoft.org/speechd" -distfiles="http://devel.freebsoft.org/pub/projects/speechd/${pkgname}-${version}.tar.gz" -checksum=3c2a89800d73403192b9d424a604f0e614c58db390428355a3b1c7c401986cf3 +distfiles="https://github.com/brailcom/speechd/archive/${version}.tar.gz" +checksum=0c702d4acc4920818db3daa28ecf14004123b64514b4575c138874618835104c -hostmakedepends="pkg-config intltool python3-devel texinfo" +hostmakedepends="automake libtool gettext-devel pkg-config intltool python3-devel texinfo" makedepends="libltdl-devel glib-devel dotconf-devel libsndfile-devel libespeak-devel libao-devel python3-devel" depends="python3" conf_files=" @@ -21,6 +24,10 @@ conf_files=" CFLAGS="-fcommon" +pre_configure() { + autoreconf -fi +} + speech-dispatcher-devel_package() { short_desc+=" - development files" depends="${sourcepkg}-${version}_${revision}"