Merge pull request #6678 from Rmys/master

speech-dispatcher:ver bump
This commit is contained in:
Rmys
2019-03-24 02:34:44 +03:00
committed by GitHub
3 changed files with 63 additions and 4 deletions
@@ -21,6 +21,8 @@ def setup():
--with-espeak \
--with-libao \
--with-pulse \
--with-baratinoo=no \
--with-kali=no \
--with-default-audio-method=alsa")
pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
@@ -29,7 +31,8 @@ def build():
autotools.make()
def install():
autotools.install()
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
#autotools.install()
# Conflicts with openTTS
pisitools.remove("/usr/share/info/ssip.info")
@@ -41,4 +44,4 @@ def install():
pisitools.dodir("/var/log/speech-dispatcher")
shelltools.chmod("%s/var/log/speech-dispatcher" % get.installDIR(), 0700)
pisitools.dodoc("AUTHORS", "COPYING", "README")
pisitools.dodoc("AUTHORS", "COPYING*", "README*")
@@ -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
+13 -2
View File
@@ -3,7 +3,7 @@
<PISI>
<Source>
<Name>speech-dispatcher</Name>
<Homepage>http://www.freebsoft.org/speechd</Homepage>
<Homepage>https://freebsoft.org/speechd</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
@@ -15,7 +15,7 @@
<IsA>library</IsA>
<Summary>speech dispatcher: common interface to speech synthesis</Summary>
<Description>Speech Dispatcher is a device independent layer for speech synthesis that provides a common easy to use interface for both client applications (programs that want to speak) and for software synthesizers (programs actually able to convert text to speech).</Description>
<Archive sha1sum="b2aad4b2db502a03ee27039b8229d4ee206b7d8d" type="targz">https://devel.freebsoft.org/pub/projects/speechd/speech-dispatcher-0.8.6.tar.gz</Archive>
<Archive sha1sum="e8a84edbbf9a46de4547f505db597a977871dda0" type="targz">https://github.com/brailcom/speechd/releases/download/0.9.0/speech-dispatcher-0.9.0.tar.gz</Archive>
<BuildDependencies>
<Dependency>glib2-devel</Dependency>
<Dependency>libsndfile-devel</Dependency>
@@ -25,12 +25,16 @@
<Dependency>intltool</Dependency>
<Dependency>gettext-devel</Dependency>
<Dependency>texinfo</Dependency>
<Dependency>help2man</Dependency>
<Dependency>pkgconfig</Dependency>
<Dependency>libtool-ltdl</Dependency>
<Dependency>libao-devel</Dependency>
<Dependency>alsa-lib-devel</Dependency>
<Dependency>pulseaudio-libs-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">0001-Remove-pyxdg-dependency.patch</Patch>
</Patches>
</Source>
<Package>
@@ -85,6 +89,13 @@
</Package>
<History>
<Update release="6">
<Date>2019-03-23</Date>
<Version>0.9.0</Version>
<Comment>Version bump.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="5">
<Date>2018-09-21</Date>
<Version>0.8.6</Version>