diff options
| -rw-r--r-- | kde-base/dolphin/Manifest | 5 | ||||
| -rw-r--r-- | kde-base/dolphin/dolphin-4.3.1-r1.ebuild (renamed from kde-base/dolphin/dolphin-4.3.1.ebuild) | 4 | ||||
| -rw-r--r-- | kde-base/dolphin/dolphin-4.3.2-r1.ebuild | 39 | ||||
| -rw-r--r-- | kde-base/dolphin/files/dolphin-4.3.1-fix-sftp-crash.patch | 28 |
4 files changed, 75 insertions, 1 deletions
diff --git a/kde-base/dolphin/Manifest b/kde-base/dolphin/Manifest index da3de1499cf..2e7d204cbb8 100644 --- a/kde-base/dolphin/Manifest +++ b/kde-base/dolphin/Manifest @@ -1,6 +1,9 @@ +AUX dolphin-4.3.1-fix-sftp-crash.patch 1039 RMD160 dee78d022d0d5c3fcad40d12199421d73159a0a6 SHA1 a8a3e45339a93fd33a16f7c9583acc0c518dc8c9 SHA256 14dc65435d0e6734a075fb187fb791065dd51c9f06ab7c757f26b80112ec5a4e DIST kdebase-4.3.1.tar.bz2 4263214 RMD160 442706f75ba6da90cb38677c49046b313ce6b7d1 SHA1 005681277615a0a3ec737bdd07989763fa1ae781 SHA256 94fa8a8c72d85cd317422dd121ca433583b664f77ca297dc6398589a97e984b5 +DIST kdebase-4.3.2.tar.bz2 4273532 RMD160 9d34189746ee7b99840388d1a45d6ffaef795f19 SHA1 c9c65dc596c8c48974fbe4099f340371de147fa8 SHA256 b977ea8ba20bc0f7b9bf2bca026fb2032c1790510a4d5fe4cb22ac2c0ce85d6c DIST kdebase-4.3.69.tar.lzma 3856841 RMD160 3b44e44824ac3d70a3cc075d7439dd76a60b9f31 SHA1 f6741f1fec816700944aede74c310f4f2f453af3 SHA256 9ec4604bc51288cfb688dec87213d36d37ffded628c7b43c6ca7923dd8b2cd65 -EBUILD dolphin-4.3.1.ebuild 1020 RMD160 da30801fa826822b1db2793124afedaf918f6732 SHA1 9ded1672ae319b59a6d375cd13e23d9aa8306bdf SHA256 813e9bd383c3e6e712ad3fdd81c6994aca6c1233ec97cf59bea8f50fe0019955 +EBUILD dolphin-4.3.1-r1.ebuild 1081 RMD160 76a975935bb2bdbcc49ff6d6bcd5d4c48c87ff72 SHA1 7146e9e42211178c369676be4f6c67aa1e7fd2ca SHA256 248fd3e9f25cddd784a32e3dcc395a1be1c1febcdd86f1bb0241c9d712b82660 +EBUILD dolphin-4.3.2-r1.ebuild 1078 RMD160 5a4bfd8b42d63818c6b81e05cd9be4a180072c90 SHA1 a029525b7f1b0a9786f436415ba0a14614573e12 SHA256 6b1e2fd92b17eb6980cb05cd5e9ebb25118157b220b48454276b5684bd701e77 EBUILD dolphin-4.3.69.ebuild 918 RMD160 3572633770448938d2bd5435e769baebfc58f092 SHA1 953b34551c3791072ed2651587ac4e66adece324 SHA256 6c4c014556756e63dadb88e1fff8a166ae43ca898e799ec587cd73021832fedd EBUILD dolphin-4.3.9999.ebuild 876 RMD160 fa24d0b404ee577ede179faea5c8fcb9b3413db3 SHA1 75659c200283c2cdd453789f0c701bc57837a034 SHA256 6eecbb9e62cd6eb8d24a9f4b710a4b6a0fc4087652ec4fad4a52327b43377e03 EBUILD dolphin-9999.ebuild 770 RMD160 3636bcc877fe318c43803866eb790d6ead4497f4 SHA1 49d027c5c74f76823e0d773711e11cd7443749df SHA256 da4cab239981596a9fbc546d2833884607fd4b0e5368dbc90d6bbe8019ac58d6 diff --git a/kde-base/dolphin/dolphin-4.3.1.ebuild b/kde-base/dolphin/dolphin-4.3.1-r1.ebuild index 677ceb43842..ba30c05c19d 100644 --- a/kde-base/dolphin/dolphin-4.3.1.ebuild +++ b/kde-base/dolphin/dolphin-4.3.1-r1.ebuild @@ -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.2-r1.ebuild b/kde-base/dolphin/dolphin-4.3.2-r1.ebuild new file mode 100644 index 00000000000..7583e47b6f7 --- /dev/null +++ b/kde-base/dolphin/dolphin-4.3.2-r1.ebuild @@ -0,0 +1,39 @@ +# 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 $ + +EAPI="2" + +KMNAME="kdebase-apps" +inherit kde4-meta + +DESCRIPTION="A KDE filemanager focusing on usability" +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/libkonq-${PV}:${SLOT}[kdeprefix=] +" +RDEPEND="${DEPEND} + >=kde-base/keditfiletype-${PV}:${SLOT}[kdeprefix=] + >=kde-base/kfind-${PV}:${SLOT}[kdeprefix=] + semantic-desktop? ( >=kde-base/nepomuk-${PV}:${SLOT}[kdeprefix=] ) +" +PDEPEND=" + thumbnail? ( >=kde-base/mplayerthumbs-${PV}:${SLOT}[kdeprefix=] ) +" + +KMLOADLIBS="libkonq" + +PATCHES=( + "${FILESDIR}/${PN}-4.3.1-fix-sftp-crash.patch" +) + +src_configure() { + mycmakeargs="${mycmakeargs} + $(cmake-utils_use_with semantic-desktop Nepomuk) + $(cmake-utils_use_with semantic-desktop Soprano)" + + kde4-meta_src_configure +} 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 00000000000..a8f0551a9a9 --- /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'); + } + + } |