Hello community, here is the log from the commit of package festival for openSUSE:Factory checked in at 2012-03-23 12:05:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/festival (Old) and /work/SRC/openSUSE:Factory/.festival.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "festival", Maintainer is "gnome-maintain...@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/festival/festival.changes 2011-09-23 01:57:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.festival.new/festival.changes 2012-03-23 12:05:18.000000000 +0100 @@ -1,0 +2,5 @@ +Sat Mar 17 13:23:04 UTC 2012 - dims...@opensuse.org + +- Add speech_tools-gcc47.patch: Fix build with gcc 4.7. + +------------------------------------------------------------------- New: ---- speech_tools-gcc47.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ festival.spec ++++++ --- /var/tmp/diff_new_pack.caGk66/_old 2012-03-23 12:05:20.000000000 +0100 +++ /var/tmp/diff_new_pack.caGk66/_new 2012-03-23 12:05:20.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package festival # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,16 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: festival Version: 2.1 -Release: 1 +Release: 0 Summary: The Festival Speech Synthesis System License: BSD-3-Clause -Url: http://www.cstr.ed.ac.uk/projects/festival/ Group: Productivity/Text/Convertors +Url: http://www.cstr.ed.ac.uk/projects/festival/ Source0: http://www.cstr.ed.ac.uk/downloads/festival/2.1/festival-%{version}-release.tar.gz Source1: http://www.cstr.ed.ac.uk/downloads/festival/2.1/speech_tools-%{version}-release.tar.gz Source2: http://www.cstr.ed.ac.uk/downloads/festival/2.1/festlex_CMU.tar.gz @@ -48,6 +46,8 @@ Patch12: speech_tools-1.2.95-config.patch # PATCH-FIX-UPSTREAM speech_tools-no-LD_LIBRARY_PATH-extension.patch vu...@opensuse.org -- Do not change LD_LIBRARY_PATH in binaries, to avoid any risks Patch17: speech_tools-no-LD_LIBRARY_PATH-extension.patch +# PATCH-FIX-UPSTREAM speech_tools-gcc47.patch dims...@opensuse.org -- Fix build with gcc 4.7 +Patch18: speech_tools-gcc47.patch BuildRequires: gcc-c++ BuildRequires: ncurses-devel BuildRequires: pkgconfig @@ -62,8 +62,8 @@ interpreter for general control. %package devel -License: MIT Summary: Development Package for Festival +License: MIT Group: Productivity/Text/Convertors Requires: %{name} = %{version} @@ -83,6 +83,7 @@ %patch11 -p1 %patch12 %patch17 -p1 +%patch18 -p1 %build # festival ++++++ speech_tools-gcc47.patch ++++++ Index: speech_tools/base_class/EST_TSimpleMatrix.cc =================================================================== --- speech_tools.orig/base_class/EST_TSimpleMatrix.cc +++ speech_tools/base_class/EST_TSimpleMatrix.cc @@ -44,6 +44,7 @@ #include "EST_TVector.h" #include <fstream> #include <iostream> +#include <string.h> #include "EST_cutils.h" template<class T> @@ -98,7 +99,7 @@ void EST_TSimpleMatrix<T>::resize(int ne { 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); for (q=0; q<(copy_r*new_cols*sizeof(T)); q++) /* memcpy */ ((char *)this->p_memory)[q] = ((char *)old_vals)[q]; @@ -127,9 +128,9 @@ void EST_TSimpleMatrix<T>::resize(int ne 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); Index: speech_tools/base_class/EST_TSimpleVector.cc =================================================================== --- speech_tools.orig/base_class/EST_TSimpleVector.cc +++ speech_tools/base_class/EST_TSimpleVector.cc @@ -44,6 +44,7 @@ #include "EST_matrix_support.h" #include <fstream> #include "EST_cutils.h" +#include <string.h> template<class T> void EST_TSimpleVector<T>::copy(const EST_TSimpleVector<T> &a) { @@ -70,7 +71,7 @@ template<class T> void EST_TSimpleVector int old_offset = this->p_offset; unsigned int q; - just_resize(newn, &old_vals); + this->just_resize(newn, &old_vals); if (set && old_vals) { Index: speech_tools/include/EST_TIterator.h =================================================================== --- speech_tools.orig/include/EST_TIterator.h +++ speech_tools/include/EST_TIterator.h @@ -209,7 +209,7 @@ public: /// 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();} @@ -289,7 +289,7 @@ public: /// 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();} Index: speech_tools/include/EST_TNamedEnum.h =================================================================== --- speech_tools.orig/include/EST_TNamedEnum.h +++ speech_tools/include/EST_TNamedEnum.h @@ -130,7 +130,7 @@ public: {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); }; }; -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
