diff options
| author |   Gregorio Guidi <greg_g@gentoo.org> | 2005-11-25 09:01:56 +0000 |
|---|---|---|
| committer | Gregorio Guidi <greg_g@gentoo.org> | 2005-11-25 09:01:56 +0000 |
| commit | 164bd504a8ccaee15253256f835f904d17429565 (patch) | |
| tree | dfc869b0200f2c5c520a223db0c01a3a249cc556 /dev-util/kdevelop/files | |
| parent | fixes killed with ctrl+c from a terminal and gets glibc errors - bug #113219 (diff) | |
| download | historical-164bd504a8ccaee15253256f835f904d17429565.tar.gz historical-164bd504a8ccaee15253256f835f904d17429565.tar.bz2 historical-164bd504a8ccaee15253256f835f904d17429565.zip | |
Update patch for bug #86870.
Package-Manager: portage-2.0.51.22-r3
Diffstat (limited to 'dev-util/kdevelop/files')
| -rw-r--r-- | dev-util/kdevelop/files/kdevelop-3.3.0-makefiles.patch | 69 |
1 files changed, 69 insertions, 0 deletions
diff --git a/dev-util/kdevelop/files/kdevelop-3.3.0-makefiles.patch b/dev-util/kdevelop/files/kdevelop-3.3.0-makefiles.patch new file mode 100644 index 000000000000..9a28e5c3c183 --- /dev/null +++ b/dev-util/kdevelop/files/kdevelop-3.3.0-makefiles.patch @@ -0,0 +1,69 @@ +diff -Nur kdevelop-3.3.0.orig/buildtools/custommakefiles/customprojectpart.cpp kdevelop-3.3.0/buildtools/custommakefiles/customprojectpart.cpp +--- kdevelop-3.3.0.orig/buildtools/custommakefiles/customprojectpart.cpp 2005-09-10 10:21:46.000000000 +0200 ++++ kdevelop-3.3.0/buildtools/custommakefiles/customprojectpart.cpp 2005-11-24 21:26:16.000000000 +0100 +@@ -187,17 +187,17 @@ + m_contextRemoveFiles.clear(); + + if( fcontext->urls().size() == 1 ) +- { +- QString contextFileName = URLUtil::canonicalPath(fcontext->urls().first().fileName()); +- bool inProject = project()->isProjectFile(contextFileName); +- QString popupstr = QFileInfo(contextFileName).fileName(); +- if (contextFileName.startsWith(projectDirectory()+ "/")) +- contextFileName.remove(0, projectDirectory().length()+1); ++ { ++ QString canContextFileName =URLUtil::canonicalPath(fcontext->urls().first().path()); ++ QString relContextFileName =URLUtil::extractPathNameRelative(URLUtil::canonicalPath(project()->projectDirectory()), canContextFileName); ++ QString popupstr =fcontext->urls().first().fileName(); ++ ++ bool inProject = project()->isProjectFile(canContextFileName); + + popup->insertSeparator(); + if (inProject) + { +- m_contextRemoveFiles << contextFileName; ++ m_contextRemoveFiles << relContextFileName; + int id = popup->insertItem( i18n("Remove %1 From Project").arg(popupstr), + this, SLOT(slotRemoveFromProject()) ); + popup->setWhatsThis(id, i18n("<b>Remove from project</b><p>Removes current file from the list of files in project. " +@@ -205,7 +205,7 @@ + } + else + { +- m_contextAddFiles << contextFileName; ++ m_contextAddFiles << relContextFileName; + int id = popup->insertItem( i18n("Add %1 to Project").arg(popupstr), + this, SLOT(slotAddToProject()) ); + popup->setWhatsThis(id, i18n("<b>Add to project</b><p>Adds current file to the list of files in project. " +@@ -219,14 +219,12 @@ + { + if ((*it).isLocalFile()) + { +- QString path(URLUtil::canonicalPath((*it).path())); +- QString relPath( path ); +- if (relPath.startsWith(projectDirectory()+ "/")) +- relPath.remove(0, projectDirectory().length()+1); +- if (project()->isProjectFile(path)) +- m_contextRemoveFiles << relPath; +- else +- m_contextAddFiles << relPath; ++ QString canPath(URLUtil::canonicalPath((*it).path())); ++ QString relPath =URLUtil::extractPathNameRelative(URLUtil::canonicalPath(project()->projectDirectory()), canPath); ++ if (project()->isProjectFile(canPath)) ++ m_contextRemoveFiles << relPath; ++ else ++ m_contextAddFiles << relPath; + } + } + +@@ -505,8 +503,8 @@ + QStringList::ConstIterator it; + + for ( it = fileList.begin(); it != fileList.end(); ++it ) +- { +- m_sourceFiles.append ( *it ); ++ { ++ m_sourceFiles.append (*it); + } + + saveProject(); |