[gentoo-commits] gentoo-x86 commit in app-accessibility/speech-dispatcher/files: speech-dispatcher-0.6.7-getline.patch speech-dispatcher-0.6.7-gnu-src-modules.patch

[gentoo-commits] gentoo-x86 commit in app-accessibility/speech-dispatcher/files: speech-dispatcher-0.6.7-getline.patch speech-dispatcher-0.6.7-gnu-src-modules.patch

[William Hubbs (williamh)]

williamh    09/09/07 19:34:48

  Added:                speech-dispatcher-0.6.7-getline.patch
                        speech-dispatcher-0.6.7-gnu-src-modules.patch
  Log:
  another fix for 281130.
  (Portage version: 2.2_rc40/cvs/Linux i686)

Revision  Changes    Path
1.1                  app-accessibility/speech-dispatcher/files/speech-dispatcher-0.6.7-getline.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.6.7-getline.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.6.7-getline.patch?rev=1.1&content-type=text/plain

Index: speech-dispatcher-0.6.7-getline.patch
===================================================================
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




1.1                  app-accessibility/speech-dispatcher/files/speech-dispatcher-0.6.7-gnu-src-modules.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.6.7-gnu-src-modules.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.6.7-gnu-src-modules.patch?rev=1.1&content-type=text/plain

Index: speech-dispatcher-0.6.7-gnu-src-modules.patch
===================================================================
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