Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/speech-dispatcher.git#4766fe7b24b79c91c6a4ea877af6bbc87ef1d096
This commit is contained in:
DistroBaker 2020-11-25 09:57:42 +00:00
parent 5a1ab50f15
commit 03dd99475a
3 changed files with 7 additions and 32 deletions

View File

@ -1,26 +0,0 @@
From 51941ef2edb98844c1fc694e66012f9fff99f81d Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@gnome.org>
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
--- a/src/api/python/speechd/client.py
+++ b/src/api/python/speechd/client.py
@@ -289,7 +289,7 @@ def _recv_response(self):
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

View File

@ -1,2 +1,2 @@
SHA512 (speech-dispatcher-0.10.1.tar.gz) = b70b88de08d90a024b147eb206f4a4dddc4c78a8afc4470f71cd47883b9845e787e8e7f8a70406937b9116c4980629dbeb007ab3810e464995a81eba3dae675e SHA512 (speech-dispatcher-0.10.2.tar.gz) = 9af240d9a15062489c170440911e9d148d0d113a0f22211f1496e9754345a5d079e160962d666801322dc2efa1134f8b5e209c0183d93a1f0896705dc6011122
SHA512 (sound-icons-0.1.tar.gz) = f0ba9e1e84ace325671c7f323f01d647aa0e1a318e9adc2a6d8af4e0d795e478b2ea66007670f9c7ced9ef7310fdbccb5168b0f404579f5dff8712fe12ad93a0 SHA512 (sound-icons-0.1.tar.gz) = f0ba9e1e84ace325671c7f323f01d647aa0e1a318e9adc2a6d8af4e0d795e478b2ea66007670f9c7ced9ef7310fdbccb5168b0f404579f5dff8712fe12ad93a0

View File

@ -1,8 +1,8 @@
%global _hardened_build 1 %global _hardened_build 1
Name: speech-dispatcher Name: speech-dispatcher
Version: 0.10.1 Version: 0.10.2
Release: 2%{?dist} Release: 1%{?dist}
Summary: To provide a high-level device independent layer for speech synthesis Summary: To provide a high-level device independent layer for speech synthesis
# Almost all files are under GPLv2+, however # Almost all files are under GPLv2+, however
@ -14,8 +14,6 @@ Source0: https://github.com/brailcom/speechd/releases/download/%{version}/
Source1: http://www.freebsoft.org/pub/projects/sound-icons/sound-icons-0.1.tar.gz Source1: http://www.freebsoft.org/pub/projects/sound-icons/sound-icons-0.1.tar.gz
Patch1: 0001-Remove-pyxdg-dependency.patch Patch1: 0001-Remove-pyxdg-dependency.patch
# https://github.com/brailcom/speechd/pull/403
Patch2: fix-crash-with-python-3.9.patch
BuildRequires: alsa-lib-devel BuildRequires: alsa-lib-devel
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
@ -126,7 +124,7 @@ tar xf %{SOURCE1}
--with-alsa --with-pulse --with-libao \ --with-alsa --with-pulse --with-libao \
--with-flite --with-espeak-ng \ --with-flite --with-espeak-ng \
--without-oss --without-nas --without-espeak \ --without-oss --without-nas --without-espeak \
--with-kali=no --with-baratinoo=no --with-ibmtts=no \ --with-kali=no --with-baratinoo=no --with-ibmtts=no --with-voxin=no \
--sysconfdir=%{_sysconfdir} --with-default-audio-method=pulse --sysconfdir=%{_sysconfdir} --with-default-audio-method=pulse
%make_build %make_build
@ -226,6 +224,9 @@ sed 's/# AudioOutputMethod "pulse,alsa"/AudioOutputMethod "pulse,alsa"/' %{build
%{python3_sitearch}/speechd* %{python3_sitearch}/speechd*
%changelog %changelog
* Wed Nov 25 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 0.10.2-1
- Update to 0.10.2
* Fri Sep 11 2020 Kalev Lember <klember@redhat.com> - 0.10.1-2 * Fri Sep 11 2020 Kalev Lember <klember@redhat.com> - 0.10.1-2
- Fix crash with python 3.9 (#1878276) - Fix crash with python 3.9 (#1878276)