summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2020-07-18 11:22:26 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2020-08-04 08:34:44 +0200
commitd9dbf8858d07f366c70940dfeb7778b3e8bcb356 (patch)
treeb7b0e180672ae272d910ac281dcfe695e7a52c90 /kde-apps/dolphin/files
parentkde-apps/baloo-widgets: drop 19.12.3* (diff)
downloadgentoo-d9dbf8858d07f366c70940dfeb7778b3e8bcb356.tar.gz
gentoo-d9dbf8858d07f366c70940dfeb7778b3e8bcb356.tar.bz2
gentoo-d9dbf8858d07f366c70940dfeb7778b3e8bcb356.zip
kde-apps/dolphin: drop 19.12.3*
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-apps/dolphin/files')
-rw-r--r--kde-apps/dolphin/files/dolphin-19.12.2-create-new-consistency.patch66
-rw-r--r--kde-apps/dolphin/files/dolphin-19.12.3-fix-crash-w-qt-5.14.2.patch22
2 files changed, 0 insertions, 88 deletions
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 dc70220d956..00000000000
--- 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 3e5245001bb..00000000000
--- 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);
- }