| 1 |
williamh 09/09/07 19:34:48 |
| 2 |
|
| 3 |
Added: speech-dispatcher-0.6.7-getline.patch |
| 4 |
speech-dispatcher-0.6.7-gnu-src-modules.patch |
| 5 |
Log: |
| 6 |
another fix for 281130. |
| 7 |
(Portage version: 2.2_rc40/cvs/Linux i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 app-accessibility/speech-dispatcher/files/speech-dispatcher-0.6.7-getline.patch |
| 11 |
|
| 12 |
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 |
| 13 |
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 |
| 14 |
|
| 15 |
Index: speech-dispatcher-0.6.7-getline.patch |
| 16 |
=================================================================== |
| 17 |
From f0c490dc160f04cb9f258e0639944cffc1df9a40 Mon Sep 17 00:00:00 2001 |
| 18 |
From: root <root@christoph.(none)> |
| 19 |
Date: Tue, 11 Aug 2009 20:39:24 +0200 |
| 20 |
Subject: [PATCH] Fix build with recent gcc |
| 21 |
|
| 22 |
--- |
| 23 |
src/modules/module_main.c | 3 --- |
| 24 |
src/modules/module_utils.h | 3 --- |
| 25 |
2 files changed, 0 insertions(+), 6 deletions(-) |
| 26 |
|
| 27 |
diff --git a/src/modules/module_main.c b/src/modules/module_main.c |
| 28 |
index 2732cff..5bb5769 100644 |
| 29 |
--- a/src/modules/module_main.c |
| 30 |
+++ b/src/modules/module_main.c |
| 31 |
@@ -21,9 +21,6 @@ |
| 32 |
* $Id: speech-dispatcher-0.6.7-getline.patch,v 1.1 2009/09/07 19:34:47 williamh Exp $ |
| 33 |
*/ |
| 34 |
|
| 35 |
-/* So that gcc doesn't comply */ |
| 36 |
-int getline(char**, size_t*, FILE*); |
| 37 |
- |
| 38 |
#define PROCESS_CMD(command, function) \ |
| 39 |
if (!strcmp(cmd_buf, #command"\n")){ \ |
| 40 |
char *msg; \ |
| 41 |
diff --git a/src/modules/module_utils.h b/src/modules/module_utils.h |
| 42 |
index e33865a..70e6241 100644 |
| 43 |
--- a/src/modules/module_utils.h |
| 44 |
+++ b/src/modules/module_utils.h |
| 45 |
@@ -420,9 +420,6 @@ void module_report_event_pause(void); |
| 46 |
|
| 47 |
|
| 48 |
|
| 49 |
-/* So that gcc doesn't complain */ |
| 50 |
-int getline(char**, size_t*, FILE*); |
| 51 |
- |
| 52 |
pthread_mutex_t module_stdout_mutex; |
| 53 |
|
| 54 |
int module_utils_init(void); |
| 55 |
-- |
| 56 |
1.6.4 |
| 57 |
|
| 58 |
|
| 59 |
|
| 60 |
|
| 61 |
1.1 app-accessibility/speech-dispatcher/files/speech-dispatcher-0.6.7-gnu-src-modules.patch |
| 62 |
|
| 63 |
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 |
| 64 |
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 |
| 65 |
|
| 66 |
Index: speech-dispatcher-0.6.7-gnu-src-modules.patch |
| 67 |
=================================================================== |
| 68 |
diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am |
| 69 |
index 579dbb8..06e3e16 100644 |
| 70 |
--- a/src/modules/Makefile.am |
| 71 |
+++ b/src/modules/Makefile.am |
| 72 |
@@ -7,7 +7,7 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ |
| 73 |
|
| 74 |
EXTRA_DIST = module_main.c module_utils_addvoice.c festival_client.c festival_client.h ivona_client.c dummy.c dummy-message.wav |
| 75 |
|
| 76 |
-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) |
| 77 |
+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 |
| 78 |
|
| 79 |
modulebin_PROGRAMS = sd_dummy sd_generic sd_festival sd_cicero |
Archives