patches for emacspeak on gentoo

[William Hubbs <williamh@xxxxxxxxxxx>]

Hi all,

I just recently wrote the ebuild for gentoo linux's emacspeak 27.0
package, and I wanted to share some patches with the list that I found I
needed to get emacspeak onto gentoo.

These were rewritten so they can be applied to current svn.  The first
patch removes a reference to a shared object from the distribution since
the object doesn't actually exist when you run make install.  The second
fixes a compilation error for the tclespeak.cpp file.

The third is an update to the patch for converting to tcl/tclx 8.4.  I
don't know if this can be used upstream or not since there was an issue
on ubuntu before, so please let me know.

Thanks much.


-- 
William Hubbs
gentoo accessibility team lead
williamh@xxxxxxxxxxx

Index: Makefile
===================================================================
--- Makefile	(revision 5447)
+++ Makefile	(working copy)
@@ -165,7 +165,6 @@
 OUTLOUD=${ECI}/eci.ini \
 ${ECI}/*.h \
 ${ECI}/*.cpp \
-${ECI}/*.so \
 ${ECI}/VIAVOICE ${ECI}/ALSA ${ECI}/asoundrc \
 ${ECI}/Makefile ${ECI}/makefile.tcl83
 

Index: servers/linux-espeak/tclespeak.cpp
===================================================================
--- servers/linux-espeak/tclespeak.cpp	(revision 5447)
+++ servers/linux-espeak/tclespeak.cpp	(working copy)
@@ -593,7 +593,7 @@
 	  continue;
 	}
 
-      char* aLangCode = 1 + voices[i]->languages;
+      const char* aLangCode = 1 + voices[i]->languages;
 
       snprintf(buffer_i, 3, "%d", aLang); 
       snprintf(buffer_j, 3, "%d", j++); 

Index: servers/httpd/tts.tcl
===================================================================
--- servers/httpd/tts.tcl	(revision 5447)
+++ servers/httpd/tts.tcl	(working copy)
@@ -1,4 +1,4 @@
-#!/usr/bin/tcl
+#!/usr/bin/tclsh
 # $Id: speech-server 4725 2007-07-02 02:12:26Z tv.raman.tv $
 # Description:  Speech server
 #Usage: tcl <tbd>
@@ -40,6 +40,9 @@
 # {{{Introduction 
 
 # }}}
+
+package require Tclx
+
 # {{{HTTP Binding 
 
 namespace eval ::tts {}
Index: servers/ssh-outloud
===================================================================
--- servers/ssh-outloud	(revision 5447)
+++ servers/ssh-outloud	(working copy)
@@ -1,4 +1,4 @@
-#!/usr/bin/tcl
+#!/usr/bin/tclsh
 #$Id$
 #Description: Launch a TTS server on a remote host.
 #Copyright (C) 1995 -- 2007, T. V. Raman 
@@ -18,6 +18,7 @@
 #"do you want to continue connecting" question.
 
 # }}}
+package require Tclx
 set localhost [exec hostname]
 puts stderr "running on host <$localhost>"
 if [expr $argc == 0] {
@@ -35,7 +36,7 @@
 set user [lindex $user_host 0]
 set host [lindex $user_host 1]
 if {$user == ""} {set  user env($USER)}
-set tcl /usr/bin/tcl 
+set tcl /usr/bin/tclsh 
 regsub {/ssh-}  $argv0 {/} tts
 puts stderr "Running <ssh $host -l $user -p $port   $tcl $tts>"
 exec     ssh -o StrictHostKeyChecking=no $host \
Index: servers/dtk-soft
===================================================================
--- servers/dtk-soft	(revision 5447)
+++ servers/dtk-soft	(working copy)
@@ -1,4 +1,4 @@
-#!/usr/bin/tcl
+#!/usr/bin/tclsh
 # Keywords: Emacspeak, Software Dectalk , TCL
 # {{{ LCD Entry: 
 
Index: servers/outloud
===================================================================
--- servers/outloud	(revision 5447)
+++ servers/outloud	(working copy)
@@ -1,4 +1,4 @@
-#!/usr/bin/tcl
+#!/usr/bin/tclsh
 # Keywords: Emacspeak, ViaVoice Outloud , TCL
 # {{{ LCD Entry: 
 
@@ -474,7 +474,7 @@
 tts_initialize
 set tts(speech_rate)  75
 beep_initialize
-set tts(input) file0
+set tts(input) stdin
 if {[info exists server_p]} {
     set tts(input) sock0
 }
Index: servers/tts-lib.tcl
===================================================================
--- servers/tts-lib.tcl	(revision 5447)
+++ servers/tts-lib.tcl	(working copy)
@@ -36,6 +36,9 @@
 #
 
 # }}}
+
+package require Tclx
+
 # {{{ sync state 
 proc tts_sync_state {punct capitalize allcaps splitcaps rate} {
     tts_set_punctuations  $punct
Index: servers/ssh-espeak
===================================================================
--- servers/ssh-espeak	(revision 5447)
+++ servers/ssh-espeak	(working copy)
@@ -1,4 +1,4 @@
-#!/usr/bin/tcl
+#!/usr/bin/tclsh
 #$Id: ssh-espeak 4532 2007-05-04 01:13:44Z tv.raman.tv $
 #Description: Launch a TTS server on a remote host.
 #Copyright (C) 1995 -- 2007, T. V. Raman 
@@ -15,6 +15,7 @@
 #"do you want to continue connecting" question.
 
 # }}}
+package require Tclx
 set localhost [exec hostname]
 puts stderr "running on host <$localhost>"
 if [expr $argc == 0] {
@@ -32,7 +33,7 @@
 set user [lindex $user_host 0]
 set host [lindex $user_host 1]
 if {$user == ""} {set  user env($USER)}
-set tcl /usr/bin/tcl 
+set tcl /usr/bin/tclsh 
 regsub {/ssh-}  $argv0 {/} tts
 puts stderr "Running <ssh $host -l $user -p $port   $tcl $tts>"
 exec     ssh -o StrictHostKeyChecking=no $host \
Index: servers/ssh-dtk-exp
===================================================================
--- servers/ssh-dtk-exp	(revision 5447)
+++ servers/ssh-dtk-exp	(working copy)
@@ -1,4 +1,4 @@
-#!/usr/bin/tcl
+#!/usr/bin/tclsh
 #$Id$
 #Description: Launch a TTS server on a remote host.
 #Copyright (C) 1995 -- 2007, T. V. Raman 
@@ -18,6 +18,7 @@
 #"do you want to continue connecting" question.
 
 # }}}
+package require Tclx
 set localhost [exec hostname]
 puts stderr "running on host <$localhost>"
 if [expr $argc == 0] {
@@ -37,7 +38,7 @@
 set user [lindex $user_host 0]
 set host [lindex $user_host 1]
 if {$user == ""} {set  user env($USER)}
-set tcl /usr/bin/tcl 
+set tcl /usr/bin/tclsh 
 regsub {/ssh-}  $argv0 {/} tts
 puts stderr "Running <ssh $host -l $user -p $port   $tcl $tts>"
 exec     ssh -o StrictHostKeyChecking=no $host \
Index: servers/espeak
===================================================================
--- servers/espeak	(revision 5447)
+++ servers/espeak	(working copy)
@@ -1,4 +1,4 @@
-#!/usr/bin/tcl
+#!/usr/bin/tclsh
 # Keywords: Emacspeak, eSpeak , TCL
 # {{{ LCD Entry: 
 
Index: servers/speech-server
===================================================================
--- servers/speech-server	(revision 5447)
+++ servers/speech-server	(working copy)
@@ -1,4 +1,4 @@
-#!/usr/bin/tcl
+#!/usr/bin/tclsh
 # $Id$
 # Description:  Speech server
 #Usage: tcl speech-server port device-specific-script
@@ -39,6 +39,7 @@
 # }}}
 # {{{Initialize and get ready
 
+package require Tclx
 set port [lindex $argv 0]
 #start up the server
 set server [server_create -myport  $port -reuseaddr]
Index: servers/dtk-exp
===================================================================
--- servers/dtk-exp	(revision 5447)
+++ servers/dtk-exp	(working copy)
@@ -1,4 +1,4 @@
-#!/usr/bin/tcl
+#!/usr/bin/tclsh
 # $Id$
 # Description:  Interfacing to a Dectalk via TCL.
 # Keywords: Emacspeak, Dectalk, TCL
@@ -364,7 +364,7 @@
 set tts(speech_rate)  225
 set tts(say_rate) [round \
                        [expr $tts(speech_rate) * $tts(char_factor)]]
-set tts(input) file0
+set tts(input) stdin
 if {[info exists server_p]} {
     set tts(input) sock0
 }

Attachment: pgpvxJDO4bhZ8.pgp
Description: PGP signature