diff options
| -rw-r--r-- | dev-util/kdevelop/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-util/kdevelop/files/kdevelop-3.5-gcc4.4.patch | 15 | ||||
| -rw-r--r-- | dev-util/kdevelop/files/kdevelop-3.5.0-scope.patch | 82 | ||||
| -rw-r--r-- | dev-util/kdevelop/files/kdevelop-3.5.1_fix_missing_output.patch | 48 | ||||
| -rw-r--r-- | dev-util/kdevelop/kdevelop-3.5.4-r1.ebuild | 5 |
5 files changed, 24 insertions, 133 deletions
diff --git a/dev-util/kdevelop/ChangeLog b/dev-util/kdevelop/ChangeLog index 9d629631baec..8710ead0daa8 100644 --- a/dev-util/kdevelop/ChangeLog +++ b/dev-util/kdevelop/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-util/kdevelop # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.176 2009/05/25 19:50:57 tampakrap Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.177 2009/06/04 16:41:27 tampakrap Exp $ + + 04 Jun 2009; Theo Chatzimichos <tampakrap@gentoo.org> + +files/kdevelop-3.5-gcc4.4.patch, -files/kdevelop-3.5.0-scope.patch, + -files/kdevelop-3.5.1_fix_missing_output.patch, kdevelop-3.5.4-r1.ebuild: + Apply gcc 4.4 patch, bug 272638 25 May 2009; Theo Chatzimichos <tampakrap@gentoo.org> -kdevelop-3.5.0.ebuild, -kdevelop-3.5.1.ebuild, -kdevelop-3.5.2.ebuild, diff --git a/dev-util/kdevelop/files/kdevelop-3.5-gcc4.4.patch b/dev-util/kdevelop/files/kdevelop-3.5-gcc4.4.patch new file mode 100644 index 000000000000..fbd0fd1a886c --- /dev/null +++ b/dev-util/kdevelop/files/kdevelop-3.5-gcc4.4.patch @@ -0,0 +1,15 @@ +--- kdevelop-3.5.4/lib/antlr/antlr/CharScanner.hpp 2007-11-30 23:36:49.000000000 +0100 ++++ kdevelop-3.5.4/lib/antlr/antlr/CharScanner.hpp 2009-06-04 17:16:55.000000000 +0200 +@@ -19,11 +19,7 @@ + #endif + #include <cstring> + +-#if ( _MSC_VER == 1200 ) +-// VC6 seems to need this +-// note that this is not a standard C++ include file. +-# include <stdio.h> +-#endif ++#include <cstdio> + + #include <antlr/TokenStream.hpp> + #include <antlr/RecognitionException.hpp> diff --git a/dev-util/kdevelop/files/kdevelop-3.5.0-scope.patch b/dev-util/kdevelop/files/kdevelop-3.5.0-scope.patch deleted file mode 100644 index cd50da7bc60c..000000000000 --- a/dev-util/kdevelop/files/kdevelop-3.5.0-scope.patch +++ /dev/null @@ -1,82 +0,0 @@ ---- branches/kdevelop/3.5/buildtools/qmake/scope.h 2007/10/11 19:47:17 724230 -+++ branches/kdevelop/3.5/buildtools/qmake/scope.h 2007/10/11 19:48:00 724231 -@@ -217,7 +217,7 @@ - // runs through the statements until stopHere is found (or the end is reached, if stopHere is 0), - // using the given list as startvalue - // Changes the list using the +=, -=, = operations accordingly -- void calcValuesFromStatements( const QString& variable, QStringList& result, bool, QMake::AST* stopHere = 0, bool fetchFromParent = true ) const; -+ void calcValuesFromStatements( const QString& variable, QStringList& result, bool, QMake::AST* stopHere = 0, bool fetchFromParent = true, bool setDefault = true ) const; - - // Check wether the two operators are compatible - static bool isCompatible( const QString& op1, const QString& op2); -@@ -255,8 +255,6 @@ - - QString replaceWs(QString); - -- // All different subscopes of this scope, the key is the "position" at which the scope starts -- QMap<QString, Scope*> m_subProjects; - - // The "position" inside the parent scope that this scope starts at - unsigned int m_num; - ---- branches/kdevelop/3.5/buildtools/qmake/scope.cpp 2007/10/11 19:47:17 724230 -+++ branches/kdevelop/3.5/buildtools/qmake/scope.cpp 2007/10/11 19:48:00 724231 -@@ -325,13 +325,13 @@ - return result; - } - --void Scope::calcValuesFromStatements( const QString& variable, QStringList& result, bool checkIncParent, QMake::AST* stopHere, bool fetchFromParent ) const -+void Scope::calcValuesFromStatements( const QString& variable, QStringList& result, bool checkIncParent, QMake::AST* stopHere, bool fetchFromParent, bool setDefault ) const - { - if( !m_root ) - return; - - /* For variables that we don't know and which are not QT/CONFIG find the default value */ -- if( m_defaultopts -+ if( setDefault && m_defaultopts - && m_defaultopts->variables().findIndex(variable) != -1 - && ( variable == "TEMPLATE" || variable == "QT" || KnownVariables.findIndex(variable) == -1 || variable == "CONFIG" ) ) - { -@@ -379,6 +379,42 @@ - } - } - } -+ }else if( ast->nodeType() == QMake::AST::IncludeAST ) -+ { -+ QMake::IncludeAST* iast = static_cast<QMake::IncludeAST*>(ast); -+ QValueList<unsigned int> l = m_scopes.keys(); -+ for( unsigned int i = 0; i < l.count(); ++i ) -+ { -+ int num = l[ i ]; -+ if( m_scopes.contains( num ) ) -+ { -+ Scope* s = m_scopes[num]; -+ if( s && s->scopeType() == IncludeScope && s->m_incast == iast ) -+ { -+ s->calcValuesFromStatements( variable, result, false, 0, false, false ); -+ } -+ } -+ } -+ -+ }else if( ast->nodeType() == QMake::AST::ProjectAST ) -+ { -+ QMake::ProjectAST* past = static_cast<QMake::ProjectAST*>(ast); -+ if( past->isFunctionScope() || past->isScope() ) -+ { -+ QValueList<unsigned int> l = m_scopes.keys(); -+ for( unsigned int i = 0; i < l.count(); ++i ) -+ { -+ int num = l[ i ]; -+ if( m_scopes.contains( num ) ) -+ { -+ Scope* s = m_scopes[num]; -+ if( s && s->m_root == past && s->m_root->scopedID == past->scopedID ) -+ { -+ s->calcValuesFromStatements( variable, result, false, 0, false, false ); -+ } -+ } -+ } -+ } - } - } - diff --git a/dev-util/kdevelop/files/kdevelop-3.5.1_fix_missing_output.patch b/dev-util/kdevelop/files/kdevelop-3.5.1_fix_missing_output.patch deleted file mode 100644 index e2a74825ff94..000000000000 --- a/dev-util/kdevelop/files/kdevelop-3.5.1_fix_missing_output.patch +++ /dev/null @@ -1,48 +0,0 @@ -Index: parts/outputviews/makewidget.cpp -=================================================================== ---- parts/outputviews/makewidget.cpp (Revision 780035) -+++ parts/outputviews/makewidget.cpp (Revision 780036) -@@ -532,28 +532,31 @@ - { - QString sline; - bool forceCLocale = KConfigGroup( kapp->config(), "MakeOutputWidget" ).readBoolEntry( "ForceCLocale", true ); -+ - if( forceCLocale ) - sline = QString::fromAscii( stdoutbuf+line ); - else - sline = QString::fromLocal8Bit( stdoutbuf+line ); -- stdoutbuf.truncate(0); - - if ( !appendToLastLine( sline ) ) - m_directoryStatusFilter.processLine( sline ); -+ stdoutbuf.truncate(0); - } - - void MakeWidget::insertStderrLine( const QCString& line ) - { - QString sline; - bool forceCLocale = KConfigGroup( kapp->config(), "MakeOutputWidget" ).readBoolEntry( "ForceCLocale", true ); -+ - if( forceCLocale ) { - sline = QString( stderrbuf+line ); - } - else - sline = QString::fromLocal8Bit( stderrbuf+line ); -+ -+ if ( !appendToLastLine( sline ) ) -+ m_errorFilter.processLine( sline ); - stderrbuf.truncate(0); -- if ( !appendToLastLine( line ) ) -- m_errorFilter.processLine( line ); - } - - void MakeWidget::slotProcessExited(KProcess *) -@@ -832,7 +835,7 @@ - - void MakeWidget::storePartialStdoutLine(const QCString & line) - { -- stderrbuf += line; -+ stdoutbuf += line; - } - - #include "makewidget.moc" diff --git a/dev-util/kdevelop/kdevelop-3.5.4-r1.ebuild b/dev-util/kdevelop/kdevelop-3.5.4-r1.ebuild index 7d6011e6c976..dd0409113731 100644 --- a/dev-util/kdevelop/kdevelop-3.5.4-r1.ebuild +++ b/dev-util/kdevelop/kdevelop-3.5.4-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.5.4-r1.ebuild,v 1.2 2009/05/25 19:50:57 tampakrap Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.5.4-r1.ebuild,v 1.3 2009/06/04 16:41:27 tampakrap Exp $ EAPI="2" @@ -31,7 +31,8 @@ DEPEND="${DEPEND} need-kde 3.5 -PATCHES=( "${FILESDIR}/kdevelop-3.5-lexer.patch" +PATCHES=( "${FILESDIR}/kdevelop-3.5-gcc4.4.patch" + "${FILESDIR}/kdevelop-3.5-lexer.patch" "${FILESDIR}/kdevelop-3.5-parallel.patch" "${WORKDIR}/kdevelop-3.5-libtool.m4.in.patch" "${WORKDIR}/kdevelop-3.5-ltmain.sh.patch" ) |