disable voxin to fix unresolved requirement for libvoxin.so [release 0.10.2-2mamba;Fri Dec 04 2020]

This commit is contained in:
Silvan Calarco 2024-01-05 18:03:03 +01:00
parent 1924384e0c
commit 7827d1473a
2 changed files with 63 additions and 9 deletions

View File

@ -0,0 +1,45 @@
From 5ede80b0713c75b21925203c3ef389c86cb69e6d Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Fri, 20 Jul 2018 15:04:48 +0200
Subject: [PATCH] Remove pyxdg dependency
And use the same algorithm as GLib to determine the base user config
directory (XDG_CONFIG_HOME, then ~/.config then /tmp/$USERNAME/.config)
---
src/api/python/speechd_config/config.py.in | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/api/python/speechd_config/config.py.in b/src/api/python/speechd_config/config.py.in
index ccf8803..e8393e5 100644
--- a/src/api/python/speechd_config/config.py.in
+++ b/src/api/python/speechd_config/config.py.in
@@ -30,8 +30,6 @@ import socket
import sys
import time
-from xdg import BaseDirectory
-
# Locale/gettext configuration
locale.setlocale(locale.LC_ALL, '')
@@ -167,7 +165,16 @@ class Tests:
def user_conf_dir(self):
"""Return user configuration directory"""
- return os.path.join(BaseDirectory.xdg_config_home, "speech-dispatcher")
+ config_dir = os.environ['XDG_CONFIG_HOME']
+ if not config_dir:
+ home_dir = os.environ['HOME']
+ if home_dir:
+ config_dir = os.path.join(home_dir, ".config")
+ else:
+ tmpdir = os.environ['TMPDIR'] or "/tmp/"
+ config_dir = os.path.join(tmpdir, os.getlogin(), ".config")
+
+ return os.path.join(config_dir, "speech-dispatcher")
def system_conf_dir(self):
"""Determine system configuration directory"""
--
2.17.1

View File

@ -1,6 +1,6 @@
Name: speech-dispatcher Name: speech-dispatcher
Version: 0.10.1 Version: 0.10.2
Release: 1mamba Release: 2mamba
Summary: A high-level device independent layer for speech synthesis Summary: A high-level device independent layer for speech synthesis
Group: System/Multimedia Group: System/Multimedia
Vendor: openmamba Vendor: openmamba
@ -13,6 +13,7 @@ Source1: speech-dispatcher.init
Patch0: %{name}-0.7.1-alsa_set_default.patch Patch0: %{name}-0.7.1-alsa_set_default.patch
Patch1: %{name}-0.8-enable_espeak_mbrola.patch Patch1: %{name}-0.8-enable_espeak_mbrola.patch
Patch2: speech-dispatcher-0.8-pkgconfig-add-includedir.patch Patch2: speech-dispatcher-0.8-pkgconfig-add-includedir.patch
Patch3: speech-dispatcher-0.10.2-remove-python-xdg-dependency.patch
License: LGPL License: LGPL
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel BuildRequires: glibc-devel
@ -29,7 +30,6 @@ BuildRequires: libpython-devel
BuildRequires: libsndfile-devel BuildRequires: libsndfile-devel
BuildRequires: libvorbis-devel BuildRequires: libvorbis-devel
## AUTOBUILDREQ-END ## AUTOBUILDREQ-END
BuildRequires: python-xdg-py36
Requires(post):%{__install_info} Requires(post):%{__install_info}
Obsoletes: opentts Obsoletes: opentts
Provides: python-speech-dispatcher Provides: python-speech-dispatcher
@ -82,7 +82,6 @@ This package contains static libraries and header files needed for development.
Summary: Python wrapper for %{name} Summary: Python wrapper for %{name}
Group: Development/Libraries Group: Development/Libraries
Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release}
Requires: python-xdg-py36
%description -n python-speechd %description -n python-speechd
Contains Python language bindings for developing Python applications that use %{name}. Contains Python language bindings for developing Python applications that use %{name}.
@ -114,23 +113,25 @@ Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release}
The goal of Speech Dispatcher project is to provide a high-level device independent layer for speech synthesis through a simple, stable and well documented interface. The goal of Speech Dispatcher project is to provide a high-level device independent layer for speech synthesis through a simple, stable and well documented interface.
This package contains the flite module. This package contains the flite module.
%debug_package
%prep %prep
%setup -q -n speechd-%{version} %setup -q -n speechd-%{version}
#%patch0 -p1 #%patch0 -p1
#%patch1 -p1 #%patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1
sed -i "s|env python3$|env python3.6|" src/api/python/speechd_config/spd-conf #sed -i "s|env python3$|env python3.6|" src/api/python/speechd_config/spd-conf
cat > .tarball-version << _EOF cat > .tarball-version << _EOF
%{version} %{version}
_EOF _EOF
%build
autoreconf -f -i autoreconf -f -i
%build
%configure \ %configure \
PYTHON=%{__python36} \ PYTHON=%{__python3} \
--disable-static \ --disable-static \
--with-alsa \ --with-alsa \
--with-pulse \ --with-pulse \
@ -142,6 +143,7 @@ autoreconf -f -i
--with-kali=no \ --with-kali=no \
--with-baratinoo=no \ --with-baratinoo=no \
--with-ibmtts=no \ --with-ibmtts=no \
--with-voxin=no \
--with-default-audio-method=pulse --with-default-audio-method=pulse
# --with-flite \ # --with-flite \
@ -249,6 +251,7 @@ rm -f %{buildroot}%{_libdir}/*.la
%{_libdir}/speech-dispatcher-modules/sd_cicero %{_libdir}/speech-dispatcher-modules/sd_cicero
%{_libdir}/speech-dispatcher-modules/sd_dummy %{_libdir}/speech-dispatcher-modules/sd_dummy
%{_libdir}/speech-dispatcher-modules/sd_generic %{_libdir}/speech-dispatcher-modules/sd_generic
#%{_libdir}/speech-dispatcher-modules/sd_voxin
%dir %{_libdir}/speech-dispatcher %dir %{_libdir}/speech-dispatcher
%{_libdir}/speech-dispatcher/spd_alsa.so %{_libdir}/speech-dispatcher/spd_alsa.so
%{_libdir}/speech-dispatcher/spd_libao.so %{_libdir}/speech-dispatcher/spd_libao.so
@ -265,9 +268,15 @@ rm -f %{buildroot}%{_libdir}/*.la
%files -n python-speechd %files -n python-speechd
%defattr(-,root,root) %defattr(-,root,root)
%{python36_sitearch}/speechd* %{python3_sitearch}/speechd*
%changelog %changelog
* Fri Dec 04 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 0.10.2-2mamba
- disable voxin to fix unresolved requirement for libvoxin.so
* Thu Dec 03 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 0.10.2-1mamba
- update to 0.10.2
* Sat Aug 22 2020 Automatic Build System <autodist@mambasoft.it> 0.10.1-1mamba * Sat Aug 22 2020 Automatic Build System <autodist@mambasoft.it> 0.10.1-1mamba
- automatic version update by autodist - automatic version update by autodist