diff options
Diffstat (limited to 'devel/kdevelop/files')
| -rw-r--r-- | devel/kdevelop/files/kdevelop | 2 | ||||
| -rw-r--r-- | devel/kdevelop/files/patch-admin-detect-autoconf.pl | 30 | ||||
| -rw-r--r-- | devel/kdevelop/files/patch-kdev_fix_hang_3.4.1 | 54 | ||||
| -rw-r--r-- | devel/kdevelop/files/patch-languages_cpp_cppsupportpart.cpp | 25 | ||||
| -rw-r--r-- | devel/kdevelop/files/patch-post-3.5.8-kdevelop-qmake-scope | 81 |
5 files changed, 132 insertions, 60 deletions
diff --git a/devel/kdevelop/files/kdevelop b/devel/kdevelop/files/kdevelop index 0d76143d2fe5..a02437512df2 100644 --- a/devel/kdevelop/files/kdevelop +++ b/devel/kdevelop/files/kdevelop @@ -1,5 +1,7 @@ #!/bin/sh +export PATH=%%LOCALBASE%%/gnu-autotools/bin:${PATH} +export ACLOCAL_FLAGS="-I %%LOCALBASE%%/share/aclocal ${ACLOCAL_FLAGS}" export PTHREAD_LIBS=%%PTHREAD_LIBS%% exec "%%PREFIX%%/bin/kdevelop-bin" "$@" diff --git a/devel/kdevelop/files/patch-admin-detect-autoconf.pl b/devel/kdevelop/files/patch-admin-detect-autoconf.pl index ca4350a76799..75af1ec14f63 100644 --- a/devel/kdevelop/files/patch-admin-detect-autoconf.pl +++ b/devel/kdevelop/files/patch-admin-detect-autoconf.pl @@ -1,12 +1,18 @@ ---- admin/detect-autoconf.pl.orig 2007-05-14 03:57:35.000000000 -0700 -+++ admin/detect-autoconf.pl 2007-09-10 02:02:32.000000000 -0700 -@@ -5,2 +5,5 @@ +--- admin/detect-autoconf.pl.orig 2007-10-08 13:35:17.000000000 +0200 ++++ admin/detect-autoconf.pl 2007-10-20 13:42:33.000000000 +0200 +@@ -3,6 +3,9 @@ + # Try to locate best version of auto* + # By Michael Pyne <michael.pyne@kdemail.net> # +# Stripped down for new FreeBSD autotools environment +# Ade Lovett <ade@FreeBSD.org> 2007-09-10 +# # Copyright (c) 2005. -@@ -23,69 +26,2 @@ + # This code is public domain. You may use it however you like (including + # relicensing). +@@ -21,75 +24,6 @@ + return ""; + } -# Subroutine to determine the highest installed version of the given program, -# searching from the given paths. @@ -33,6 +39,8 @@ - - ($version) = $file =~ /$prefix\/$program-?(.*)$/; - $version =~ s/-|\.//g; +- # Don't check the -wrapper ones +- next if $version eq "wrapper"; - - # Special case some programs to make sure it has a minimum version. - if (not $version and exists $minimumVersions{$program}) @@ -76,7 +84,11 @@ -} - # Find an appropriate "which" program for later use by the shell script calling -@@ -103,13 +39,2 @@ + # us. + sub findWhich +@@ -103,17 +37,6 @@ + } + } -# Uses which() to find a program unless the user provided its path in the -# environment (the upper case program name is searched). @@ -90,7 +102,11 @@ -} - # SCRIPT STARTS. -@@ -123,45 +48,12 @@ + + # Search in path. +@@ -123,49 +46,16 @@ + unshift @paths, '/usr/local/bin' unless grep $_ eq '/usr/local/bin', @paths; + unshift @paths, '/usr/bin' unless grep $_ eq '/usr/bin', @paths; -$autoconf = findBest('autoconf', @paths); -($autoconf_suffix) = $autoconf =~ /.*autoconf(.*)$/; @@ -141,3 +157,5 @@ +AUTOMAKE="automake" +ACLOCAL="aclocal" + WHICH="$which" + diff --git a/devel/kdevelop/files/patch-kdev_fix_hang_3.4.1 b/devel/kdevelop/files/patch-kdev_fix_hang_3.4.1 deleted file mode 100644 index 28821eef5360..000000000000 --- a/devel/kdevelop/files/patch-kdev_fix_hang_3.4.1 +++ /dev/null @@ -1,54 +0,0 @@ -diff -u -u kdevelop-3.4.1/languages/cpp/cppsupportpart.cpp kdevelop-svn/languages/cpp/cppsupportpart.cpp ---- languages/cpp/cppsupportpart.cpp 2007-05-16 16:36:20.000000000 +0200 -+++ languages/cpp/cppsupportpart.cpp 2007-05-16 00:25:57.000000000 +0200 -@@ -3130,11 +3130,11 @@ - return QString::null; - } - --UIBlockTester::UIBlockTesterThread::UIBlockTesterThread( UIBlockTester& parent ) : QThread(), m_parent( parent ) { -+UIBlockTester::UIBlockTesterThread::UIBlockTesterThread( UIBlockTester& parent ) : QThread(), m_parent( parent ), m_stop(false) { - } - - void UIBlockTester::UIBlockTesterThread::run() { -- while(1) { -+ while(!m_stop) { - msleep( m_parent.m_msecs / 10 ); - m_parent.m_timeMutex.lock(); - QDateTime t = QDateTime::currentDateTime(); -@@ -3146,7 +3146,11 @@ - m_parent.m_timeMutex.unlock(); - } - } -- -+ -+void UIBlockTester::UIBlockTesterThread::stop() { -+ m_stop = true; -+} -+ - UIBlockTester::UIBlockTester( uint milliseconds ) : m_thread( *this ), m_msecs( milliseconds ) { - m_timer = new QTimer( this ); - m_timer->start( milliseconds/10 ); -@@ -3155,7 +3159,7 @@ - m_thread.start(); - } - UIBlockTester::~UIBlockTester() { -- m_thread.terminate(); -+ m_thread.stop(); - m_thread.wait(); - } - -diff -u -u kdevelop-3.4.1/languages/cpp/cppsupportpart.h kdevelop-svn/languages/cpp/cppsupportpart.h ---- languages/cpp/cppsupportpart.h 2007-05-16 16:36:20.000000000 +0200 -+++ languages/cpp/cppsupportpart.h 2007-05-16 00:25:57.000000000 +0200 -@@ -43,9 +43,10 @@ - public: - UIBlockTesterThread( UIBlockTester& parent ); - void run(); -- -+ void stop(); - private: - UIBlockTester& m_parent; -+ bool m_stop; - }; - friend class UIBlockTesterThread; - public: diff --git a/devel/kdevelop/files/patch-languages_cpp_cppsupportpart.cpp b/devel/kdevelop/files/patch-languages_cpp_cppsupportpart.cpp new file mode 100644 index 000000000000..5fb1148e6ea4 --- /dev/null +++ b/devel/kdevelop/files/patch-languages_cpp_cppsupportpart.cpp @@ -0,0 +1,25 @@ +--- languages/cpp/cppsupportpart.cpp 2007/10/08 11:32:36 722993 ++++ languages/cpp/cppsupportpart.cpp 2007/10/23 22:58:44 728690 +@@ -2533,6 +2533,9 @@ + QStringList l = files.res; + while(!l.isEmpty() ) { + emit addedSourceInfo( l.front() ); ++ emit aboutToRemoveSourceInfo( l.front() ); ++ emit removedSourceInfo( l.front() ); ++ emit addedSourceInfo( l.front() ); + l.pop_front(); + } + +@@ -2542,9 +2545,11 @@ + QStringList l = files.res; + while( !l.isEmpty() ) { + emit codeModelUpdated( l.front() ); ++ emit aboutToRemoveSourceInfo( l.front() ); ++ emit removedSourceInfo( l.front() ); ++ emit addedSourceInfo( l.front() ); + l.pop_front(); + } +- emit updatedSourceInfo(); + } + } + kdDebug( 9007 ) << "files in code-model after parseEmit: " << codeModel()->fileList().count() << " before: " << oldFileCount << endl; diff --git a/devel/kdevelop/files/patch-post-3.5.8-kdevelop-qmake-scope b/devel/kdevelop/files/patch-post-3.5.8-kdevelop-qmake-scope new file mode 100644 index 000000000000..6869b6b2f44b --- /dev/null +++ b/devel/kdevelop/files/patch-post-3.5.8-kdevelop-qmake-scope @@ -0,0 +1,81 @@ +--- buildtools/qmake/scope.cpp 2007/10/07 14:39:48 722530 ++++ 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 ); ++ } ++ } ++ } ++ } + } + } + +--- buildtools/qmake/scope.h 2007/10/07 14:39:48 722530 ++++ 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; |