Add project URI patch, bug 319625

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/dev-util/kdevplatform/ChangeLog b/dev-util/kdevplatform/ChangeLog
index 8c8c5328e377daca39d5c12679d026ac07e0e922..648430362f46e1c7eb424bbe6c11988d78a825fa 100644 (file)
--- a/dev-util/kdevplatform/ChangeLog
+++ b/dev-util/kdevplatform/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/kdevplatform
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/ChangeLog,v 1.28 2010/05/18 20:10:03 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/ChangeLog,v 1.29 2010/06/05 19:59:54 reavertm Exp $
+
+*kdevplatform-1.0.0-r1 (05 Jun 2010)
+
+  05 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  -kdevplatform-1.0.0.ebuild, +kdevplatform-1.0.0-r1.ebuild,
+  +files/kdevplatform-1.0.0-preserve-remote-URI.patch:
+  Add project URI patch, bug 319625
 
   18 May 2010; Maciej Mrozowski <reavertm@gentoo.org>
   -kdevplatform-0.9.95.ebuild, -kdevplatform-0.9.99.ebuild,

diff --git a/dev-util/kdevplatform/Manifest b/dev-util/kdevplatform/Manifest
index f9aa5f9715d3441392cfb89f9a57bbaa33792635..bad585c313501223cbd9ec86662bd4f35d2f0c93 100644 (file)
--- a/dev-util/kdevplatform/Manifest
+++ b/dev-util/kdevplatform/Manifest
@@ -1,6 +1,7 @@
+AUX kdevplatform-1.0.0-preserve-remote-URI.patch 1023 RMD160 04a8ea38c734301ca2fa1604e2ad51c5673c16f7 SHA1 171484f48eff28161fbcf8be601924cff13cd7e5 SHA256 3436030e82fb82096c5432b7625cd33df33887effcb4dd258bd667e9df5228aa
 DIST kdevplatform-0.9.97.tar.bz2 1008807 RMD160 033ff8cb652dba64c61d5317cfb2f28e132ef038 SHA1 93819d3b0201e2648035b5e137aaaf40ef65b8fe SHA256 c378900c6d96014fd48e4939883f2e2c4a29b8fadc5ea22bdf64216720d36401
 DIST kdevplatform-1.0.0.tar.bz2 1510527 RMD160 96b8ef7cb86391bc4e5beea36aea4da75c4c7fde SHA1 e3da68fa73ddd268b4902d74c43c0493e3fcf286 SHA256 46fd36686d454b268b70b4af966e3614fc3891b0d99606a3f61fffcd61890f17
 EBUILD kdevplatform-0.9.97-r1.ebuild 1604 RMD160 c79bf594df34afc50b565bd5ea98a556236c9b21 SHA1 68eb3486463c7ba43e8521f2ed3d08ddb17e263c SHA256 febef1ff3ee030d9de4225c8513b49efed2039b076e730ce1ebc0d2cd67d04f6
-EBUILD kdevplatform-1.0.0.ebuild 1530 RMD160 44ef6e55b160a00c4bc27e54b9e674c9e280704e SHA1 8841d18dcbc5999dd45ebd193760e7be52751d27 SHA256 8dd33b38e1dbd23bdb5580890a75ab09eeed960b3763d9a7c669cd63879e89ac
-MISC ChangeLog 4096 RMD160 2e10f305bbbc393d635228990196ae4b6fd5641a SHA1 1bd3350cc75560e48dfd24ebd143f8c845069277 SHA256 d17abbb3a1150d6f473781a4be90a9463d06b332e18b38e276b7ef8b0ffc852d
+EBUILD kdevplatform-1.0.0-r1.ebuild 1605 RMD160 647b08ac78b70c1acd80a8d86fe27e255448aa92 SHA1 23746f0231db1dc9c90ea2c61dc7622548704b34 SHA256 11bd3485e5a4540e3c7c2d289f87812c64772a8154b013a8234dfa8bea675df4
+MISC ChangeLog 4341 RMD160 962b923afa9f17641437110c3e93785765312cf8 SHA1 35ed520727f84c905bb869cd9455dd21e9cf987f SHA256 8109402fbcbc40934abc13ffceda1fc2fc6f37ed8e4046232a0be69e13f96d19
 MISC metadata.xml 229 RMD160 e40d33a7f6561fcca63f76bd36f7248a865baf2d SHA1 6be7ca236738544a58ee54f7f599b04d3b298445 SHA256 81c30cbeff08722eb14f0d02dc56146ca88c04459b98d3864142488eace66d86

diff --git a/dev-util/kdevplatform/files/kdevplatform-1.0.0-preserve-remote-URI.patch b/dev-util/kdevplatform/files/kdevplatform-1.0.0-preserve-remote-URI.patch
new file mode 100644 (file)
index 0000000..3edbc17
--- /dev/null
+++ b/dev-util/kdevplatform/files/kdevplatform-1.0.0-preserve-remote-URI.patch
@@ -0,0 +1,25 @@
+commit 2dcbfa0c9de95499902a2313d70ec4422b020770
+Author: Andreas Pakulat <apaku@gmx.de>
+Date:   Wed May 19 09:36:47 2010 +0200
+
+    Use the complete url of the active document.
+    
+    Don't just use the directory, use the complete url of the active
+    document and go up one step. This fixes the default-dir when working
+    with remote url.
+    
+    BUG:238094
+
+diff --git a/shell/documentcontroller.cpp b/shell/documentcontroller.cpp
+index 2288972..6d9344f 100644
+--- a/shell/documentcontroller.cpp
++++ b/shell/documentcontroller.cpp
+@@ -176,7 +176,7 @@ struct DocumentControllerPrivate {
+             KUrl dir;
+             if( controller->activeDocument() )
+             {
+-                dir = KUrl( controller->activeDocument()->url().directory() );
++                dir = controller->activeDocument()->url().upUrl();
+             }else
+             {
+                 dir = KGlobal::config()->group("Open File").readEntry( "Last Open File Directory", Core::self()->projectController()->projectsBaseDirectory() );

diff --git a/dev-util/kdevplatform/kdevplatform-1.0.0.ebuild b/dev-util/kdevplatform/kdevplatform-1.0.0-r1.ebuild
similarity index 91%
rename from dev-util/kdevplatform/kdevplatform-1.0.0.ebuild
rename to dev-util/kdevplatform/kdevplatform-1.0.0-r1.ebuild
index 45d6df2f1bab257c59729db9d27e5bab9e20865c..359d822e2155be305c5df20e02dd7ffb85bd61e0 100644 (file)
--- a/dev-util/kdevplatform/kdevplatform-1.0.0.ebuild
+++ b/dev-util/kdevplatform/kdevplatform-1.0.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/kdevplatform-1.0.0.ebuild,v 1.2 2010/05/15 22:33:55 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/kdevplatform-1.0.0-r1.ebuild,v 1.1 2010/06/05 19:59:54 reavertm Exp $
 
 EAPI="2"
 
@@ -34,6 +34,10 @@ RDEPEND="${DEPEND}
        !<dev-util/kdevelop-${KDEVELOP_VERSION}
 "
 
+PATCHES=(
+       "${FILESDIR}/${P}-preserve-remote-URI.patch" # bug 319625
+)
+
 src_prepare() {
        kde4-base_src_prepare