commit: f05339fe48803949f3b232aa3a231fbb9422b784
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 13 14:14:01 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 13 14:38:10 2021 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f05339fe
kde-apps/dolphin: no-sematic-desktop.patch upstreamed
Upstream commit 29636baff0f0cf8d769aa75b1c458b96cf83b828
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/dolphin/dolphin-21.04.49.9999.ebuild | 3 --
kde-apps/dolphin/dolphin-9999.ebuild | 3 --
.../dolphin-21.04.1-fix-no-semantic-desktop.patch | 41 ----------------------
3 files changed, 47 deletions(-)
diff --git a/kde-apps/dolphin/dolphin-21.04.49.9999.ebuild
b/kde-apps/dolphin/dolphin-21.04.49.9999.ebuild
index 7198ee2405..5e3e20bd11 100644
--- a/kde-apps/dolphin/dolphin-21.04.49.9999.ebuild
+++ b/kde-apps/dolphin/dolphin-21.04.49.9999.ebuild
@@ -62,9 +62,6 @@ RDEPEND="${DEPEND}
>=kde-apps/kio-extras-${PVCUT}:5
"
-# pending https://invent.kde.org/system/dolphin/-/merge_requests/208
-PATCHES=( "${FILESDIR}/${PN}-21.04.1-fix-no-semantic-desktop.patch" ) #
KDE-bug 435586
-
src_configure() {
local mycmakeargs=(
-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON
diff --git a/kde-apps/dolphin/dolphin-9999.ebuild
b/kde-apps/dolphin/dolphin-9999.ebuild
index b043a6542c..a469a25ca7 100644
--- a/kde-apps/dolphin/dolphin-9999.ebuild
+++ b/kde-apps/dolphin/dolphin-9999.ebuild
@@ -61,9 +61,6 @@ RDEPEND="${DEPEND}
>=kde-apps/kio-extras-${PVCUT}:5
"
-# pending https://invent.kde.org/system/dolphin/-/merge_requests/208
-PATCHES=( "${FILESDIR}/${PN}-21.04.1-fix-no-semantic-desktop.patch" ) #
KDE-bug 435586
-
src_configure() {
local mycmakeargs=(
-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON
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 5636d0532e..0000000000
--- 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 <[email protected]>
-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
-
