From f505e1005bd9cd39a8f4038d11422879e9b6e51e Mon Sep 17 00:00:00 2001 From: twittner Date: Sat, 23 Sep 2006 20:26:25 +0000 Subject: [PATCH] - splitting between patches and -version-info corrected Changed files: speak-ac_am.patch -> 1.4 speak-sys_includes.patch -> 1.2 --- speak-ac_am.patch | 5 +++-- speak-sys_includes.patch | 14 -------------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/speak-ac_am.patch b/speak-ac_am.patch index a439e74..b3a10b2 100644 --- a/speak-ac_am.patch +++ b/speak-ac_am.patch @@ -56,7 +56,7 @@ diff -Nur o.speak-1.14-source/configure.ac n.speak-1.14-source/configure.ac +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 @@ diff -Nur o.speak-1.14-source/src/Makefile.am n.speak-1.14-source/src/Makefile.a + 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 @@ diff -Nur o.speak-1.14-source/src/speech.h n.speak-1.14-source/src/speech.h typedef unsigned short USHORT; typedef unsigned char UCHAR; + diff --git a/speak-sys_includes.patch b/speak-sys_includes.patch index e6bd438..fca392d 100644 --- a/speak-sys_includes.patch +++ b/speak-sys_includes.patch @@ -35,20 +35,6 @@ diff -Nur o.speak-1.14-source/src/speak_lib.cpp n.speak-1.14-source/src/speak_li #ifndef __WIN32__ #include #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 -- 2.43.0