Update patch for bug #86870.

Package-Manager: portage-2.0.51.22-r3

diff --git a/dev-util/kdevelop/ChangeLog b/dev-util/kdevelop/ChangeLog
index 645b5aeabb42bb95e190ef5e5e4cb7c08f71e378..d395190e0a11cc6795a2bfb5c609be530d175260 100644 (file)
--- a/dev-util/kdevelop/ChangeLog
+++ b/dev-util/kdevelop/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/kdevelop
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.105 2005/11/23 11:31:36 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.106 2005/11/25 09:01:56 greg_g Exp $
+
+  25 Nov 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdevelop-3.3.0-makefiles.patch, kdevelop-3.3.0.ebuild:
+  Update patch for bug #86870.
 
 *kdevelop-3.3.0 (23 Nov 2005)
 

diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 77b304e47f8c03a36693c1387ca914606841823b..96502aa17c79ee13ddb30534f86f17ea5ec947dd 100644 (file)
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -2,9 +2,9 @@ MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 MD5 ec5ab14849cf3f9cea025bae54f4956c kdevelop-3.3.0_beta2-r1.ebuild 3132
 MD5 af2bf95f6867509e24f9d4ccda1cfba9 kdevelop-3.2.1-r1.ebuild 2858
 MD5 dec73ae3a6b2e0c29b673b50e83e7f49 kdevelop-3.2.3-r1.ebuild 2999
-MD5 2b9328335bcf094acefd680d6beb710a kdevelop-3.3.0.ebuild 2952
+MD5 3685e8773a8af26845aa1de988a033e9 kdevelop-3.3.0.ebuild 2960
 MD5 be27cb0ad17d922992efa60840dda2dc kdevelop-3.1.2.ebuild 2722
-MD5 cadd5169cdd9d17c018984a7f62b6c10 ChangeLog 16359
+MD5 72882e4ae2a3c3c02771781f14cf7f79 ChangeLog 16505
 MD5 b7b71e0c83b22cc11ddb06e001c2a2fd kdevelop-3.3.0_beta2.ebuild 3014
 MD5 e940bb0a107baa39c8a1b42e13e57e98 kdevelop-3.2.2.ebuild 2832
 MD5 accda6c7d42fc9c024903cbc09078e71 kdevelop-3.3_beta1.ebuild 3017
@@ -19,6 +19,7 @@ MD5 72bf5d9a24a821f9584ec59ccf1a2d6e files/kdevelop-3.2.1-gcc4.patch 446
 MD5 5ea55be30c933e635663774aabe62dda files/digest-kdevelop-3.3.0_beta2 69
 MD5 34af4d3547f033e0198702768d81c2ad files/digest-kdevelop-3.2.3 68
 MD5 5ea55be30c933e635663774aabe62dda files/digest-kdevelop-3.3.0_beta2-r1 69
+MD5 3b430a9820d4d15b32cea7937512cdcb files/kdevelop-3.3.0-makefiles.patch 3069
 MD5 1760f21a5c2d5c152495c12af8232d04 files/kdevelop-3.2.1-makefiles.patch 815
 MD5 9baadc6b0dcbb08db8c865897cf4cf43 files/kdevelop-3.1.0-bdb-mutex.patch 656
 MD5 2e51b8b6ea22818559bec6f23ad1f59d files/digest-kdevelop-3.3.0 68

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 (file)
index 0000000..9a28e5c
--- /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();

diff --git a/dev-util/kdevelop/kdevelop-3.3.0.ebuild b/dev-util/kdevelop/kdevelop-3.3.0.ebuild
index 90ef27d4e2e075f13e2866eee2defc0d6f7c8b16..1670bfce0299cbc9aed4c3c6ef6f99d59d23c8bf 100644 (file)
--- a/dev-util/kdevelop/kdevelop-3.3.0.ebuild
+++ b/dev-util/kdevelop/kdevelop-3.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.3.0.ebuild,v 1.1 2005/11/23 11:31:36 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.3.0.ebuild,v 1.2 2005/11/25 09:01:56 greg_g Exp $
 
 inherit kde eutils
 
@@ -28,8 +28,8 @@ src_unpack() {
        kde_src_unpack
        cd ${S}
 
-       # See bug #86780 and kde bug 98852.
-       epatch "${FILESDIR}/kdevelop-3.2.1-makefiles.patch"
+       # Fix for kde bug 98852. Applied for 3.4.0.
+       epatch "${FILESDIR}/kdevelop-3.3.0-makefiles.patch"
 
        # Update the admin dir used in KDE template projects.
        # See also kde bug 104386.