tag 667378 patch thanks Matthias Klose <[email protected]> (03/04/2012): > Package: sphinxsearch > Version: 2.0.3-1 > 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 sphinxsearch-2.0.3/debian/changelog sphinxsearch-2.0.3/debian/changelog --- sphinxsearch-2.0.3/debian/changelog 2012-01-10 09:13:48.000000000 +0000 +++ sphinxsearch-2.0.3/debian/changelog 2012-04-04 20:24:35.000000000 +0000 @@ -1,3 +1,10 @@ +sphinxsearch (2.0.3-1.1) UNRELEASED; urgency=low + + * Non-maintainer upload. + * Fix FTBFS with gcc 4.7 by adding “this->” when needed (Closes: #667378). + + -- Cyril Brulebois <[email protected]> Wed, 04 Apr 2012 20:24:01 +0000 + sphinxsearch (2.0.3-1) unstable; urgency=low * New upstream release. diff -Nru sphinxsearch-2.0.3/debian/patches/05_gcc4.7.patch sphinxsearch-2.0.3/debian/patches/05_gcc4.7.patch --- sphinxsearch-2.0.3/debian/patches/05_gcc4.7.patch 1970-01-01 00:00:00.000000000 +0000 +++ sphinxsearch-2.0.3/debian/patches/05_gcc4.7.patch 2012-04-04 20:24:43.000000000 +0000 @@ -0,0 +1,29 @@ +--- a/src/sphinxexpr.cpp ++++ b/src/sphinxexpr.cpp +@@ -1796,7 +1796,7 @@ public: + /// evaluate arg, return interval id + virtual int IntEval ( const CSphMatch & tMatch ) const + { +- T val = ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage ++ T val = this->ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage + ARRAY_FOREACH ( i, this->m_dValues ) // FIXME! OPTIMIZE! perform binary search here + if ( val<this->m_dValues[i] ) + return i; +@@ -1827,7 +1827,7 @@ public: + /// evaluate arg, return interval id + virtual int IntEval ( const CSphMatch & tMatch ) const + { +- T val = ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage ++ T val = this->ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage + ARRAY_FOREACH ( i, m_dTurnPoints ) + if ( val < Expr_ArgVsSet_c<T>::ExprEval ( m_dTurnPoints[i], tMatch ) ) + return i; +@@ -1873,7 +1873,7 @@ public: + /// evaluate arg, check if the value is within set + virtual int IntEval ( const CSphMatch & tMatch ) const + { +- T val = ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage ++ T val = this->ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage + return this->m_dValues.BinarySearch ( val )!=NULL; + } + diff -Nru sphinxsearch-2.0.3/debian/patches/series sphinxsearch-2.0.3/debian/patches/series --- sphinxsearch-2.0.3/debian/patches/series 2012-01-10 09:04:16.000000000 +0000 +++ sphinxsearch-2.0.3/debian/patches/series 2012-04-04 20:22:18.000000000 +0000 @@ -2,3 +2,4 @@ 02_sphinx.conf.patch 03_alpha.patch 04_libstemmer.patch +05_gcc4.7.patch
signature.asc
Description: Digital signature
