Fixing compile failure, fixes #307341. Thanks to Renato Gallo.

Package-Manager: portage-2.2_rc63/cvs/Linux x86_64

4 files changed, 39 insertions, 15 deletions

diff --git a/app-accessibility/speech-dispatcher/ChangeLog b/app-accessibility/speech-dispatcher/ChangeLog
index 6f0ca557c735..2bc0cc407ec9 100644
--- a/app-accessibility/speech-dispatcher/ChangeLog
+++ b/app-accessibility/speech-dispatcher/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-accessibility/speech-dispatcher
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-dispatcher/ChangeLog,v 1.60 2010/03/01 00:46:14 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-dispatcher/ChangeLog,v 1.61 2010/03/01 21:05:51 patrick Exp $
+
+  01 Mar 2010; Patrick Lauer <patrick@gentoo.org>
+  speech-dispatcher-0.6.7-r1.ebuild, +files/speech-dispatcher-mutils.patch:
+  Fixing compile failure, fixes #307341. Thanks to Renato Gallo.
 
   01 Mar 2010; Jonathan Callen <abcd@gentoo.org>
   +speech-dispatcher-0.6.7-r1.ebuild:
diff --git a/app-accessibility/speech-dispatcher/Manifest b/app-accessibility/speech-dispatcher/Manifest
index b325f3057908..3e98d74f4b11 100644
--- a/app-accessibility/speech-dispatcher/Manifest
+++ b/app-accessibility/speech-dispatcher/Manifest
@@ -1,8 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX speech-dispatcher 670 RMD160 ed69fcbfad2cd63dd41b6ef6077eea6aede14483 SHA1 029059d50e6b0b55120d1bb393abec33fca181c4 SHA256 754aa3810c448804b1693036a46c31375165d7d37abd654a23b85c18c9d78adb
 AUX speech-dispatcher-0.6.6-festival-fix-formats.patch 649 RMD160 b0a6b499fcff625076b6a487ce140cc93f85ce8b SHA1 543edd3935539be4e3434015e42ac0a6d7ccb500 SHA256 b4c6e0a8af70001e234086d9494a32a3d76f53f642cf163f722454cf5ae2a575
+AUX speech-dispatcher-mutils.patch 788 RMD160 1da253a01055f61c386b7a4635bb352a70a3876b SHA1 f13ec5fe921b97e8251d0afc24ef4fb2bbf39d74 SHA256 966430a7ac84272f2b96aab816f8e338feebcdc617c96b54d2ddc5f20fe9ca78
 DIST speech-dispatcher-0.6.5.tar.gz 1025229 RMD160 0f7cfd00c24e01b83ae6d51594bca965a7aaca62 SHA1 5f2cd4964bf96e49e41bc6fe908f8f482f9ea0e7 SHA256 e57a42094002c39a733b66198d4fcb869845614842f02275c2984e29c4d9654d
 DIST speech-dispatcher-0.6.6.tar.gz 1038719 RMD160 2925de539cfb59f9eaa0095188166623bc65e15c SHA1 e78bbe8f70ffe95dbe75f99b96c8a47a563d879a SHA256 c664ee801d1bc0500ae75739fa98bcc8ad410474c98a6757d3d1ee24a8241462
 DIST speech-dispatcher-0.6.7-patches-1.tar.gz 1785 RMD160 d71fc375249b74dd10a45775a0426640727db97c SHA1 c34eca01fd5c0495051dc4f183338ddd049a665c SHA256 4c914c348cd46bc64f21d5b310c1873c4af7a0e633a96c35e4276cc921c9d3ae
@@ -10,14 +8,7 @@ DIST speech-dispatcher-0.6.7.tar.gz 1186677 RMD160 8527d83927c7827e67c91938a28a1
 EBUILD speech-dispatcher-0.6.5.ebuild 1527 RMD160 48d556189049167d5371ad629860b6fb9a0aa10a SHA1 030ffcd7558552f04c03f566b3db0ea2e8a9c567 SHA256 e91c3ca2ce625257b6c27001ccc3de4e5a3bfe4071c5be128cea5f3dcff41e06
 EBUILD speech-dispatcher-0.6.6-r1.ebuild 1585 RMD160 1c1f331ffc8a3b864b90ef793f7f0d4bb40d80e4 SHA1 a102bfbfc6f4760bb7ab4044d5586ec74f98abfc SHA256 bac2b8ecf7e79831cb1b4a427af580b40b0aa8b483c8c5bf97fe8912af86918a
 EBUILD speech-dispatcher-0.6.6.ebuild 1522 RMD160 18db70181df317fecb75aaa3421aa81afc5b1a86 SHA1 81ccf637a6a7ad488420b20e8fdf5a6892044685 SHA256 bf426e7e1f0f2a5a0b4ace32b276faa87d8a2b74e0ac98ce5e9b471b2e60f7c7
