SOURCES: speak-sys_includes.patch, speak-ac_am.patch - splitting b...

[twittner]

Author: twittner                     Date: Sat Sep 23 20:26:30 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- splitting between patches and -version-info corrected

---- Files affected:
SOURCES:
   speak-sys_includes.patch (1.1 -> 1.2) , speak-ac_am.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/speak-sys_includes.patch
diff -u SOURCES/speak-sys_includes.patch:1.1 SOURCES/speak-sys_includes.patch:1.2
--- SOURCES/speak-sys_includes.patch:1.1	Sat Sep 23 21:44:17 2006
+++ SOURCES/speak-sys_includes.patch	Sat Sep 23 22:26:25 2006
@@ -35,20 +35,6 @@
  #ifndef __WIN32__
  #include <unistd.h>
  #endif
-diff -Nur o.speak-1.14-source/src/speech.h n.speak-1.14-source/src/speech.h
---- o.speak-1.14-source/src/speech.h	2006-09-21 20:00:41.000000000 +0200
-+++ n.speak-1.14-source/src/speech.h	2006-09-23 19:54:14.000000000 +0200
-@@ -36,7 +36,10 @@
- #endif
- 
- // will look for espeak_data directory here, and also in user's home directory
-+#include "config.h"
-+#ifndef PATH_ESPEAK_DATA
- #define PATH_ESPEAK_DATA  "/usr/share/espeak-data"
-+#endif
- 
- typedef unsigned short USHORT;
- typedef unsigned char  UCHAR;
 diff -Nur o.speak-1.14-source/src/voices.cpp n.speak-1.14-source/src/voices.cpp
 --- o.speak-1.14-source/src/voices.cpp	2006-09-21 20:00:42.000000000 +0200
 +++ n.speak-1.14-source/src/voices.cpp	2006-09-23 21:34:46.000000000 +0200

================================================================
Index: SOURCES/speak-ac_am.patch
diff -u SOURCES/speak-ac_am.patch:1.3 SOURCES/speak-ac_am.patch:1.4
--- SOURCES/speak-ac_am.patch:1.3	Sat Sep 23 21:28:31 2006
+++ SOURCES/speak-ac_am.patch	Sat Sep 23 22:26:25 2006
@@ -56,7 +56,7 @@
 +AC_OUTPUT
 diff -Nur o.speak-1.14-source/src/Makefile.am n.speak-1.14-source/src/Makefile.am
 --- o.speak-1.14-source/src/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ n.speak-1.14-source/src/Makefile.am	2006-09-23 21:14:54.000000000 +0200
++++ n.speak-1.14-source/src/Makefile.am	2006-09-23 22:18:52.000000000 +0200
 @@ -0,0 +1,19 @@
 +AM_CXXFLAGS = -Wall -pedantic -fno-exceptions
 +
@@ -71,7 +71,7 @@
 +	synthdata.cpp synthesize.cpp translate.cpp tr_english.cpp \
 +	tr_languages.cpp voices.cpp wavegen.cpp
 +
-+libespeak_la_LDFLAGS = -version-info 15:1:14
++libespeak_la_LDFLAGS = -version-info 2:14:1
 +
 +# -fvisibility=hidden requires modern GCC which is not present in current PLD Ac
 +#libespeak_la_CXXFLAGS = $(AM_CXXFLAGS) -fvisibility=hidden
@@ -91,3 +91,4 @@
  
  typedef unsigned short USHORT;
  typedef unsigned char  UCHAR;
+
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/speak-sys_includes.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SOURCES/speak-ac_am.patch?r1=1.3&r2=1.4&f=u