Revision bump to backport patches. Move from kde-testing.

Package-Manager: portage-2.2_rc44/cvs/Linux i686
RepoMan-Options: --force

4 files changed, 49 insertions, 4 deletions

diff --git a/kde-base/dolphin/ChangeLog b/kde-base/dolphin/ChangeLog
index 73d3386fe3f5..0423396d402c 100644
--- a/kde-base/dolphin/ChangeLog
+++ b/kde-base/dolphin/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for kde-base/dolphin
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/ChangeLog,v 1.43 2009/10/08 13:42:31 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/ChangeLog,v 1.44 2009/10/09 16:52:53 scarabeus Exp $
+
+*dolphin-4.3.2-r1 (09 Oct 2009)
+*dolphin-4.3.1-r1 (09 Oct 2009)
+
+  09 Oct 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  -dolphin-4.3.1.ebuild, +dolphin-4.3.1-r1.ebuild,
+  +files/dolphin-4.3.1-fix-sftp-crash.patch, -dolphin-4.3.2.ebuild,
+  +dolphin-4.3.2-r1.ebuild:
+  Revision bump to backport patches. Move from kde-testing.
 
   08 Oct 2009; Alexey Shvetsov <alexxy@gentoo.org> -dolphin-4.3.0-r1.ebuild:
   Drop KDE 4.3.0
diff --git a/kde-base/dolphin/dolphin-4.3.2.ebuild b/kde-base/dolphin/dolphin-4.3.1-r1.ebuild
index ff228494628a..718e140c8cf6 100644
--- a/kde-base/dolphin/dolphin-4.3.2.ebuild
+++ b/kde-base/dolphin/dolphin-4.3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/dolphin-4.3.2.ebuild,v 1.2 2009/10/06 20:53:01 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/dolphin-4.3.1-r1.ebuild,v 1.1 2009/10/09 16:52:53 scarabeus Exp $
 
 EAPI="2"
 
@@ -26,6 +26,10 @@ PDEPEND="
 
 KMLOADLIBS="libkonq"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-4.3.1-fix-sftp-crash.patch"
+)
+
 src_configure() {
 	mycmakeargs="${mycmakeargs}
 		$(cmake-utils_use_with semantic-desktop Nepomuk)
diff --git a/kde-base/dolphin/dolphin-4.3.1.ebuild b/kde-base/dolphin/dolphin-4.3.2-r1.ebuild
index b3afcc66c815..ff5c6382bf36 100644
--- a/kde-base/dolphin/dolphin-4.3.1.ebuild
+++ b/kde-base/dolphin/dolphin-4.3.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/dolphin-4.3.1.ebuild,v 1.1 2009/09/01 14:44:51 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/dolphin-4.3.2-r1.ebuild,v 1.1 2009/10/09 16:52:53 scarabeus Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="debug +handbook +semantic-desktop thumbnail"
 
 DEPEND="
-	>=kde-base/kdelibs-${PV}:${SLOT}[kdeprefix=,semantic-desktop=]
+	>=kde-base/kdelibs-${PV}:${SLOT}[kdeprefix=,semantic-desktop?]
 	>=kde-base/libkonq-${PV}:${SLOT}[kdeprefix=]
 "
 RDEPEND="${DEPEND}
@@ -26,6 +26,10 @@ PDEPEND="
 
 KMLOADLIBS="libkonq"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-4.3.1-fix-sftp-crash.patch"
+)
+
 src_configure() {
 	mycmakeargs="${mycmakeargs}
 		$(cmake-utils_use_with semantic-desktop Nepomuk)
diff --git a/kde-base/dolphin/files/dolphin-4.3.1-fix-sftp-crash.patch b/kde-base/dolphin/files/dolphin-4.3.1-fix-sftp-crash.patch
new file mode 100644
index 000000000000..a8f0551a9a9c
--- /dev/null
+++ b/kde-base/dolphin/files/dolphin-4.3.1-fix-sftp-crash.patch
@@ -0,0 +1,28 @@
+Index: dolphin/src/panels/terminal/terminalpanel.cpp
+===================================================================
+--- dolphin/src/panels/terminal/terminalpanel.cpp	(revision 1032179)
++++ dolphin/src/panels/terminal/terminalpanel.cpp	(revision 1032180)
+@@ -23,7 +23,6 @@
+ #include <kde_terminal_interface_v2.h>
+ #include <kparts/part.h>
+ #include <kshell.h>
+-#include <kio/netaccess.h>
+ 
+ #include <QBoxLayout>
+ #include <QShowEvent>
+@@ -58,13 +57,12 @@
+     }
+ 
+     Panel::setUrl(url);
+-    KUrl mostLocalUrl = KIO::NetAccess::mostLocalUrl(url, 0);
+     const bool sendInput = (m_terminal != 0)
+                            && (m_terminal->foregroundProcessId() == -1)
+                            && isVisible()
+-                           && mostLocalUrl.isLocalFile();
++                           && url.isLocalFile();
+     if (sendInput) {
+-        m_terminal->sendInput("cd " + KShell::quoteArg(mostLocalUrl.toLocalFile()) + '\n');
++        m_terminal->sendInput("cd " + KShell::quoteArg(url.toLocalFile()) + '\n');
+     }
+ 
+ }