diff options
Diffstat (limited to 'app-accessibility')
4 files changed, 70 insertions, 4 deletions
diff --git a/app-accessibility/speech-dispatcher/ChangeLog b/app-accessibility/speech-dispatcher/ChangeLog index 166000f6e541..78609a4957c5 100644 --- a/app-accessibility/speech-dispatcher/ChangeLog +++ b/app-accessibility/speech-dispatcher/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for app-accessibility/speech-dispatcher # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-dispatcher/ChangeLog,v 1.47 2009/09/06 20:32:06 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-dispatcher/ChangeLog,v 1.48 2009/09/07 19:34:48 williamh Exp $ + + 07 Sep 2009; William Hubbs <williamh@gentoo.org> + speech-dispatcher-0.6.7.ebuild, + +files/speech-dispatcher-0.6.7-getline.patch, + +files/speech-dispatcher-0.6.7-gnu-src-modules.patch: + Another update for bug #281130. + This fixes the compile warnings on a glibc 2.9 system and should fix the + build + for glibc 2.10 systems. 06 Sep 2009; William Hubbs <williamh@gentoo.org> speech-dispatcher-0.6.7.ebuild: diff --git a/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.6.7-getline.patch b/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.6.7-getline.patch new file mode 100644 index 000000000000..e81f695cf6fa --- /dev/null +++ b/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.6.7-getline.patch @@ -0,0 +1,41 @@ +From f0c490dc160f04cb9f258e0639944cffc1df9a40 Mon Sep 17 00:00:00 2001 +From: root <root@christoph.(none)> +Date: Tue, 11 Aug 2009 20:39:24 +0200 +Subject: [PATCH] Fix build with recent gcc + +--- + src/modules/module_main.c | 3 --- + src/modules/module_utils.h | 3 --- + 2 files changed, 0 insertions(+), 6 deletions(-) + +diff --git a/src/modules/module_main.c b/src/modules/module_main.c +index 2732cff..5bb5769 100644 +--- a/src/modules/module_main.c ++++ b/src/modules/module_main.c +@@ -21,9 +21,6 @@ + * $Id: speech-dispatcher-0.6.7-getline.patch,v 1.1 2009/09/07 19:34:47 williamh Exp $ + */ + +-/* So that gcc doesn't comply */ +-int getline(char**, size_t*, FILE*); +- + #define PROCESS_CMD(command, function) \ + if (!strcmp(cmd_buf, #command"\n")){ \ + char *msg; \ +diff --git a/src/modules/module_utils.h b/src/modules/module_utils.h +index e33865a..70e6241 100644 +--- a/src/modules/module_utils.h ++++ b/src/modules/module_utils.h +@@ -420,9 +420,6 @@ void module_report_event_pause(void); + + + +-/* So that gcc doesn't complain */ +-int getline(char**, size_t*, FILE*); +- + pthread_mutex_t module_stdout_mutex; + + int module_utils_init(void); +-- +1.6.4 + diff --git a/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.6.7-gnu-src-modules.patch b/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.6.7-gnu-src-modules.patch new file mode 100644 index 000000000000..e13f6b9136b1 --- /dev/null +++ b/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.6.7-gnu-src-modules.patch @@ -0,0 +1,13 @@ +diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am +index 579dbb8..06e3e16 100644 +--- a/src/modules/Makefile.am ++++ b/src/modules/Makefile.am +@@ -7,7 +7,7 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ + + EXTRA_DIST = module_main.c module_utils_addvoice.c festival_client.c festival_client.h ivona_client.c dummy.c dummy-message.wav + +-AM_CFLAGS = -Wall -DLOCALEDIR=\"$(localedir)\" -DDATADIR=\"$(snddatadir)\" -I/usr/include/ $(inc_local) @glib_include@ -L$(top_srcdir)/src/audio -I$(top_srcdir)/src/audio -I../../intl/ $(ibmtts_include) @SNDFILE_CFLAGS@ -Wl,--rpath -Wl,$(spdlibdir) ++AM_CFLAGS = -Wall -DLOCALEDIR=\"$(localedir)\" -DDATADIR=\"$(snddatadir)\" -I/usr/include/ $(inc_local) @glib_include@ -L$(top_srcdir)/src/audio -I$(top_srcdir)/src/audio -I../../intl/ $(ibmtts_include) @SNDFILE_CFLAGS@ -Wl,--rpath -Wl,$(spdlibdir) -D_GNU_SOURCE + + modulebin_PROGRAMS = sd_dummy sd_generic sd_festival sd_cicero + diff --git a/app-accessibility/speech-dispatcher/speech-dispatcher-0.6.7.ebuild b/app-accessibility/speech-dispatcher/speech-dispatcher-0.6.7.ebuild index 67310ba4baae..a6207f95c1cf 100644 --- a/app-accessibility/speech-dispatcher/speech-dispatcher-0.6.7.ebuild +++ b/app-accessibility/speech-dispatcher/speech-dispatcher-0.6.7.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-dispatcher/speech-dispatcher-0.6.7.ebuild,v 1.7 2009/09/06 20:32:06 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-dispatcher/speech-dispatcher-0.6.7.ebuild,v 1.8 2009/09/07 19:34:48 williamh Exp $ EAPI="2" -inherit eutils flag-o-matic +inherit autotools eutils DESCRIPTION="speech-dispatcher speech synthesis interface" HOMEPAGE="http://www.freebsoft.org/speechd" @@ -27,19 +27,22 @@ DEPEND="${RDEPEND} dev-util/pkgconfig" src_prepare() { + epatch "${FILESDIR}"/${P}-getline.patch + epatch "${FILESDIR}"/${P}-gnu-src-modules.patch + eautoreconf sed -i -e 's/\(SUBDIRS.*\)python/\1/' src/Makefile.in } src_configure() { econf \ $(use_with alsa) \ + $(use_with espeak) \ $(use_with flite) \ $(use_with pulseaudio pulse) \ $(use_with nas) || die "configure failed" } src_compile() { - append-cppflags -D_GNU_SOURCE make all || die "make failed" } |