From eee9b6a463459e5b33858705217e850c8f7bd1c6 Mon Sep 17 00:00:00 2001
From: Bruno Wolff III <bruno@wolff.to>
Date: Feb 25 2012 20:04:16 +0000
Subject: Fix to build with gcc 4.7


Bring back the noshared patch since gcc now errors out when
unlnown options are used.

Disambiguate some function references using the "this" pointer.

---

diff --git a/festival.gcc47.patch b/festival.gcc47.patch
new file mode 100644
index 0000000..2fee844
--- /dev/null
+++ b/festival.gcc47.patch
@@ -0,0 +1,92 @@
+--- speech_tools/include/EST_TIterator.h.orig	2012-02-25 12:09:30.926212818 -0600
++++ speech_tools/include/EST_TIterator.h	2012-02-25 12:10:32.981099676 -0600
+@@ -101,7 +101,7 @@
+ 
+   /// Create an iterator ready to run over the given container.
+   EST_TIterator(const Container &over)
+-    { begin(over); }
++    { this->begin(over); }
+ 
+   /// Copy an iterator by assignment
+   Iter &operator = (const Iter &orig)
+@@ -109,7 +109,7 @@
+ 
+   /// Assigning a container to an iterator sets it ready to start.
+   Iter &operator = (const Container &over)
+-    { begin(over); return *this;}
++    { this->begin(over); return *this;}
+ 
+   /// Set the iterator ready to run over this container.
+   void begin(const Container &over)
+@@ -209,7 +209,7 @@
+ 
+   /// Create an iterator ready to run over the given container.
+   EST_TStructIterator(const Container &over)
+-    { begin(over); }
++    { this->begin(over); }
+ 
+   const Entry *operator ->() const
+     {return &this->current();}
+@@ -239,7 +239,7 @@
+ 
+   /// Create an iterator ready to run over the given container.
+   EST_TRwIterator(Container &over)
+-    { begin(over); }
++    { this->begin(over); }
+ 
+   /// Set the iterator ready to run over this container.
+   void begin(Container &over)
+@@ -289,7 +289,7 @@
+ 
+   /// Create an iterator ready to run over the given container.
+   EST_TRwStructIterator(Container &over)
+-    { begin(over); }
++    { this->begin(over); }
+ 
+   Entry *operator ->() const
+     {return &this->current();}
+--- speech_tools/include/EST_TNamedEnum.h.orig	2012-02-25 12:26:51.432455812 -0600
++++ speech_tools/include/EST_TNamedEnum.h	2012-02-25 12:27:07.125450312 -0600
+@@ -130,7 +130,7 @@
+ 	{this->initialise((const void *)defs); };
+   EST_TNamedEnumI(EST_TValuedEnumDefinition<const char *,const char *,INFO> defs[], ENUM (*conv)(const char *))
+ 	{this->initialise((const void *)defs, conv); };
+-  const char *name(ENUM tok, int n=0) const {return value(tok,n); };
++  const char *name(ENUM tok, int n=0) const {return this->value(tok,n); };
+ 
+ };
+ 
+--- speech_tools/base_class/EST_TSimpleMatrix.cc.orig	2012-02-25 12:34:37.095639209 -0600
++++ speech_tools/base_class/EST_TSimpleMatrix.cc	2012-02-25 12:35:33.952865468 -0600
+@@ -97,7 +97,7 @@
+ 	{
+ 	  int copy_r = Lof(this->num_rows(), new_rows);
+ 
+-	  just_resize(new_rows, new_cols, &old_vals);
++	  this->just_resize(new_rows, new_cols, &old_vals);
+ 
+ 	  memcpy((void *)this->p_memory, 
+ 		 (const void *)old_vals,
+@@ -126,9 +126,9 @@
+ 	  int copy_r = Lof(this->num_rows(), new_rows);
+ 	  int copy_c = Lof(this->num_columns(), new_cols);
+ 	  
+-	  just_resize(new_rows, new_cols, &old_vals);
++	  this->just_resize(new_rows, new_cols, &old_vals);
+ 
+-	  set_values(old_vals,
++	  this->set_values(old_vals,
+ 		     old_row_step, old_column_step,
+ 		     0, copy_r,
+ 		     0, copy_c);
+--- speech_tools/base_class/EST_TSimpleVector.cc.orig	2012-02-25 12:38:16.647543126 -0600
++++ speech_tools/base_class/EST_TSimpleVector.cc	2012-02-25 12:38:41.571710862 -0600
+@@ -70,7 +70,7 @@
+   T *old_vals =NULL;
+   int old_offset = this->p_offset;
+ 
+-  just_resize(newn, &old_vals);
++  this->just_resize(newn, &old_vals);
+ 
+   if (set && old_vals)
+     {
diff --git a/festival.spec b/festival.spec
index a2cb724..eeee71e 100644
--- a/festival.spec
+++ b/festival.spec
@@ -6,7 +6,7 @@
 Name: festival
 Summary: Speech synthesis and text-to-speech system
 Version: %{festivalversion}
-Release: 19%{?dist}
+Release: 20%{?dist}
 
 URL: http://www.cstr.ed.ac.uk/projects/festival/
 Group: Applications/Multimedia
@@ -136,6 +136,12 @@ Patch94: festival-speech-tools-pulse.patch
 
 Patch95: gcc44.patch
 
+# gcc 4.7 is finnicky about ambiguous function references'
+Patch96: festival.gcc47.patch
+
+# Bring back old patch since gcc 4.7 no longer ignores unknown options
+Patch97: no-shared-data.patch
+
 BuildRequires: pulseaudio-libs-devel
 BuildRequires: tetex
 BuildRequires: ncurses-devel
@@ -517,6 +523,8 @@ done
 %patch93 -p1 -b .gcc43
 %patch94 -p1 -b .pulse
 %patch95 -p1 -b .gcc44
+%patch96 -p0 -b .gcc47
+%patch97 -p1 -b .no-share
 
 # zero length
 rm festdoc-%{docversion}/speech_tools/doc/index_html.jade
@@ -887,6 +895,9 @@ fi
 
 
 %changelog
+* Sat Feb 25 2012 Bruno Wolff III <bruno@wolff.to> - 1.96-20
+- Fix to build with gcc 4.7
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.96-19
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild