diff options
| author |   Maciej Mrozowski <reavertm@gentoo.org> | 2010-06-05 19:59:54 +0000 |
|---|---|---|
| committer | Maciej Mrozowski <reavertm@gentoo.org> | 2010-06-05 19:59:54 +0000 |
| commit | 6d094d800607204391bf7ad3ca4827bfa27fe859 (patch) | |
| tree | 859de3b00ce04e238280f826b262332a29f948c8 /dev-util/kdevplatform | |
| parent | Rename local sched.h to avoid C library conflicts. (diff) | |
| download | gentoo-2-6d094d800607204391bf7ad3ca4827bfa27fe859.tar.gz gentoo-2-6d094d800607204391bf7ad3ca4827bfa27fe859.tar.bz2 gentoo-2-6d094d800607204391bf7ad3ca4827bfa27fe859.zip | |
Add project URI patch, bug 319625
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-util/kdevplatform')
| -rw-r--r-- | dev-util/kdevplatform/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-util/kdevplatform/files/kdevplatform-1.0.0-preserve-remote-URI.patch | 25 | ||||
| -rw-r--r-- | dev-util/kdevplatform/kdevplatform-1.0.0-r1.ebuild (renamed from dev-util/kdevplatform/kdevplatform-1.0.0.ebuild) | 6 |
3 files changed, 38 insertions, 2 deletions
diff --git a/dev-util/kdevplatform/ChangeLog b/dev-util/kdevplatform/ChangeLog index 8c8c5328e377..648430362f46 100644 --- 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/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 index 000000000000..3edbc176761b --- /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 index 45d6df2f1bab..359d822e2155 100644 --- 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 |