diff options
| -rw-r--r-- | kde-apps/dolphin/Manifest | 1 | ||||
| -rw-r--r-- | kde-apps/dolphin/dolphin-19.12.3-r1.ebuild | 102 | ||||
| -rw-r--r-- | kde-apps/dolphin/files/dolphin-19.12.2-create-new-consistency.patch | 66 | ||||
| -rw-r--r-- | kde-apps/dolphin/files/dolphin-19.12.3-fix-crash-w-qt-5.14.2.patch | 22 |
4 files changed, 0 insertions, 191 deletions
diff --git a/kde-apps/dolphin/Manifest b/kde-apps/dolphin/Manifest index d17918d0a5d0..c84d2bbf1207 100644 --- a/kde-apps/dolphin/Manifest +++ b/kde-apps/dolphin/Manifest @@ -1,2 +1 @@ -DIST dolphin-19.12.3.tar.xz 4781456 BLAKE2B 310d0ea5e25b5d934bd501ac0c9bed15a4545b6b16299ad138715b6a33f20edd91675af679bb4249fd523fbf5ffe57c12cc1d7691a167e1783648698a533d584 SHA512 d4922774adea1aa5f68654f5fc0db5e2da653487ffbf8bc519d1b03f141355cedfb4d52aebf6570ab2fb40a0edac2bba42ecece983cbf31dca2ee02fa3b98fb5 DIST dolphin-20.04.3.tar.xz 4798732 BLAKE2B 080fbe7c2a5156623f6558caaa980aa9202e0e0a21330d7b1bc7800d790daa60a6c4c90a9d5806a9330b0d29908bf1ef755d0900560613e137cdd1e80b28fdac SHA512 fc4ad5ff645387d7a058cff42db00d55db8b0cb7793cdc3adbbaff2e8465c469a5ad6040625bfde564e18c25c16ae3962d6eb7ac9618e0ae8783a2fe030fc5ca diff --git a/kde-apps/dolphin/dolphin-19.12.3-r1.ebuild b/kde-apps/dolphin/dolphin-19.12.3-r1.ebuild deleted file mode 100644 index 0af7ad212f43..000000000000 --- a/kde-apps/dolphin/dolphin-19.12.3-r1.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_HANDBOOK="forceoptional" -ECM_TEST="true" -PVCUT=$(ver_cut 1-3) -KFMIN=5.63.0 -QTMIN=5.12.3 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="Plasma filemanager focusing on usability" -HOMEPAGE="https://kde.org/applications/system/org.kde.dolphin -https://userbase.kde.org/Dolphin" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="amd64 arm64 ~ppc64 x86" -IUSE="activities semantic-desktop" - -DEPEND=" - >=kde-frameworks/kbookmarks-${KFMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kcodecs-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kinit-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kitemviews-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/solid-${KFMIN}:5 - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - media-libs/phonon[qt5(+)] - activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 ) - semantic-desktop? ( - >=kde-frameworks/baloo-${KFMIN}:5 - >=kde-frameworks/kfilemetadata-${KFMIN}:5 - >=kde-apps/baloo-widgets-${PVCUT}:5 - ) -" -RDEPEND="${DEPEND} - >=kde-apps/kio-extras-${PVCUT}:5 -" - -RESTRICT+=" test" - -PATCHES=( - "${FILESDIR}/${PN}-19.12.2-create-new-consistency.patch" # from 20.04 - "${FILESDIR}/${P}-fix-crash-w-qt-5.14.2.patch" # KDE-Bug 419585 -) - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package activities KF5Activities) - $(cmake_use_find_package semantic-desktop KF5Baloo) - $(cmake_use_find_package semantic-desktop KF5BalooWidgets) - $(cmake_use_find_package semantic-desktop KF5FileMetaData) - ) - - ecm_src_configure -} - -pkg_postinst() { - ecm_pkg_postinst - - if [[ -z "${REPLACING_VERSIONS}" ]]; then - has_version "kde-apps/ark:${SLOT}" || \ - elog "For compress/extract and other actions install kde-apps/ark:${SLOT}" - - has_version "kde-apps/kleopatra:${SLOT}" || \ - elog "For crypto actions install kde-apps/kleopatra:${SLOT}" - - has_version "kde-apps/ffmpegthumbs:${SLOT}" || \ - elog "For video file thumbnails install kde-apps/ffmpegthumbs:${SLOT}" - - has_version "kde-apps/thumbnailers:${SLOT}" || \ - elog "For graphics file thumbnails install kde-apps/thumbnailers:${SLOT}" - - has_version "kde-frameworks/purpose:${SLOT}" || \ - elog "For 'Share' context menu actions install kde-frameworks/purpose:${SLOT}" - fi -} diff --git a/kde-apps/dolphin/files/dolphin-19.12.2-create-new-consistency.patch b/kde-apps/dolphin/files/dolphin-19.12.2-create-new-consistency.patch deleted file mode 100644 index dc70220d9568..000000000000 --- a/kde-apps/dolphin/files/dolphin-19.12.2-create-new-consistency.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 4c923a531f77bc4c44b5c8687fe18dd6438eb9c5 Mon Sep 17 00:00:00 2001 -From: Nate Graham <nate@kde.org> -Date: Sun, 9 Feb 2020 08:58:10 -0700 -Subject: Restore former position of "Create New" menu item in viewport context - menu - -Summary: -I've seem various complaints from users about the fact that the {nav Create New...} menu -item in the viewport context menu is now below {nav Open With} item. All the other -changes to menus seem to have been well-received but this one has garnered criticism. -Looking through D23757 and D11884, I can't actually see that this was intentional, so -it might even be a bug. - -Either way, this patch restores the old position of the {nav Create New} menu items at -the top of the Viewport context menu. - -BUG: 417640 -FIXED-IN: 20.04.0 - -Test Plan: {F8093605} - -Reviewers: #vdg, #dolphin, elvisangelaccio, ndavis - -Reviewed By: #vdg, ndavis - -Subscribers: asturmlechner, markuss, kfm-devel - -Tags: #dolphin - -Differential Revision: https://phabricator.kde.org/D27267 ---- - src/dolphincontextmenu.cpp | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp -index 79143d4..9f39671 100644 ---- a/src/dolphincontextmenu.cpp -+++ b/src/dolphincontextmenu.cpp -@@ -342,12 +342,6 @@ void DolphinContextMenu::openViewportContextMenu() - fileItemActions.setParentWidget(m_mainWindow); - fileItemActions.setItemListProperties(baseUrlProperties); - -- // Don't show "Open With" menu items if the current dir is empty, because there's -- // generally no app that can do anything interesting with an empty directory -- if (view->itemsCount() != 0) { -- addOpenWithActions(fileItemActions); -- } -- - // Set up and insert 'Create New' menu - KNewFileMenu* newFileMenu = m_mainWindow->newFileMenu(); - newFileMenu->setViewShowsHiddenFiles(view->hiddenFilesShown()); -@@ -355,6 +349,12 @@ void DolphinContextMenu::openViewportContextMenu() - newFileMenu->setPopupFiles(QList<QUrl>() << m_baseUrl); - addMenu(newFileMenu->menu()); - -+ // Don't show "Open With" menu items if the current dir is empty, because there's -+ // generally no app that can do anything interesting with an empty directory -+ if (view->itemsCount() != 0) { -+ addOpenWithActions(fileItemActions); -+ } -+ - QAction* pasteAction = createPasteAction(); - addAction(pasteAction); - --- -cgit v1.1 diff --git a/kde-apps/dolphin/files/dolphin-19.12.3-fix-crash-w-qt-5.14.2.patch b/kde-apps/dolphin/files/dolphin-19.12.3-fix-crash-w-qt-5.14.2.patch deleted file mode 100644 index 3e5245001bb3..000000000000 --- a/kde-apps/dolphin/files/dolphin-19.12.3-fix-crash-w-qt-5.14.2.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp ---- a/src/kitemviews/kfileitemmodel.cpp -+++ b/src/kitemviews/kfileitemmodel.cpp -@@ -33,6 +33,9 @@ - #include <QMimeData> - #include <QTimer> - #include <QWidget> -+#include <QMutex> -+ -+Q_GLOBAL_STATIC_WITH_ARGS(QMutex, s_collatorMutex, (QMutex::Recursive)) - - // #define KFILEITEMMODEL_DEBUG - -@@ -1878,6 +1881,8 @@ - - int KFileItemModel::stringCompare(const QString& a, const QString& b, const QCollator& collator) const - { -+ QMutexLocker collatorLock(s_collatorMutex()); -+ - if (m_naturalSorting) { - return collator.compare(a, b); - } |