From 3832d2fc3370c4559437234cba560f610e698b0e Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Wed, 11 Aug 2021 08:18:16 +0200
Subject: kde-apps/dolphin: drop 20.12.3*

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---
 ...phin-20.12.3-fix-session-restore-w-o-tabs.patch | 70 ----------------------
 .../dolphin-21.04.1-fix-no-semantic-desktop.patch  | 41 -------------
 2 files changed, 111 deletions(-)
 delete mode 100644 kde-apps/dolphin/files/dolphin-20.12.3-fix-session-restore-w-o-tabs.patch
 delete mode 100644 kde-apps/dolphin/files/dolphin-21.04.1-fix-no-semantic-desktop.patch

(limited to 'kde-apps/dolphin/files')

diff --git a/kde-apps/dolphin/files/dolphin-20.12.3-fix-session-restore-w-o-tabs.patch b/kde-apps/dolphin/files/dolphin-20.12.3-fix-session-restore-w-o-tabs.patch
deleted file mode 100644
index 9605bead03cf..000000000000
--- a/kde-apps/dolphin/files/dolphin-20.12.3-fix-session-restore-w-o-tabs.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 175538020824355115cd98637ce83ecc53badd44 Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@kde.org>
-Date: Thu, 18 Mar 2021 13:42:59 -0600
-Subject: [PATCH] Don't re-open already-open URLs when using session-restore
- feature
-
-If Dolphin would be asked to open a location that is already open, don't
-open it again in a new tab; instead switch to that view. Supports tabs
-and split view.
-
-BUG: 434911
-FIXED-IN: 21.04
----
- src/dolphintabwidget.cpp | 24 ++++++++++++++++++------
- 1 file changed, 18 insertions(+), 6 deletions(-)
-
-diff --git a/src/dolphintabwidget.cpp b/src/dolphintabwidget.cpp
-index d61a9f74f..17fa0ff4e 100644
---- a/src/dolphintabwidget.cpp
-+++ b/src/dolphintabwidget.cpp
-@@ -186,14 +186,20 @@ void DolphinTabWidget::openDirectories(const QList<QUrl>& dirs, bool splitView)
- {
-     Q_ASSERT(dirs.size() > 0);
- 
-+    bool somethingWasAlreadyOpen = false;
-+
-     QList<QUrl>::const_iterator it = dirs.constBegin();
-     while (it != dirs.constEnd()) {
-         const QUrl& primaryUrl = *(it++);
-         const QPair<int, bool> indexInfo = indexByUrl(primaryUrl);
-         const int index = indexInfo.first;
-         const bool isInPrimaryView = indexInfo.second;
-+
-+        // When the user asks for a URL that's already open, activate it instead
-+        // of opening a second copy
-         if (index >= 0) {
--            setCurrentIndex(index);
-+            somethingWasAlreadyOpen = true;
-+            activateTab(index);
-             const auto tabPage = tabPageAt(index);
-             if (isInPrimaryView) {
-                 tabPage->primaryViewContainer()->setActive(true);
-@@ -204,13 +210,19 @@ void DolphinTabWidget::openDirectories(const QList<QUrl>& dirs, bool splitView)
-             // Required for updateViewState() call in openFiles() to work as expected
-             // If there is a selection, updateViewState() calls are effectively a no-op
-             tabPage->activeViewContainer()->view()->clearSelection();
--            continue;
--        }
--        if (splitView && (it != dirs.constEnd())) {
-+        } else if (splitView) {
-             const QUrl& secondaryUrl = *(it++);
--            openNewActivatedTab(primaryUrl, secondaryUrl);
-+            if (somethingWasAlreadyOpen) {
-+                openNewTab(primaryUrl, secondaryUrl);
-+            } else {
-+                openNewActivatedTab(primaryUrl, secondaryUrl);
-+            }
-         } else {
--            openNewActivatedTab(primaryUrl);
-+            if (somethingWasAlreadyOpen) {
-+                openNewTab(primaryUrl);
-+            } else {
-+                openNewActivatedTab(primaryUrl);
-+            }
-         }
-     }
- }
--- 
-GitLab
-
diff --git a/kde-apps/dolphin/files/dolphin-21.04.1-fix-no-semantic-desktop.patch b/kde-apps/dolphin/files/dolphin-21.04.1-fix-no-semantic-desktop.patch
deleted file mode 100644
index 5636d0532ed4..000000000000
--- a/kde-apps/dolphin/files/dolphin-21.04.1-fix-no-semantic-desktop.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 29636baff0f0cf8d769aa75b1c458b96cf83b828 Mon Sep 17 00:00:00 2001
-From: Ismael Asensio <isma.af@gmail.com>
-Date: Sun, 9 May 2021 21:10:44 +0200
-Subject: [PATCH] search/facetswidget: Check for protocol before trying to
- fetch tags
-
-This was causing an error when trying to list items from the
-non-existent `tags:` protocol.
-
-BUG: 435586
-FIXED-IN: 21.04.1
----
- src/search/dolphinfacetswidget.cpp | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/search/dolphinfacetswidget.cpp b/src/search/dolphinfacetswidget.cpp
-index d4079f1eb..e8a43101f 100644
---- a/src/search/dolphinfacetswidget.cpp
-+++ b/src/search/dolphinfacetswidget.cpp
-@@ -8,6 +8,7 @@
- #include "dolphinfacetswidget.h"
- 
- #include <KLocalizedString>
-+#include <KProtocolInfo>
- 
- #include <QComboBox>
- #include <QDate>
-@@ -245,7 +246,9 @@ void DolphinFacetsWidget::updateTagsSelector()
- void DolphinFacetsWidget::updateTagsMenu()
- {
-     updateTagsMenuItems({}, {});
--    m_tagsLister.openUrl(QUrl(QStringLiteral("tags:/")), KCoreDirLister::OpenUrlFlag::Reload);
-+    if (KProtocolInfo::isKnownProtocol(QStringLiteral("tags"))) {
-+        m_tagsLister.openUrl(QUrl(QStringLiteral("tags:/")), KCoreDirLister::OpenUrlFlag::Reload);
-+    }
- }
- 
- void DolphinFacetsWidget::updateTagsMenuItems(const QUrl&, const KFileItemList& items)
--- 
-GitLab
-
-- 
cgit v1.2.3-18-g5258