[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#228353: software-dtk source changes



Package: emacspeak
Version: 17.0-1
Severity: wishlist
Tags: patch

Kenny Hitt <kenny@hittsjunk.net> writes:

> BTW, what changes did you need to make before you could compile the
> source for the emacspeak DEQTalk server.

In the C source file, you need to change "#include <tcl.h>" to
"#include <tcl8.3/tcl.h>"
and in the Makefile, you need to change "-ltcl" to "-ltcl8.3".

Besides that, newer GCCs do not like multiline strings.

The sources shipped with the Debian emacspeak package should be modified
to avoid users having to make these changes manually.

--- servers/software-dtk/Makefile.orig	2002-11-23 02:29:10.000000000 +0100
+++ servers/software-dtk/Makefile	2004-01-18 14:11:25.000000000 +0100
@@ -2,7 +2,7 @@
 #
 CFLAGS=-g -fpic
 CC=gcc
-LIBS=-ltts -ltts_us -ltcl
+LIBS=-ltts -ltts_us -ltcl8.3
 
 tcldtk.so: tcldtk.o
 	$(CC) $< $(LIBS)  -shared -o $@
--- servers/software-dtk/tcldtk.c.orig	2002-11-23 02:29:10.000000000 +0100
+++ servers/software-dtk/tcldtk.c	2004-01-18 14:20:56.000000000 +0100
@@ -23,7 +23,7 @@
 /* > */
 /* <headers*/
 
-#include <tcl.h>
+#include <tcl8.3/tcl.h>
 #include <dtk/ttsapi.h>
 #define PACKAGENAME "tts"
 #define PACKAGEVERSION "1.0"
@@ -68,26 +68,22 @@
   fprintf(stderr, "tts startup returned %d\n", status);
   switch (status) {
   case MMSYSERR_NODRIVER:
-    Tcl_AppendResult(interp, "TTS: Could not find any
- wave devices\n", NULL);
+    Tcl_AppendResult(interp, "TTS: Could not find any wave devices\n", NULL);
     return TCL_ERROR;
     break;
   case MMSYSERR_NOTENABLED:
-    Tcl_AppendResult(interp,"TTS: DECtalk license not
- found.\n", NULL);
+    Tcl_AppendResult(interp,"TTS: DECtalk license not found.\n", NULL);
     return TCL_ERROR;
     break;
   case MMSYSERR_ALLOCATED:
-    Tcl_AppendResult(interp,"TTS: DECtalk has exceeded
- license quota.\n", NULL);
+    Tcl_AppendResult(interp,"TTS: DECtalk has exceeded license quota.\n", NULL);
     return TCL_ERROR;
     break;
   case MMSYSERR_NOERROR:
     break;
 
   default:
-    Tcl_AppendResult(interp,"\n%s: TextToSpeechStartup
- failed, \n", NULL);
+    Tcl_AppendResult(interp,"\n%s: TextToSpeechStartup failed, \n", NULL);
     return TCL_ERROR;
   }
   if (dtkHandle == NULL) { 

-- 
CYa,
  Mario | Debian Developer <URL:http://debian.org/>
        | Get my public key via finger mlang@db.debian.org
        | 1024D/7FC1A0854909BCCDBE6C102DDFFC022A6B113E44



Reply to: