- gcc 4.1 fixes

Changed files:
    festival-gcc4.patch -> 1.1
    festival.spec -> 1.23

diff --git a/festival-gcc4.patch b/festival-gcc4.patch
new file mode 100644 (file)
index 0000000..24aa0cc
--- /dev/null
+++ b/festival-gcc4.patch
@@ -0,0 +1,15 @@
+diff -ur festival.org/src/modules/clunits/clunits.h festival/src/modules/clunits/clunits.h
+--- festival.org/src/modules/clunits/clunits.h 2001-07-05 12:19:09.000000000 +0000
++++ festival/src/modules/clunits/clunits.h     2006-04-01 20:36:30.552506750 +0000
+@@ -83,9 +83,9 @@
+     CLfile *get_fileitem(const EST_String &name)
+       { return (CLfile *)fileindex.lookup(name); }
+     void load_coefs_sig(EST_Item *unit);
+-    CLfile *CLDB::get_file_coefs_sig(const EST_String &fileid);
++    CLfile *get_file_coefs_sig(const EST_String &fileid);
+     void load_join_coefs(CLunit *unit);
+-    CLfile *CLDB::get_file_join_coefs(const EST_String &fileid);
++    CLfile *get_file_join_coefs(const EST_String &fileid);
+ };
+ 
+ 

diff --git a/festival.spec b/festival.spec
index af6637cd243bb9726c88560cffb77173a90d5270..736dea0c1aaec604bc920097b6d10f144f52cf40 100644 (file)
--- a/festival.spec
+++ b/festival.spec
@@ -4,7 +4,7 @@ Summary(pl):    System syntezy mowy Festival
 Name:          festival
 Version:       1.4.4
 %define                _snap   20030803
-Release:       0.%{_snap}.2
+Release:       0.%{_snap}.3
 License:       BSD-like (except for festival.el, which is on GPL)
 Group:         Applications/Sound
 #Source0:      http://www.cstr.ed.ac.uk/download/festival/%{version}/%{name}-%{version}-release.tar.gz
@@ -20,6 +20,7 @@ Source4:      http://www.cstr.ed.ac.uk/download/festival/%{version}/festvox_en1.tar.g
 # Source4-md5: 66e3bc07751d7e31826185649c5ada5a
 Patch0:                %{name}-config.patch
 Patch1:                %{name}-asterisk.patch
+Patch2:                %{name}-gcc4.patch
 URL:           http://www.cstr.ed.ac.uk/projects/festival/
 BuildRequires: automake
 BuildRequires: speech_tools-devel
@@ -85,6 +86,7 @@ Pliki potrzebne do u
 %setup -q -n %{name} -b1 -b2 -b3 -b4
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 cp -f /usr/share/automake/config.* .