summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <williamh@gentoo.org>2008-05-30 04:48:36 +0000
committerWilliam Hubbs <williamh@gentoo.org>2008-05-30 04:48:36 +0000
commitcfde0a47152bf5d32106aef1446ed4a127f79d47 (patch)
tree16e642a6518beb78111f3c73637f22d65064c929 /app-accessibility/emacspeak/files
parentMarked ~hppa (bug #223557). (diff)
downloadhistorical-cfde0a47152bf5d32106aef1446ed4a127f79d47.tar.gz
historical-cfde0a47152bf5d32106aef1446ed4a127f79d47.tar.bz2
historical-cfde0a47152bf5d32106aef1446ed4a127f79d47.zip
Fixed the patches for 28.0 so they work correctly.
Thanks to Alastair Irving for pointing this out. Package-Manager: portage-2.1.5.2
Diffstat (limited to 'app-accessibility/emacspeak/files')
-rw-r--r--app-accessibility/emacspeak/files/emacspeak-28.0-espeak.patch4
-rw-r--r--app-accessibility/emacspeak/files/emacspeak-28.0-makefile.patch4
-rw-r--r--app-accessibility/emacspeak/files/emacspeak-28.0-tcl84.patch52
3 files changed, 24 insertions, 36 deletions
diff --git a/app-accessibility/emacspeak/files/emacspeak-28.0-espeak.patch b/app-accessibility/emacspeak/files/emacspeak-28.0-espeak.patch
index 428ad437bae3..2a4477bd986e 100644
--- a/app-accessibility/emacspeak/files/emacspeak-28.0-espeak.patch
+++ b/app-accessibility/emacspeak/files/emacspeak-28.0-espeak.patch
@@ -1,5 +1,5 @@
---- emacspeak-28.0/servers/linux-espeak/tclespeak.cpp.orig 2008-05-17 12:34:21.000000000 -0500
-+++ emacspeak-28.0/servers/linux-espeak/tclespeak.cpp 2008-05-17 12:38:41.000000000 -0500
+--- ./emacspeak-28.0/servers/linux-espeak/tclespeak.cpp 2008-05-17 12:34:21.000000000 -0500
++++ ./emacspeak-28.0/servers/linux-espeak/tclespeak.cpp 2008-05-17 12:38:41.000000000 -0500
@@ -593,20 +593,18 @@
continue;
}
diff --git a/app-accessibility/emacspeak/files/emacspeak-28.0-makefile.patch b/app-accessibility/emacspeak/files/emacspeak-28.0-makefile.patch
index 349b85cefda1..ce977517a76d 100644
--- a/app-accessibility/emacspeak/files/emacspeak-28.0-makefile.patch
+++ b/app-accessibility/emacspeak/files/emacspeak-28.0-makefile.patch
@@ -1,5 +1,5 @@
---- emacspeak-28.0/Makefile.orig 2008-05-16 08:49:54.000000000 -0500
-+++ emacspeak-28.0/Makefile 2008-05-16 08:52:53.000000000 -0500
+--- ./emacspeak-28.0/Makefile 2008-05-16 08:49:54.000000000 -0500
++++ ./emacspeak-28.0/Makefile 2008-05-16 08:52:53.000000000 -0500
@@ -149,7 +149,6 @@
FORMS =etc/forms/*.el
REALAUDIO=realaudio
diff --git a/app-accessibility/emacspeak/files/emacspeak-28.0-tcl84.patch b/app-accessibility/emacspeak/files/emacspeak-28.0-tcl84.patch
index 28dd61f92bc5..2796aa455000 100644
--- a/app-accessibility/emacspeak/files/emacspeak-28.0-tcl84.patch
+++ b/app-accessibility/emacspeak/files/emacspeak-28.0-tcl84.patch
@@ -1,11 +1,8 @@
---- emacspeak-28.0.orig/servers/dtk-exp 2008-03-14 21:06:51.000000000 -0500
-+++ emacspeak-28.0/servers/dtk-exp 2008-05-15 22:05:50.000000000 -0500
-@@ -1,4 +1,4 @@
+--- ./emacspeak-28.0/servers/dtk-exp 2008-03-14 21:06:51.000000000 -0500
++++ ./emacspeak-28.0/servers/dtk-exp 2008-05-15 22:05:50.000000000 -0500
+@@ -1,1 +1,1 @@
-#!/usr/bin/tcl
+#!/usr/bin/tclsh
- # $Id: emacspeak-28.0-tcl84.patch,v 1.1 2008/05/17 19:52:26 williamh Exp $
- # Description: Interfacing to a Dectalk via TCL.
- # Keywords: Emacspeak, Dectalk, TCL
@@ -364,13 +364,13 @@
fconfigure $tts(write) -encoding ascii
@@ -22,16 +19,16 @@
if {[info exists server_p]} {
set tts(input) sock0
}
---- emacspeak-28.0.orig/servers/dtk-soft 2007-06-23 23:12:04.000000000 -0500
-+++ emacspeak-28.0/servers/dtk-soft 2008-05-15 21:51:09.000000000 -0500
+--- ./emacspeak-28.0/servers/dtk-soft 2007-06-23 23:12:04.000000000 -0500
++++ ./emacspeak-28.0/servers/dtk-soft 2008-05-15 21:51:09.000000000 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/tcl
+#!/usr/bin/tclsh
# Keywords: Emacspeak, Software Dectalk , TCL
# {{{ LCD Entry:
---- emacspeak-28.0.orig/servers/espeak 2008-03-14 21:04:31.000000000 -0500
-+++ emacspeak-28.0/servers/espeak 2008-05-15 22:06:14.000000000 -0500
+--- ./emacspeak-28.0/servers/espeak 2008-03-14 21:04:31.000000000 -0500
++++ ./emacspeak-28.0/servers/espeak 2008-05-15 22:06:14.000000000 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/tcl
+#!/usr/bin/tclsh
@@ -47,8 +44,8 @@
#initialize eSpeak
tts_initialize
---- emacspeak-28.0.orig/servers/outloud 2008-04-08 22:31:52.000000000 -0500
-+++ emacspeak-28.0/servers/outloud 2008-05-15 22:06:39.000000000 -0500
+--- ./emacspeak-28.0/servers/outloud 2008-04-08 22:31:52.000000000 -0500
++++ ./emacspeak-28.0/servers/outloud 2008-05-15 22:06:39.000000000 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/tcl
+#!/usr/bin/tclsh
@@ -71,22 +68,16 @@
if {[info exists server_p]} {
set tts(input) sock0
}
---- emacspeak-28.0.orig/servers/speech-server 2007-07-01 21:12:27.000000000 -0500
-+++ emacspeak-28.0/servers/speech-server 2008-05-15 22:08:03.000000000 -0500
-@@ -1,4 +1,4 @@
+--- ./emacspeak-28.0/servers/speech-server 2007-07-01 21:12:27.000000000 -0500
++++ ./emacspeak-28.0/servers/speech-server 2008-05-15 22:08:03.000000000 -0500
+@@ -1,1 +1,1 @@
-#!/usr/bin/tcl
+#!/usr/bin/tclsh
- # $Id: emacspeak-28.0-tcl84.patch,v 1.1 2008/05/17 19:52:26 williamh Exp $
- # Description: Speech server
- #Usage: tcl speech-server port device-specific-script
---- emacspeak-28.0.orig/servers/ssh-dtk-exp 2008-01-05 14:24:47.000000000 -0600
-+++ emacspeak-28.0/servers/ssh-dtk-exp 2008-05-15 22:11:31.000000000 -0500
-@@ -1,4 +1,4 @@
+--- ./emacspeak-28.0/servers/ssh-dtk-exp 2008-01-05 14:24:47.000000000 -0600
++++ ./emacspeak-28.0/servers/ssh-dtk-exp 2008-05-15 22:11:31.000000000 -0500
+@@ -1,1 +1,1 @@
-#!/usr/bin/tcl
+#!/usr/bin/tclsh
- #$Id: emacspeak-28.0-tcl84.patch,v 1.1 2008/05/17 19:52:26 williamh Exp $
- #Description: Launch a TTS server on a remote host.
- #Copyright (C) 1995 -- 2007, T. V. Raman
@@ -37,7 +37,7 @@
set user [lindex $user_host 0]
set host [lindex $user_host 1]
@@ -96,14 +87,11 @@
regsub {/ssh-} $argv0 {/} tts
puts stderr "Running <ssh $host -l $user -p $port $tcl $tts>"
exec ssh -o StrictHostKeyChecking=no $host \
---- emacspeak-28.0.orig/servers/ssh-outloud 2007-06-23 22:00:42.000000000 -0500
-+++ emacspeak-28.0/servers/ssh-outloud 2008-05-15 22:11:52.000000000 -0500
-@@ -1,4 +1,4 @@
+--- ./emacspeak-28.0/servers/ssh-outloud 2007-06-23 22:00:42.000000000 -0500
++++ ./emacspeak-28.0/servers/ssh-outloud 2008-05-15 22:11:52.000000000 -0500
+@@ -1,1 +1,1 @@
-#!/usr/bin/tcl
+#!/usr/bin/tclsh
- #$Id: emacspeak-28.0-tcl84.patch,v 1.1 2008/05/17 19:52:26 williamh Exp $
- #Description: Launch a TTS server on a remote host.
- #Copyright (C) 1995 -- 2007, T. V. Raman
@@ -35,7 +35,7 @@
set user [lindex $user_host 0]
set host [lindex $user_host 1]
@@ -113,8 +101,8 @@
regsub {/ssh-} $argv0 {/} tts
puts stderr "Running <ssh $host -l $user -p $port $tcl $tts>"
exec ssh -o StrictHostKeyChecking=no $host \
---- emacspeak-28.0.orig/servers/tts-lib.tcl 2007-06-23 23:12:04.000000000 -0500
-+++ emacspeak-28.0/servers/tts-lib.tcl 2008-05-15 22:57:16.000000000 -0500
+--- ./emacspeak-28.0/servers/tts-lib.tcl 2007-06-23 23:12:04.000000000 -0500
++++ ./emacspeak-28.0/servers/tts-lib.tcl 2008-05-15 22:57:16.000000000 -0500
@@ -35,6 +35,8 @@
# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
#