diff options
| author |   William Hubbs <williamh@gentoo.org> | 2007-08-31 04:12:37 +0000 |
|---|---|---|
| committer | William Hubbs <williamh@gentoo.org> | 2007-08-31 04:12:37 +0000 |
| commit | fa3d43f06131dd173a569a04d82b90f93a0f42a5 (patch) | |
| tree | 55e0077a65c440c95d7d8b79200ee4a9b630ecbd /app-accessibility/speech-tools | |
| parent | mask =net-misc/drivel-2.0.2 and x11-plugins/desklet-sidecandyrhythmbox which ... (diff) | |
| download | historical-fa3d43f06131dd173a569a04d82b90f93a0f42a5.tar.gz historical-fa3d43f06131dd173a569a04d82b90f93a0f42a5.tar.bz2 historical-fa3d43f06131dd173a569a04d82b90f93a0f42a5.zip | |
Fixed gcc4.2 compilation bug #190576.
Package-Manager: portage-2.1.3.7
Diffstat (limited to 'app-accessibility/speech-tools')
4 files changed, 84 insertions, 10 deletions
diff --git a/app-accessibility/speech-tools/ChangeLog b/app-accessibility/speech-tools/ChangeLog index c7b5cf287e61..201e63c3f316 100644 --- a/app-accessibility/speech-tools/ChangeLog +++ b/app-accessibility/speech-tools/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-accessibility/speech-tools # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/ChangeLog,v 1.50 2007/08/29 00:26:32 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/ChangeLog,v 1.51 2007/08/31 04:12:37 williamh Exp $ + + 31 Aug 2007; William Hubbs <williamh@gentoo.org> + +files/speech-tools-1.2.96_beta-gcc42.patch, + speech-tools-1.2.96_beta.ebuild: + Fixed gcc 4.2 compilation bug #190576. + Thanks to jhront@wanadoo.fr for the patch. 29 Aug 2007; William Hubbs <williamh@gentoo.org> speech-tools-1.2.96_beta.ebuild: diff --git a/app-accessibility/speech-tools/Manifest b/app-accessibility/speech-tools/Manifest index 26f91aadd657..e4ec46b48ff9 100644 --- a/app-accessibility/speech-tools/Manifest +++ b/app-accessibility/speech-tools/Manifest @@ -14,6 +14,10 @@ AUX speech-tools-1.2.95_beta-gcc41.patch 1660 RMD160 19bb4ef66754f5fa760a42c1afc MD5 1a5389d86d50fdd9ab06a31819477cf1 files/speech-tools-1.2.95_beta-gcc41.patch 1660 RMD160 19bb4ef66754f5fa760a42c1afc74597c0d5569a files/speech-tools-1.2.95_beta-gcc41.patch 1660 SHA256 a3ff88158a8ffddbf57261a5acc9856c43a6a77cefa49472db033cdb72b0e894 files/speech-tools-1.2.95_beta-gcc41.patch 1660 +AUX speech-tools-1.2.96_beta-gcc42.patch 2203 RMD160 c2bb3d7cec0c9449b4480a45675057acc4a8ef8c SHA1 3cf29f9dcb9fdfd90249003b7eca9d71a88b8219 SHA256 4bc724774e4223448bb1bbd202fe6055580abd62d11ffab470843e1351c45e9e +MD5 db6055cb7083aec48c402281a70692b3 files/speech-tools-1.2.96_beta-gcc42.patch 2203 +RMD160 c2bb3d7cec0c9449b4480a45675057acc4a8ef8c files/speech-tools-1.2.96_beta-gcc42.patch 2203 +SHA256 4bc724774e4223448bb1bbd202fe6055580abd62d11ffab470843e1351c45e9e files/speech-tools-1.2.96_beta-gcc42.patch 2203 AUX speech-tools-gcc3.3.diff 25787 RMD160 9b5662ad9ae8b76c6217845363ec876948d1a175 SHA1 d3df725fa62c7a5729cc45f397844c2885fb9c39 SHA256 e4d15d5033920576ac6b08be0fa18f31c43f3f6a043ff5e58431e271c4bc147e MD5 19e3325adc92d921d82884fe58485055 files/speech-tools-gcc3.3.diff 25787 RMD160 9b5662ad9ae8b76c6217845363ec876948d1a175 files/speech-tools-gcc3.3.diff 25787 @@ -39,14 +43,14 @@ EBUILD speech-tools-1.2.95_beta.ebuild 3155 RMD160 da1aa2333f9993d963ba000ca6234 MD5 b966d8ad4e2e82beb931bb3a00419075 speech-tools-1.2.95_beta.ebuild 3155 RMD160 da1aa2333f9993d963ba000ca62343d2e7946e27 speech-tools-1.2.95_beta.ebuild 3155 SHA256 8f734b6540d4b5d2b944a32dfa601da1930ce94d79a6e4341076b33226343226 speech-tools-1.2.95_beta.ebuild 3155 -EBUILD speech-tools-1.2.96_beta.ebuild 2607 RMD160 e7a3f5723b367ed5f5b8aee3e450de0a95f8ae8b SHA1 e2f6e3cd44bdcde26249b7802f44c966fc5b4d1b SHA256 974dab1350d46c50a3cc927ce2bbc44bd7c0ae17ec3915b92b3e0ae156302c6b -MD5 e0509825fc6d437294fc11941b2f5d43 speech-tools-1.2.96_beta.ebuild 2607 -RMD160 e7a3f5723b367ed5f5b8aee3e450de0a95f8ae8b speech-tools-1.2.96_beta.ebuild 2607 -SHA256 974dab1350d46c50a3cc927ce2bbc44bd7c0ae17ec3915b92b3e0ae156302c6b speech-tools-1.2.96_beta.ebuild 2607 -MISC ChangeLog 7815 RMD160 be8abe5d369b92d5799c9525687e4dd2bf938a0d SHA1 0e61aecf0acb32da9297d43915d952a6f893de62 SHA256 115ffaa55aa34ad907cf657b5de6f6e3ee42d64b68704d7fc04e3644d6e62a97 -MD5 a11984bea61ddc74ede99190b26d71d1 ChangeLog 7815 -RMD160 be8abe5d369b92d5799c9525687e4dd2bf938a0d ChangeLog 7815 -SHA256 115ffaa55aa34ad907cf657b5de6f6e3ee42d64b68704d7fc04e3644d6e62a97 ChangeLog 7815 +EBUILD speech-tools-1.2.96_beta.ebuild 2673 RMD160 a9e38f9467afc1c3ef951c8d8bce6e9aafa8aa57 SHA1 60b6e1733544c09a3933d9d74f9b95e149b1fb4d SHA256 1633ac04846deb12833a5915f81a10a308727099bf91fd530de72935553eb0bf +MD5 bd1d6d63b708db6fcacd3ce95e0117b7 speech-tools-1.2.96_beta.ebuild 2673 +RMD160 a9e38f9467afc1c3ef951c8d8bce6e9aafa8aa57 speech-tools-1.2.96_beta.ebuild 2673 +SHA256 1633ac04846deb12833a5915f81a10a308727099bf91fd530de72935553eb0bf speech-tools-1.2.96_beta.ebuild 2673 +MISC ChangeLog 8035 RMD160 f455cabf730b1c2f14b0a88d9f2862bc8ebcb58b SHA1 17c7ff90a7b7d0efe6eedb2906794edccbf2926b SHA256 4318f55ffc8f7403b7230ce54bfb79ebc8ded93814749a85535e4a32b16bdf69 +MD5 72ed9b6a48175aa1ba111031b6a8a001 ChangeLog 8035 +RMD160 f455cabf730b1c2f14b0a88d9f2862bc8ebcb58b ChangeLog 8035 +SHA256 4318f55ffc8f7403b7230ce54bfb79ebc8ded93814749a85535e4a32b16bdf69 ChangeLog 8035 MISC metadata.xml 185 RMD160 75382db82e4c69d70f2d53f63363adec302720e5 SHA1 90563c269eff265fbd369095c606bc383cc07232 SHA256 b6de40518e01d3ef5447352b3f476c1f5b8e6ae53d5e654a2fb9e4ee7fdbe135 MD5 4f5d797c455932135181f0c31b5e71b2 metadata.xml 185 RMD160 75382db82e4c69d70f2d53f63363adec302720e5 metadata.xml 185 diff --git a/app-accessibility/speech-tools/files/speech-tools-1.2.96_beta-gcc42.patch b/app-accessibility/speech-tools/files/speech-tools-1.2.96_beta-gcc42.patch new file mode 100644 index 000000000000..1810a96e6446 --- /dev/null +++ b/app-accessibility/speech-tools/files/speech-tools-1.2.96_beta-gcc42.patch @@ -0,0 +1,61 @@ +--- speech_tools/config/compilers/egcs.mak 2001-04-04 13:55:32.000000000 +0200 ++++ speech_tools/config/compilers/egcs.mak 2007-08-28 23:08:01.000000000 +0200 +@@ -54,7 +54,7 @@ + CXX=$(EGCS_CXX) + + ifndef EGCS_MAKE_SHARED_LIB +- MAKE_SHARED_LIB = gcc -shared -fno-shared-data -o XXX -Xlinker -h -Xlinker XXX ++ MAKE_SHARED_LIB = gcc -shared -o XXX -Xlinker -h -Xlinker XXX + else + MAKE_SHARED_LIB = $(GCC_MAKE_SHARED_LIB) + endif +--- speech_tools/config/compilers/gcc_defaults.mak 2006-08-05 17:37:59.000000000 +0200 ++++ speech_tools/config/compilers/gcc_defaults.mak 2007-08-28 23:08:30.000000000 +0200 +@@ -76,12 +76,12 @@ + PROFILE_gprof_CXXFLAGS = -pg + PROFILE_gprof_LINKFLAGS = -pg + +-SHARED_CCFLAGS = -fPIC -fno-shared-data +-SHARED_CXXFLAGS = -fPIC -fno-shared-data +-SHARED_LINKFLAGS = -fno-shared-data ++SHARED_CCFLAGS = -fPIC ++SHARED_CXXFLAGS = -fPIC ++SHARED_LINKFLAGS = + + ifndef GCC_MAKE_SHARED_LIB +- MAKE_SHARED_LIB = $(CXX) -shared -fno-shared-data -o XXX ++ MAKE_SHARED_LIB = $(CXX) -shared -o XXX + else + MAKE_SHARED_LIB = $(GCC_MAKE_SHARED_LIB) + endif +--- speech_tools/doc/estjavaapp.sgml 2001-04-04 13:55:32.000000000 +0200 ++++ speech_tools/doc/estjavaapp.sgml 2007-08-28 23:08:43.000000000 +0200 +@@ -105,7 +105,7 @@ + &shellprompt; <userinput>cd tmpdir</userinput> + &shellprompt; <userinput>ar x ../libgcc.a</userinput> + &shellprompt; <userinput>cd ..</userinput> +- &shellprompt; <userinput>gcc -shared -fno-shared-data -o libgcc.so.2.7.2 tmpdir/*.o</userinput> ++ &shellprompt; <userinput>gcc -shared -o libgcc.so.2.7.2 tmpdir/*.o</userinput> + </screen> + </para> + </sect1> +--- speech_tools/stats/EST_DProbDist.cc 2004-09-30 14:53:36.000000000 +0200 ++++ speech_tools/stats/EST_DProbDist.cc 2007-08-28 23:21:17.000000000 +0200 +@@ -310,7 +310,7 @@ + if (type == tprob_discrete) + return 0; + else +- return (int)scounts.list.head(); ++ return (long)scounts.list.head(); + } + + int EST_DiscreteProbDistribution::item_end(int idx) const +@@ -326,7 +326,7 @@ + if (type == tprob_discrete) + return ++idx; + else +- return (int)next((EST_Litem *)idx); ++ return (long)next((EST_Litem *)idx); + } + + const EST_String &EST_DiscreteProbDistribution::item_name(int idx) const 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 8e71c71f9c8c..ddca67c64f0e 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-2007 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.3 2007/08/29 07:11:03 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-1.2.96_beta.ebuild,v 1.4 2007/08/31 04:12:37 williamh Exp $ inherit eutils toolchain-funcs @@ -28,6 +28,9 @@ src_unpack() { unpack ${A} + # apply a patch for gcc 4.2 + epatch ${FILESDIR}/${P}-gcc42.patch + # set compiler flags for base_class sed -i -e "s:-O3:\$(OPTIMISE_CXXFLAGS):" ${S}/base_class/Makefile |