Date: Monday, December 13, 2021 @ 12:16:50 Author: alex19ep Revision: 1071571
upgpkg: speech-dispatcher 0.11.0-1 upstream release Modified: speech-dispatcher/trunk/PKGBUILD Deleted: speech-dispatcher/trunk/glib2.68.patch speech-dispatcher/trunk/speech-dispatcherd.service ----------------------------+ PKGBUILD | 80 +++++++++++++-------------------- glib2.68.patch | 102 ------------------------------------------- speech-dispatcherd.service | 10 ---- 3 files changed, 32 insertions(+), 160 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-12-13 12:15:57 UTC (rev 1071570) +++ PKGBUILD 2021-12-13 12:16:50 UTC (rev 1071571) @@ -1,71 +1,54 @@ -# Maintainer: Sven-Hendrik Haase <[email protected]> +# Maintainer: Alexander Epaneshnikov <[email protected]> +# Contributor: Sven-Hendrik Haase <[email protected]> + pkgbase=speech-dispatcher pkgname=(speech-dispatcher libspeechd) -pkgver=0.10.2 -pkgrel=3 +pkgver=0.11.0 +pkgrel=1 arch=('x86_64') pkgdesc="High-level device independent layer for speech synthesis interface" -url="http://www.freebsoft.org/speechd"; +url='http://www.freebsoft.org/speechd' license=('GPL2' 'FDL') -makedepends=('intltool' 'espeak-ng' 'libltdl' 'python-xdg' 'dotconf' 'libpulse' 'libao') -source=("https://github.com/brailcom/speechd/releases/download/${pkgver}/speech-dispatcher-${pkgver}.tar.gz"; - 'glib2.68.patch' - 'speech-dispatcherd.service') -sha512sums=('9af240d9a15062489c170440911e9d148d0d113a0f22211f1496e9754345a5d079e160962d666801322dc2efa1134f8b5e209c0183d93a1f0896705dc6011122' - '098efb310446ebf25b80dac2a321bb1f5d74905d92a5f8a49838df687f5ef1e3bdae513f3b65451b8befcbaa485069730555c522ff96517adb74fcf41b2df85b' - '73eb563003b03f4836b17af66335664050d1dc3bd8434be368cd09ff8933aa2adc4bd17c4ce5c1bbbd406a0b0880191426a679fa05eac0a30f4005eaeeb47340') +makedepends=('glib2' 'intltool' 'espeak-ng' 'libtool' 'python-pyxdg' 'dotconf' 'libpulse' 'libao') +source=("https://github.com/brailcom/speechd/releases/download/${pkgver}/speech-dispatcher-${pkgver}.tar.gz";) +sha512sums=('834c6332048e5d18fe8ec1a0c1ddbec297adddf4f1b98612085e4ee5c4b1a5302853400cc67386ea0d7940904b832a95f5969eff12970e0b8689d4d71a33b00b') -prepare() { - cd ${pkgname}-${pkgver} - - # https://github.com/brailcom/speechd/issues/616 - patch -Np1 -i ../glib2.68.patch - - # Disabled due to bug: https://bugs.archlinux.org/task/35700 - sed -i "s/cicero //g" configure.ac - sed -i "s/sd_cicero//g" src/modules/Makefile.am -} - build() { cd ${pkgname}-${pkgver} - CFLAGS+=' -fcommon' # https://wiki.gentoo.org/wiki/Gcc_10_porting_notes/fno_common - - ./configure --prefix=/usr \ - --enable-shared \ - --sysconfdir=/etc \ - --without-flite + ./configure --prefix=/usr --sysconfdir=/etc \ + --disable-static \ + --libexecdir=/usr/lib/speech-dispatcher/ \ + --with-ibmtts=no --with-kali=no --with-baratinoo=no \ + --with-voxin=no --without-flite make } package_speech-dispatcher() { - depends=("libspeechd=$pkgver-$pkgrel" 'libltdl' 'python-xdg' 'dotconf' 'libpulse' 'libao') + depends=("libspeechd=$pkgver-$pkgrel" 'python-pyxdg' 'dotconf' 'libpulse' 'libao') optdepends=('festival: Speech output using Festival' 'espeak-ng: Speech output using ESpeak-ng' 'pulseaudio: PulseAudio support') - backup=(etc/speech-dispatcher/clients/emacs.conf - etc/speech-dispatcher/modules/ibmtts.conf - etc/speech-dispatcher/modules/espeak-generic.conf - etc/speech-dispatcher/modules/espeak.conf - etc/speech-dispatcher/modules/espeak-ng.conf - etc/speech-dispatcher/modules/swift-generic.conf - etc/speech-dispatcher/modules/festival.conf - etc/speech-dispatcher/modules/cicero.conf - etc/speech-dispatcher/modules/espeak-mbrola-generic.conf - etc/speech-dispatcher/modules/espeak-ng-mbrola-generic.conf - etc/speech-dispatcher/modules/dtk-generic.conf - etc/speech-dispatcher/modules/llia_phon-generic.conf - etc/speech-dispatcher/modules/ivona.conf - etc/speech-dispatcher/modules/epos-generic.conf - etc/speech-dispatcher/modules/flite.conf - etc/speech-dispatcher/modules/pico-generic.conf - etc/speech-dispatcher/speechd.conf) + backup=('etc/speech-dispatcher/clients/emacs.conf' + 'etc/speech-dispatcher/modules/dtk-generic.conf' + 'etc/speech-dispatcher/modules/epos-generic.conf' + 'etc/speech-dispatcher/modules/espeak-ng.conf' + 'etc/speech-dispatcher/modules/espeak-ng-mbrola.conf' + 'etc/speech-dispatcher/modules/espeak-ng-mbrola-generic.conf' + 'etc/speech-dispatcher/modules/festival.conf' + 'etc/speech-dispatcher/modules/llia_phon-generic.conf' + 'etc/speech-dispatcher/modules/mary-generic.conf' + 'etc/speech-dispatcher/modules/swift-generic.conf' + 'etc/speech-dispatcher/speechd.conf') cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install - install -Dm644 "${srcdir}"/speech-dispatcherd.service "${pkgdir}/usr/lib/systemd/system/speech-dispatcherd.service" - install -d "${pkgdir}/var/log/speech-dispatcher" + rm "${pkgdir}/etc/speech-dispatcher/modules/cicero.conf" + rm "${pkgdir}/etc/speech-dispatcher/modules/espeak.conf" + rm "${pkgdir}/etc/speech-dispatcher/modules/espeak-mbrola-generic.conf" + rm "${pkgdir}/etc/speech-dispatcher/modules/flite.conf" + rm "${pkgdir}/usr/lib/speech-dispatcher/speech-dispatcher-modules/sd_cicero" sed -i 's|includedir=.*|includedir=${prefix}/include/speech-dispatcher|g' "${pkgdir}/usr/lib/pkgconfig/speech-dispatcher.pc" @@ -75,6 +58,7 @@ } package_libspeechd() { + depends=('glib2' 'libtool') mkdir -p "${pkgdir}"/usr/lib mv "${srcdir}"/libspeechd/usr/include "${pkgdir}"/usr Deleted: glib2.68.patch =================================================================== --- glib2.68.patch 2021-12-13 12:15:57 UTC (rev 1071570) +++ glib2.68.patch 2021-12-13 12:16:50 UTC (rev 1071571) @@ -1,102 +0,0 @@ -From a2faab416e42cbdf3d73f98578a89eb7a235e25a Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro <[email protected]> -Date: Tue, 2 Feb 2021 14:50:23 -0600 -Subject: [PATCH] Fix build after glib e38982df - -glib.h now includes <type_traits> when building as C++. But kali.cpp -includes it (via module_utils.h) inside an extern "C" block. This is -illegal. - -Best practice is to use extern "C" in project header files, not around -include statements. So let's do that. module_utils.h already includes -glib.h, so we can use G_BEGIN_DECLS/G_END_DECLS there. spd_audio.h does -not, so I decided to write out the usual boilerplate, as including all -of glib.h just for G_BEGIN_DECLS/G_END_DECLS seemed like overkill. -Finally, I'll move config.h at the very top of kali.cpp, since I'm -touching this code anyway and that is the usual place to put it. - -This is the minimum viable change required for speech-dispatcher to -build with glib master. As long as speech-dispatcher is combining C and -C++, it would be advisible to use extern "C" in all headers that declare -C functions and might be included from C++. ---- - src/modules/kali.cpp | 10 +++++----- - src/modules/module_utils.h | 4 ++++ - src/modules/spd_audio.h | 8 ++++++++ - 3 files changed, 17 insertions(+), 5 deletions(-) - -diff --git a/src/modules/kali.cpp b/src/modules/kali.cpp -index 193975d8..7b497626 100644 ---- a/src/modules/kali.cpp -+++ b/src/modules/kali.cpp -@@ -21,21 +21,21 @@ - * $Id: kali.c,v 1.59 2008-06-09 10:38:02 hanke Exp $ - */ - -+#ifdef HAVE_CONFIG_H -+#include <config.h> -+#endif -+ - #include <stdio.h> - #include <string.h> - #include <unistd.h> - #include <kali/Kali/kali.h> --extern "C" { --#ifdef HAVE_CONFIG_H --#include <config.h> --#endif -+ - #include <semaphore.h> - #include "spd_audio.h" - - #include <speechd_types.h> - - #include "module_utils.h" --} - #define MODULE_NAME "kali" - #define MODULE_VERSION "0.0" - #define DEBUG_MODULE 1 -diff --git a/src/modules/module_utils.h b/src/modules/module_utils.h -index 6081e7e1..e82850b2 100644 ---- a/src/modules/module_utils.h -+++ b/src/modules/module_utils.h -@@ -41,6 +41,8 @@ - #include <speechd_types.h> - #include "spd_audio.h" - -+G_BEGIN_DECLS -+ - typedef struct SPDMarks { - unsigned num; - unsigned allocated; -@@ -420,4 +422,6 @@ char *module_getvoice(char *language, SPDVoiceType voice); - gboolean module_existsvoice(char *voicename); - char *module_getdefaultvoice(void); - -+G_END_DECLS -+ - #endif /* #ifndef __MODULE_UTILS_H */ -diff --git a/src/modules/spd_audio.h b/src/modules/spd_audio.h -index 25045e2f..b9de3cd5 100644 ---- a/src/modules/spd_audio.h -+++ b/src/modules/spd_audio.h -@@ -28,6 +28,10 @@ - - #define SPD_AUDIO_LIB_PREFIX "spd_" - -+#ifdef __cplusplus -+extern "C" { -+#endif -+ - AudioID *spd_audio_open(char *name, void **pars, char **error); - - int spd_audio_play(AudioID * id, AudioTrack track, AudioFormat format); -@@ -47,4 +51,8 @@ void spd_audio_set_loglevel(AudioID * id, int level); - - char const *spd_audio_get_playcmd(AudioID * id); - -+#ifdef __cplusplus -+} -+#endif -+ - #endif /* ifndef #__SPD_AUDIO_H */ Deleted: speech-dispatcherd.service =================================================================== --- speech-dispatcherd.service 2021-12-13 12:15:57 UTC (rev 1071570) +++ speech-dispatcherd.service 2021-12-13 12:16:50 UTC (rev 1071571) @@ -1,10 +0,0 @@ -[Unit] -Description=Speech-Dispatcher an high-level device independent layer for speech synthesis. -After=syslog.target - -[Service] -Type=forking -ExecStart=/usr/bin/speech-dispatcher -d - -[Install] -WantedBy=multi-user.target
