From dd44313751521151b59dc789750d97e4c28700ef Mon Sep 17 00:00:00 2001 From: Johannes Huber Date: Sat, 9 Nov 2013 13:43:52 +0000 Subject: Revision bump adds upstream patch announced on packagers ml. Patch fixes clicking the trash plasmoid or starting Dolphin from the command line with a URL that includes another kioslave will just open the home folder. (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD) --- kde-base/dolphin/ChangeLog | 10 +++- kde-base/dolphin/dolphin-4.11.3-r1.ebuild | 62 ++++++++++++++++++++++ kde-base/dolphin/dolphin-4.11.3.ebuild | 60 --------------------- .../dolphin/files/dolphin-4.11.3-regression.patch | 61 +++++++++++++++++++++ 4 files changed, 132 insertions(+), 61 deletions(-) create mode 100644 kde-base/dolphin/dolphin-4.11.3-r1.ebuild delete mode 100644 kde-base/dolphin/dolphin-4.11.3.ebuild create mode 100644 kde-base/dolphin/files/dolphin-4.11.3-regression.patch (limited to 'kde-base/dolphin') diff --git a/kde-base/dolphin/ChangeLog b/kde-base/dolphin/ChangeLog index 5182bbc1f252..075a322527da 100644 --- a/kde-base/dolphin/ChangeLog +++ b/kde-base/dolphin/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for kde-base/dolphin # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/ChangeLog,v 1.208 2013/11/05 22:23:21 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/ChangeLog,v 1.209 2013/11/09 13:43:52 johu Exp $ + +*dolphin-4.11.3-r1 (09 Nov 2013) + + 09 Nov 2013; Johannes Huber +dolphin-4.11.3-r1.ebuild, + +files/dolphin-4.11.3-regression.patch, -dolphin-4.11.3.ebuild: + Revision bump adds upstream patch announced on packagers ml. Patch fixes + clicking the trash plasmoid or starting Dolphin from the command line with a + URL that includes another kioslave will just open the home folder. *dolphin-4.11.3 (05 Nov 2013) diff --git a/kde-base/dolphin/dolphin-4.11.3-r1.ebuild b/kde-base/dolphin/dolphin-4.11.3-r1.ebuild new file mode 100644 index 000000000000..1021f9b1c985 --- /dev/null +++ b/kde-base/dolphin/dolphin-4.11.3-r1.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/dolphin-4.11.3-r1.ebuild,v 1.1 2013/11/09 13:43:52 johu Exp $ + +EAPI=5 + +KDE_HANDBOOK="optional" +KMNAME="kde-baseapps" +inherit kde4-meta + +DESCRIPTION="A KDE filemanager focusing on usability" +HOMEPAGE="http://dolphin.kde.org http://www.kde.org/applications/system/dolphin" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="debug semantic-desktop thumbnail" + +DEPEND=" + $(add_kdebase_dep kactivities) + $(add_kdebase_dep kdelibs 'semantic-desktop?') + $(add_kdebase_dep libkonq) + x11-libs/libXrender + semantic-desktop? ( + >=dev-libs/shared-desktop-ontologies-0.11.0 + dev-libs/soprano + $(add_kdebase_dep nepomuk-core) + $(add_kdebase_dep nepomuk-widgets) + ) +" +RDEPEND="${DEPEND} + $(add_kdebase_dep kfind) +" +PDEPEND=" + thumbnail? ( + $(add_kdebase_dep thumbnailers) + || ( + $(add_kdebase_dep ffmpegthumbs) + $(add_kdebase_dep mplayerthumbs) + ) + ) +" + +RESTRICT="test" +# bug 393129 + +PATCHES=( "${FILESDIR}/${P}-regression.patch" ) + +src_configure() { + mycmakeargs=( + $(cmake-utils_use_with semantic-desktop NepomukCore) + $(cmake-utils_use_with semantic-desktop NepomukWidgets) + $(cmake-utils_use_with semantic-desktop Soprano) + ) + + kde4-meta_src_configure +} + +pkg_postinst() { + kde4-base_pkg_postinst + + if ! has_version media-gfx/icoutils ; then + elog "For .exe file preview support, install media-gfx/icoutils." + fi +} diff --git a/kde-base/dolphin/dolphin-4.11.3.ebuild b/kde-base/dolphin/dolphin-4.11.3.ebuild deleted file mode 100644 index b197f55b8f27..000000000000 --- a/kde-base/dolphin/dolphin-4.11.3.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/dolphin-4.11.3.ebuild,v 1.1 2013/11/05 22:23:21 dilfridge Exp $ - -EAPI=5 - -KDE_HANDBOOK="optional" -KMNAME="kde-baseapps" -inherit kde4-meta - -DESCRIPTION="A KDE filemanager focusing on usability" -HOMEPAGE="http://dolphin.kde.org http://www.kde.org/applications/system/dolphin" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="debug semantic-desktop thumbnail" - -DEPEND=" - $(add_kdebase_dep kactivities) - $(add_kdebase_dep kdelibs 'semantic-desktop?') - $(add_kdebase_dep libkonq) - x11-libs/libXrender - semantic-desktop? ( - >=dev-libs/shared-desktop-ontologies-0.11.0 - dev-libs/soprano - $(add_kdebase_dep nepomuk-core) - $(add_kdebase_dep nepomuk-widgets) - ) -" -RDEPEND="${DEPEND} - $(add_kdebase_dep kfind) -" -PDEPEND=" - thumbnail? ( - $(add_kdebase_dep thumbnailers) - || ( - $(add_kdebase_dep ffmpegthumbs) - $(add_kdebase_dep mplayerthumbs) - ) - ) -" - -RESTRICT="test" -# bug 393129 - -src_configure() { - mycmakeargs=( - $(cmake-utils_use_with semantic-desktop NepomukCore) - $(cmake-utils_use_with semantic-desktop NepomukWidgets) - $(cmake-utils_use_with semantic-desktop Soprano) - ) - - kde4-meta_src_configure -} - -pkg_postinst() { - kde4-base_pkg_postinst - - if ! has_version media-gfx/icoutils ; then - elog "For .exe file preview support, install media-gfx/icoutils." - fi -} diff --git a/kde-base/dolphin/files/dolphin-4.11.3-regression.patch b/kde-base/dolphin/files/dolphin-4.11.3-regression.patch new file mode 100644 index 000000000000..d27c176faa27 --- /dev/null +++ b/kde-base/dolphin/files/dolphin-4.11.3-regression.patch @@ -0,0 +1,61 @@ +commit 1c856e44774a7ce8eb6dce6828ef689647f83ca4 +Author: Wolfgang Bauer +Date: Wed Nov 6 16:46:09 2013 +0100 + + Revert "Files passed as arguments: Ignore unsupported files" + + This reverts commit cd9e50ae4f3ded5a78d0cfb09a67684a9c15d726. + + See bug#327224 for details. + +diff --git a/dolphin/src/dolphinmainwindow.cpp b/dolphin/src/dolphinmainwindow.cpp +index 9da73f9..b477600 100644 +--- a/dolphin/src/dolphinmainwindow.cpp ++++ b/dolphin/src/dolphinmainwindow.cpp +@@ -31,7 +31,6 @@ + #include "panels/information/informationpanel.h" + #include "settings/dolphinsettingsdialog.h" + #include "statusbar/dolphinstatusbar.h" +-#include "views/dolphinview.h" + #include "views/dolphinviewactionhandler.h" + #include "views/dolphinremoteencoding.h" + #include "views/draganddrophelper.h" +@@ -244,20 +243,8 @@ void DolphinMainWindow::openDirectories(const QList& dirs) + return; + } + +- // dirs could contain URLs that actually point to archives or other files. +- // Replace them by URLs we can open where possible and filter the rest out. +- QList urlsToOpen; +- foreach (const KUrl& rawUrl, dirs) { +- const KFileItem& item = KFileItem(KFileItem::Unknown, KFileItem::Unknown, rawUrl); +- item.determineMimeType(); +- const KUrl& url = DolphinView::openItemAsFolderUrl(item); +- if (!url.isEmpty()) { +- urlsToOpen.append(url); +- } +- } +- +- if (urlsToOpen.count() == 1) { +- m_activeViewContainer->setUrl(urlsToOpen.first()); ++ if (dirs.count() == 1) { ++ m_activeViewContainer->setUrl(dirs.first()); + return; + } + +@@ -267,12 +254,12 @@ void DolphinMainWindow::openDirectories(const QList& dirs) + + // Open each directory inside a new tab. If the "split view" option has been enabled, + // always show two directories within one tab. +- QList::const_iterator it = urlsToOpen.begin(); +- while (it != urlsToOpen.end()) { ++ QList::const_iterator it = dirs.begin(); ++ while (it != dirs.end()) { + openNewTab(*it); + ++it; + +- if (hasSplitView && (it != urlsToOpen.end())) { ++ if (hasSplitView && (it != dirs.end())) { + const int tabIndex = m_viewTab.count() - 1; + m_viewTab[tabIndex].secondaryView->setUrl(*it); + ++it; -- cgit v1.2.3-65-gdbad