-EBUILD speech-dispatcher-0.6.7-r1.ebuild 1927 RMD160 524bd86f31abc67fed282ac23f6d3271da097de4 SHA1 c1d5d100dea5efb0c40d4a5549458939fd7fd6fd SHA256 9ad8b5d36df600616fcd4da5f664bb8f02a216f10d713169eeec1747c66148f2
+EBUILD speech-dispatcher-0.6.7-r1.ebuild 2018 RMD160 fc3e9fe5ed47c4d51f30fa227dcab47912823ee7 SHA1 d93379a1154bb3cd614d685eb45d625b4c258c7d SHA256 4fa2630062f93576216d5df3994d9376f6bfaabeffa81010949b7ebf9e8b9538
 EBUILD speech-dispatcher-0.6.7.ebuild 1900 RMD160 2283c1c579204cbaf0597a8795122cbf9d5eebd6 SHA1 a438d7b53090389a0da02b5b0450ed7158e0f90f SHA256 0e4ef8f2cbec8918aa5f2e000f8d2b327fc73323f27c84b6425775bca5b469d9
-MISC ChangeLog 10269 RMD160 f49ba8a20be5f6552aa6fecaba3bf56716c1df6a SHA1 f33e986fdd8aab44d030e6cd91283b0df71ba71f SHA256 47c27854626915daa6665a3617d0539a850be92f975b572ae41a1fecdb077722
+MISC ChangeLog 10464 RMD160 43da160a54e246fe82b73ec3f68e2689d76463ea SHA1 3ae7d320bce485b9665962e2b74afb6250cfa83a SHA256 b15eb7361b440276890b999f6c5450c27c44228a80168c89adb46b48e631cbf3
 MISC metadata.xml 391 RMD160 470dc37d4b091c32417820c9e60dd4a8646423c2 SHA1 b7f5b0ecdd4f5f6799676d34a56703bf924cf1a2 SHA256 189a78287c14ae09d0badf2a576e0d4830d0d55c1b6d343b378cf2f77d7f73f7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkuLDmEACgkQOypDUo0oQOoxvgCcDF9YkepdtZGgeJWz9KD4JjBF
-0OEAmQHvqNHD8Nc7pMxL7eSnnvX1/JYZ
-=9hW4
------END PGP SIGNATURE-----
diff --git a/app-accessibility/speech-dispatcher/files/speech-dispatcher-mutils.patch b/app-accessibility/speech-dispatcher/files/speech-dispatcher-mutils.patch
new file mode 100644
index 000000000000..517c1b753fc6
--- /dev/null
+++ b/app-accessibility/speech-dispatcher/files/speech-dispatcher-mutils.patch
@@ -0,0 +1,28 @@
+--- src/modules/module_utils.h  2008-07-30 10:53:07.000000000 +0200
++++ src/modules/module_utils.h.new      2010-03-01 18:28:08.000000000 +0100
+@@ -420,9 +420,9 @@
+
+
+
+-/* So that gcc doesn't complain */
++/* So that gcc doesn't complain
+ int getline(char**, size_t*, FILE*);
+-
++*/
+ pthread_mutex_t module_stdout_mutex;
+
+ int module_utils_init(void);
+
+--- src/modules/module_main.c   2008-06-27 14:29:26.000000000 +0200
++++ src/modules/module_main.c.new       2010-03-01 18:32:16.000000000 +0100
+@@ -21,8 +21,9 @@
+  * $Id: speech-dispatcher-mutils.patch,v 1.1 2010/03/01 21:05:52 patrick Exp $
+  */
+
+-/* So that gcc doesn't comply */
++/* So that gcc doesn't comply
+ int getline(char**, size_t*, FILE*);
++*/
+
+ #define PROCESS_CMD(command, function) \
+ if (!strcmp(cmd_buf, #command"\n")){ \
diff --git a/app-accessibility/speech-dispatcher/speech-dispatcher-0.6.7-r1.ebuild b/app-accessibility/speech-dispatcher/speech-dispatcher-0.6.7-r1.ebuild
index 5e8587e88500..4e7eea8cf758 100644
--- a/app-accessibility/speech-dispatcher/speech-dispatcher-0.6.7-r1.ebuild
+++ b/app-accessibility/speech-dispatcher/speech-dispatcher-0.6.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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-r1.ebuild,v 1.3 2010/03/01 00:46:14 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-dispatcher/speech-dispatcher-0.6.7-r1.ebuild,v 1.4 2010/03/01 21:05:51 patrick Exp $
 
 EAPI="3"
 PATCHVER=1
@@ -30,7 +30,8 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_prepare() {
-	EPATCH_SUFFIX="patch" epatch
+	epatch ${FILESDIR}/speech-dispatcher-mutils.patch \
+		${FILESDIR}/speech-dispatcher-0.6.6-festival-fix-formats.patch
 	eautoreconf
 	sed -i -e 's/\(SUBDIRS.*\)python/\1/' src/Makefile.in
 }