gentoo resync : 22.05.2021

5 files changed, 50 insertions, 32 deletions

diff --git a/kde-apps/dolphin/Manifest b/kde-apps/dolphin/Manifest
index 0d7854458b60..fc0ed03e3667 100644
--- a/kde-apps/dolphin/Manifest
+++ b/kde-apps/dolphin/Manifest
@@ -1,7 +1,7 @@
 AUX dolphin-20.12.3-fix-session-restore-w-o-tabs.patch 2643 BLAKE2B 07856c16e9e68739a8b9feec46e1fe16272eddf49b45a88c7030d2439cb90345dc902ea5d11e08f0565c0a45fde3c2efe912d8225547e679dd7ae5d0e3b38e18 SHA512 182fd1e6e87a7a25326123be17015174e84124b042056ea72353c7f051de7ecc550b8284885ce3cb92b2a9e88b81cd6e40426369acdeb33995c9fdc3534c9efc
-AUX dolphin-21.04.0-fix-no-semantic-desktop.patch 701 BLAKE2B bcecf8f1f99afcab96d5197c65448fc4a8c0b9e13a1044968149525b282422d56105411c2230f1cc0883f00a9c9598b1248f376f8cb7ccea2d5ff1278e4ac3a0 SHA512 5bb2d8b19baac1491a0befa28dba1842df695b4de9b06e0690b32115dabefc2f3dc3af6fd0243ff7d22e0678e69007525b5518d6c093d309d2bae86c55d16320
+AUX dolphin-21.04.1-fix-no-semantic-desktop.patch 1331 BLAKE2B 83c51b160f7813144b9b91c3c6919386c67bb43e84ff4e4feaa0d53c2c2e6cae7416969efa3133f2fab50cdf0f256dfd4c4f643c1183c67727be5028ae2d57d9 SHA512 b921ffda896249abbfd06012a4e2f94f487c4bd459a85fc40616a4d2a99881cd856182a79ded81884fd4082cc33fda7d5918b5b4b36c281673d6dcdf10932934
 DIST dolphin-20.12.3.tar.xz 5134660 BLAKE2B 3ad3e7c16d0c4203e189bdf035028777115971091bc3c45a3e88231f9715c9439f44c67b2bf2d9d4680a07d222c0c14858028d54499fbe8cf006e3eae63a9193 SHA512 fb57121875fb6b3db9b3071590ea2b6fe7db1d22238af758591835946ac297d7a1734646385a2f6b7ade41de7dcfdf8f6b5e7dccf335a3cf558259d017e44a11
-DIST dolphin-21.04.0.tar.xz 5160064 BLAKE2B 4443e68ca72e3849a082644c4f14e1bab57581261be3da20bd1a2f646277270d617d78afab1f0c26244886de77a1d3aa701cdda66dce33f69e3e84c389353dd2 SHA512 6675d39146f69395c51d264459b6ba29210d131fed068de8006be1ba324c604ce004ccc4e5d68cc8ac6c0dfa5a63a7b2fac25c04227e6abc802dfe5a37e96c35
-EBUILD dolphin-20.12.3-r1.ebuild 3363 BLAKE2B 2115dd6fb5ca67c00426a4a5a6f664528a6fac283f983fd608b1798d567da35a57b7783a68b39f9ede4ab4752d5ba175806996c4e133971f311afade892d53f3 SHA512 9a9602163e477fc608f26c8e747513bda4f3c3460576aeb89f1abe86f7b0faa865fd3c203969f680fc36d1bbc407393f1be15076218f513fad8d4370198defd5
-EBUILD dolphin-21.04.0.ebuild 3283 BLAKE2B c9f99f9de9eb24d6baf9780a8c9864a4a680ccc43575baaf501ddebfdd314c6f377464fe49687c5c7c8c056571c77ef19a7295a884143a32c9caf9c91c86c748 SHA512 0278f356307724de1b60da9e8f967a16dde6fe6f10ca7683f9628f60e4a5b86ed4017918cd56dd8d96b7c661b7103a9588175a7927eb068b52adf539a95c4549
+DIST dolphin-21.04.1.tar.xz 5163736 BLAKE2B 04a8f5435ed8ac84c1ed4ac2d386d2a9c04e29c617cf8b148f4aa65f8c4b2a109ad16b75df798155ea2f498cdb03ce16c2c4a75cabf7c7a4af1e4e0ec095eb7d SHA512 2ad0a297c6e8731e6cf03e83d84de9c639abc3da254f48383464e921b2f4817267b1cd1dab9776d55287b6f90e4d454eee041a0dc9b480d9d3571e4f6d8ddc01
+EBUILD dolphin-20.12.3-r1.ebuild 3366 BLAKE2B d7fc3fbb64642f656ea3e236511b622e8063bc86686c723e4f7c6e8c89b52b4653b8f02ba40d831ecfacf539280a93c18194497f99b5cf32bad70901e717ab9b SHA512 a9925a664fec0e061d3f37c3776309ba9a20c5f08d140d86ee648edad9d0aaf9742f1b81f4322de563d7dafd1c6fbf3d01e2c8b2924f3bc4474893b6da73dc93
+EBUILD dolphin-21.04.1.ebuild 3286 BLAKE2B 38bbb57cf8bced653c770ee00f5e1e8a3b74793a8c7c4b8e02efc5c76968d04bdfa9801bbf49c60247ca435d3ff07a09b38f226f04973ca9f1629e7b3f4f1b72 SHA512 d28898c6cfbb7bf76cbd469e631e4076a79c9bcd8a238c353152efe00df62083ac7c69c13995c842bdb9def78e0c045cc6cbec0ce9641c8834c257eed7e3e0db
 MISC metadata.xml 361 BLAKE2B 1974fb2be150af6e3276e6c55b54b4659fcdd781b58228b60bea6ceb605f0a5b412d5b6451231b47fd67856ecf9486dd30e3d440b6e9a35d1566fc09de9a5cd9 SHA512 2fea432f0da8502acb0e2bc467e6c010a54612c2850de6abf422304e8d260a5417f7361f66c6a697ae9e138d3b6714e3d8121ae4904e24804abc188758576176
