diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2009-07-23 16:49:06 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-07-23 16:49:06 +0000 |
| commit | 5fe5ea54a5abbb5ba5e7d424ccc0086056bae7cc (patch) | |
| tree | e73712b3be54a5e1c06262d566078515349d3579 | |
| parent | Unmask sidplay since it builds again. (diff) | |
| download | gentoo-2-5fe5ea54a5abbb5ba5e7d424ccc0086056bae7cc.tar.gz gentoo-2-5fe5ea54a5abbb5ba5e7d424ccc0086056bae7cc.tar.bz2 gentoo-2-5fe5ea54a5abbb5ba5e7d424ccc0086056bae7cc.zip | |
Fix building with glibc-2.10+ wrt #271607, thanks to hirakendu.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
3 files changed, 34 insertions, 8 deletions
diff --git a/app-accessibility/speech-tools/ChangeLog b/app-accessibility/speech-tools/ChangeLog index 50036488d0ec..5bd35045c171 100644 --- a/app-accessibility/speech-tools/ChangeLog +++ b/app-accessibility/speech-tools/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-accessibility/speech-tools # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/ChangeLog,v 1.63 2009/05/12 17:14:05 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/ChangeLog,v 1.64 2009/07/23 16:49:06 ssuominen Exp $ + + 23 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> + speech-tools-1.2.96_beta.ebuild, + +files/speech-tools-1.2.96_beta-gcc44.patch: + Fix building with glibc-2.10+ wrt #271607, thanks to hirakendu. 12 May 2009; Samuli Suominen <ssuominen@gentoo.org> speech-tools-1.2.96_beta.ebuild: diff --git a/app-accessibility/speech-tools/files/speech-tools-1.2.96_beta-gcc44.patch b/app-accessibility/speech-tools/files/speech-tools-1.2.96_beta-gcc44.patch new file mode 100644 index 000000000000..98f8fda2f7ca --- /dev/null +++ b/app-accessibility/speech-tools/files/speech-tools-1.2.96_beta-gcc44.patch @@ -0,0 +1,21 @@ +--- speech_tools/speech_class/EST_wave_io.cc.orig 2009-05-26 03:49:24.000000000 -0700 ++++ speech_tools/speech_class/EST_wave_io.cc 2009-05-26 03:54:01.000000000 -0700 +@@ -68,7 +68,7 @@ + + int nist_get_param_int(const char *hdr, const char *field, int def_val) + { +- char *p; ++ const char *p; + int val; + + if (((p=strstr(hdr,field)) != NULL) && +@@ -84,7 +84,8 @@ + + char *nist_get_param_str(const char *hdr, const char *field, const char *def_val) + { +- char *p,*val; ++ const char *p; ++ char *val; + int size; + + if (((p=strstr(hdr,field)) != NULL) && diff --git a/app-accessibility/speech-tools/speech-tools-1.2.96_beta.ebuild b/app-accessibility/speech-tools/speech-tools-1.2.96_beta.ebuild index 1d55940c53f2..b7205e637b37 100644 --- a/app-accessibility/speech-tools/speech-tools-1.2.96_beta.ebuild +++ b/app-accessibility/speech-tools/speech-tools-1.2.96_beta.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-1.2.96_beta.ebuild,v 1.13 2009/05/12 17:14:05 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-1.2.96_beta.ebuild,v 1.14 2009/07/23 16:49:06 ssuominen Exp $ inherit eutils toolchain-funcs @@ -15,23 +15,23 @@ SLOT="0" KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" IUSE="esd nas X" -DEPEND="esd? ( media-sound/esound ) +RDEPEND="esd? ( media-sound/esound ) nas? ( media-libs/nas ) X? ( x11-libs/libX11 x11-libs/libXt ) !<app-accessibility/festival-1.96_beta !sys-power/powerman" +DEPEND="${RDEPEND}" -S="${WORKDIR}/speech_tools" +S=${WORKDIR}/speech_tools src_unpack() { local CONFIG=${S}/config/config.in - unpack ${A} - # apply patches for gcc 4.2 and gcc 4.3 - epatch "${FILESDIR}"/${P}-gcc42.patch - epatch "${FILESDIR}"/${P}-gcc43-include.patch + epatch "${FILESDIR}"/${P}-gcc42.patch \ + "${FILESDIR}"/${P}-gcc43-include.patch \ + "${FILESDIR}"/${P}-gcc44.patch # set compiler flags for base_class sed -i -e "s:-O3:\$(OPTIMISE_CXXFLAGS):" "${S}"/base_class/Makefile |