tag 667377 patch thanks Matthias Klose <[email protected]> (03/04/2012): > Package: speech-tools > Version: 1:2.1~release-3 > Severity: important > Tags: sid wheezy > User: [email protected] > Usertags: ftbfs-gcc-4.7
Here's a patch to fix this FTBFS. No intent to NMU here. Mraw, KiBi.
diff -Nru speech-tools-2.1~release/debian/changelog speech-tools-2.1~release/debian/changelog --- speech-tools-2.1~release/debian/changelog 2012-01-28 20:32:50.000000000 +0000 +++ speech-tools-2.1~release/debian/changelog 2012-04-04 20:13:48.000000000 +0000 @@ -1,3 +1,14 @@ +speech-tools (1:2.1~release-3.1) UNRELEASED; urgency=low + + * Non-maintainer upload. + * Fix FTBFS with gcc 4.7 (Closes: #667377). + - Add ftbfs_gcc4.7.diff to fix missing includes, and to add “this->” + where needed. + - Refresh config_compilers_gcc_defaults.mak.diff to strip unsupported + -fno-shared-data. + + -- Cyril Brulebois <[email protected]> Wed, 04 Apr 2012 20:12:02 +0000 + speech-tools (1:2.1~release-3) unstable; urgency=low [ Samuel Thibault ] diff -Nru speech-tools-2.1~release/debian/patches/config_compilers_gcc_defaults.mak.diff speech-tools-2.1~release/debian/patches/config_compilers_gcc_defaults.mak.diff --- speech-tools-2.1~release/debian/patches/config_compilers_gcc_defaults.mak.diff 2012-01-28 20:16:11.000000000 +0000 +++ speech-tools-2.1~release/debian/patches/config_compilers_gcc_defaults.mak.diff 2012-04-04 20:07:20.000000000 +0000 @@ -5,8 +5,8 @@ obsolete we do this in one place now. Author: Peter Drysdale <[email protected]> ---- speech-tools-2.1~release.orig/config/compilers/gcc_defaults.mak -+++ speech-tools-2.1~release/config/compilers/gcc_defaults.mak +--- a/config/compilers/gcc_defaults.mak ++++ b/config/compilers/gcc_defaults.mak @@ -39,7 +39,7 @@ ########################################################################### @@ -38,7 +38,7 @@ ifndef GCC_MAKE_SHARED_LIB - MAKE_SHARED_LIB = $(CXX) -shared -fno-shared-data -o XXX -+ MAKE_SHARED_LIB = $(CXX) -shared -fno-shared-data -o XXX -Wl,-soname -Wl,YYY ++ MAKE_SHARED_LIB = $(CXX) -shared -o XXX -Wl,-soname -Wl,YYY else MAKE_SHARED_LIB = $(GCC_MAKE_SHARED_LIB) endif diff -Nru speech-tools-2.1~release/debian/patches/ftbfs_gcc4.7.diff speech-tools-2.1~release/debian/patches/ftbfs_gcc4.7.diff --- speech-tools-2.1~release/debian/patches/ftbfs_gcc4.7.diff 1970-01-01 00:00:00.000000000 +0000 +++ speech-tools-2.1~release/debian/patches/ftbfs_gcc4.7.diff 2012-04-04 20:06:18.000000000 +0000 @@ -0,0 +1,81 @@ +--- a/base_class/EST_TSimpleMatrix.cc ++++ b/base_class/EST_TSimpleMatrix.cc +@@ -44,6 +44,7 @@ + #include "EST_TVector.h" + #include <fstream> + #include <iostream> ++#include <cstring> + #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); +--- a/base_class/EST_TSimpleVector.cc ++++ b/base_class/EST_TSimpleVector.cc +@@ -43,6 +43,7 @@ + #include "EST_TSimpleVector.h" + #include "EST_matrix_support.h" + #include <fstream> ++#include <cstring> + #include "EST_cutils.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) + { +--- a/include/EST_TIterator.h ++++ b/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();} +--- a/include/EST_TNamedEnum.h ++++ b/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); }; + + }; + diff -Nru speech-tools-2.1~release/debian/patches/series speech-tools-2.1~release/debian/patches/series --- speech-tools-2.1~release/debian/patches/series 2012-01-28 20:16:11.000000000 +0000 +++ speech-tools-2.1~release/debian/patches/series 2012-04-04 19:58:48.000000000 +0000 @@ -31,3 +31,4 @@ copyright_4clausefix.diff fmt.diff lintianspell.diff +ftbfs_gcc4.7.diff
signature.asc
Description: Digital signature
