gentoo resync : 17.02.2020

3 files changed, 70 insertions, 1 deletions

diff --git a/kde-apps/dolphin/Manifest b/kde-apps/dolphin/Manifest
index 356e014f40d4..ffc1b2ee3e2a 100644
--- a/kde-apps/dolphin/Manifest
+++ b/kde-apps/dolphin/Manifest
@@ -1,5 +1,6 @@
+AUX dolphin-19.12.2-create-new-consistency.patch 2399 BLAKE2B f4f11330e7a7f31085556df24f0cb71f644b8caf21e2871b5bbfa63a922cc0b7fd3268be4c60887cb281c03060e55450515f001790b5b5c6016a833f966e38a6 SHA512 d03e5ddbd428f7b4b1eae1496ae4bbad0985b16ab2f94b63ce09ad0fbf3cf03bd6ad12811b4f88639b29e5bce330d40bffeef0da9098d6b49f42c2974d51ad4d
 DIST dolphin-19.08.3.tar.xz 5276344 BLAKE2B f894ab567be12bd3c6194c84897c13201a286064f9b1e10690b88433ae712d4d14870783d729d1d61fde89700709ae75262111684ef592e66c1c3c66bb606e9d SHA512 4390f97398b437b24f0139982e068e32a042a0740790b7dbf19747cd77b41c70dd04f0c6ba3120775f8ce48f43bdd3d2cff4590ba5556773950dd73dd9f7aad0
 DIST dolphin-19.12.2.tar.xz 4778864 BLAKE2B d334e1d672a5856be0a13588f4238e0866eda11205b7284cb0e20b9f933b65168ab7a26c7aa716453bc2ef1d107c88a30feb595022abe93ea98a0ee98753dd9f SHA512 c9b43a3e923e6f261225ab7ebc0a35722f4aba197015e48739c7b0cc442dfa227875b55e85a28c8703abdfab7b592432d14ca3560155e59ad39a4542345646dc
 EBUILD dolphin-19.08.3.ebuild 2895 BLAKE2B 5330439a85c94fb18a97bb6066f03e9e58706fb69c423cd8afe68da49a935bd109f6835d0cb5c90658e125cf2019f86c3fdf3d610ac3b2f288ee544d28f9761b SHA512 6b454883f6ee0ea7b56f68a5fc76cdd90179f6982ebee89564d0cd2aa9e8336d3aac320459e69c52df361b2d1d232cdecc226147b2c85de12c52d321814f87f4
-EBUILD dolphin-19.12.2.ebuild 2914 BLAKE2B 5d352b8c5e855fc3b431ea30f679dcac689f75b1b17e02f1c2d0f36314af57a75a4efeb01d56761e5923db82f6d72cbbf04ed7381dc68dbe555aa6f121680d0c SHA512 226b6f3b8011fcceca5fb7a50d6d49f6f80b1af286e4070ec537b3d50338fc9852e7f05aa5df8cc5fc4d8787a50900afc5c0583ebd33a4821d64b48391d0e426
+EBUILD dolphin-19.12.2-r1.ebuild 2988 BLAKE2B 9ae1ddea9dc3ff22d588db271d3afe659cb32c68c8692945915e3286b9dd706a6a890d6b3e99c9bb350a1321785756f1e1466e63a0721ae05ed20f6e0a082721 SHA512 3f0893a8169b1604843c20524bb684657cd8a59f01b428c674a59e37397dd74c3316620b31a17686f9247f57db03a268f0d46c3e3d169a22a02aded5bf8bb913
 MISC metadata.xml 361 BLAKE2B 1974fb2be150af6e3276e6c55b54b4659fcdd781b58228b60bea6ceb605f0a5b412d5b6451231b47fd67856ecf9486dd30e3d440b6e9a35d1566fc09de9a5cd9 SHA512 2fea432f0da8502acb0e2bc467e6c010a54612c2850de6abf422304e8d260a5417f7361f66c6a697ae9e138d3b6714e3d8121ae4904e24804abc188758576176
diff --git a/kde-apps/dolphin/dolphin-19.12.2.ebuild b/kde-apps/dolphin/dolphin-19.12.2-r1.ebuild
index 1dae379b7beb..5d2d40673864 100644
--- a/kde-apps/dolphin/dolphin-19.12.2.ebuild
+++ b/kde-apps/dolphin/dolphin-19.12.2-r1.ebuild
@@ -64,6 +64,8 @@ RDEPEND="${DEPEND}
 
 RESTRICT+=" test"
 
+PATCHES=( "${FILESDIR}/${P}-create-new-consistency.patch" ) # from 20.04
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package activities KF5Activities)
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
new file mode 100644
index 000000000000..dc70220d9568
--- /dev/null
+++ b/kde-apps/dolphin/files/dolphin-19.12.2-create-new-consistency.patch
@@ -0,0 +1,66 @@
+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