diff --git a/kde-apps/dolphin/dolphin-20.12.3-r1.ebuild b/kde-apps/dolphin/dolphin-20.12.3-r1.ebuild
index 84ed6041e315..e9bec9cda97d 100644
--- a/kde-apps/dolphin/dolphin-20.12.3-r1.ebuild
+++ b/kde-apps/dolphin/dolphin-20.12.3-r1.ebuild
@@ -12,7 +12,7 @@ VIRTUALX_REQUIRED="test"
 inherit ecm kde.org optfeature
 
 DESCRIPTION="Plasma filemanager focusing on usability"
-HOMEPAGE="https://apps.kde.org/en/dolphin https://userbase.kde.org/Dolphin"
+HOMEPAGE="https://apps.kde.org/dolphin/ https://userbase.kde.org/Dolphin"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
@@ -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() {
diff --git a/kde-apps/dolphin/dolphin-21.04.0.ebuild b/kde-apps/dolphin/dolphin-21.04.1.ebuild
index c9439d4dddc3..037ca2842420 100644
--- a/kde-apps/dolphin/dolphin-21.04.0.ebuild
+++ b/kde-apps/dolphin/dolphin-21.04.1.ebuild
@@ -12,7 +12,7 @@ VIRTUALX_REQUIRED="test"
 inherit ecm kde.org optfeature
 
 DESCRIPTION="Plasma filemanager focusing on usability"
-HOMEPAGE="https://apps.kde.org/en/dolphin https://userbase.kde.org/Dolphin"
+HOMEPAGE="https://apps.kde.org/dolphin/ https://userbase.kde.org/Dolphin"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
@@ -62,7 +62,7 @@ RDEPEND="${DEPEND}
 	>=kde-apps/kio-extras-${PVCUT}:5
 "
 
-# TODO: Downstream hack, track upstream bug for better solution
+# pending https://invent.kde.org/system/dolphin/-/merge_requests/208
 PATCHES=( "${FILESDIR}/${P}-fix-no-semantic-desktop.patch" ) # KDE-bug 435586
 
 src_configure() {
diff --git a/kde-apps/dolphin/files/dolphin-21.04.0-fix-no-semantic-desktop.patch b/kde-apps/dolphin/files/dolphin-21.04.0-fix-no-semantic-desktop.patch
deleted file mode 100644
index 4f97a53c5230..000000000000
--- a/kde-apps/dolphin/files/dolphin-21.04.0-fix-no-semantic-desktop.patch
+++ /dev/null
@@ -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)
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
new file mode 100644
index 000000000000..5636d0532ed4
--- /dev/null
+++ b/kde-apps/dolphin/files/dolphin-21.04.1-fix-no-semantic-desktop.patch
@@ -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
+