gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-06 00:48:18 -07:00
Code Issues Projects Releases Wiki Activity

kde-apps/dolphin: Update fix-no-semantic-desktop.patch w/ upstream MR

Browse Source 
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
2021-05-12 09:42:48 +02:00
parent 38ed3190bf
commit 8ad7c2e0f1
4 changed files with 45 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kde-apps/dolphin/dolphin-20.12.3-r1.ebuild
View File

@@ -64,8 +64,8 @@ RDEPEND="${DEPEND}
PATCHES=(
"${FILESDIR}/${P}-fix-session-restore-w-o-tabs.patch" # KDE-bug 434911
# TODO: Downstream hack, track upstream bug for better solution
"${FILESDIR}/${PN}-21.04.0-fix-no-semantic-desktop.patch" # KDE-bug 435586
# pending https://invent.kde.org/system/dolphin/-/merge_requests/208
"${FILESDIR}/${PN}-21.04.1-fix-no-semantic-desktop.patch" # KDE-bug 435586
)
src_configure() {

4
kde-apps/dolphin/dolphin-21.04.0.ebuild
View File

@@ -62,8 +62,8 @@ RDEPEND="${DEPEND}
>=kde-apps/kio-extras-${PVCUT}:5
"
# TODO: Downstream hack, track upstream bug for better solution
PATCHES=( "${FILESDIR}/${P}-fix-no-semantic-desktop.patch" ) # KDE-bug 435586
# 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=(

23
kde-apps/dolphin/files/dolphin-21.04.0-fix-no-semantic-desktop.patch
View File

@@ -1,23 +0,0 @@
diff --git a/src/search/dolphinfacetswidget.cpp b/src/search/dolphinfacetswidget.cpp
index d52d146a8..9f0078631 100644
--- a/src/search/dolphinfacetswidget.cpp
+++ b/src/search/dolphinfacetswidget.cpp
@@ -7,6 +7,8 @@
#include "dolphinfacetswidget.h"
+#include <config-baloo.h>
+
#include <KLocalizedString>
#include <QComboBox>
@@ -257,7 +259,9 @@ void DolphinFacetsWidget::updateTagsSelector()
void DolphinFacetsWidget::updateTagsMenu()
{
updateTagsMenuItems({}, {});
+#ifdef HAVE_BALOO
m_tagsLister.openUrl(QUrl(QStringLiteral("tags:/")), KCoreDirLister::OpenUrlFlag::Reload);
+#endif
}
void DolphinFacetsWidget::updateTagsMenuItems(const QUrl&, const KFileItemList& items)

41
kde-apps/dolphin/files/dolphin-21.04.1-fix-no-semantic-desktop.patch Normal file
View File

@@ -0,0 +1,41 @@
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