gentoo resync : 11.05.2021

4 files changed, 31 insertions, 2 deletions

diff --git a/kde-apps/dolphin/Manifest b/kde-apps/dolphin/Manifest
index b51fccf7bc04..0d7854458b60 100644
--- a/kde-apps/dolphin/Manifest
+++ b/kde-apps/dolphin/Manifest
@@ -1,6 +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
 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 3222 BLAKE2B dab5e90ca245bca9593ff081935c03baa4e2cc151033d19b859f698285b8dae34a3fce1efb4ac53c6ddf53cec7e9f2a403b9adc095853d12677e513a97ff7b92 SHA512 4b4060d40cb8e18a0e457e4b1acc4675e4b38404265db96fc7fdd45d41e176668abbbb8ed320024f667faf7c499ac7f181b551ffd23e4729fc043f591665518e
-EBUILD dolphin-21.04.0.ebuild 3140 BLAKE2B bc0910dceeedc0acd0e0df61c4fd9c0df3133b46a76df5808f649d1aea76c904aabe7cb0e77e902028a5100948a7e0581c53f73383f40f1d0a817d9759dfbbb3 SHA512 a6fe7b44df2ee1293bc2cc3e315f9869e2516e6d12cc07d87e241b8f7fae84657fb52eb1618ed2c85fc8897f589d9cf2d21430beb21bbe3639d4ee87a8a34a00
+EBUILD dolphin-20.12.3-r1.ebuild 3363 BLAKE2B 2115dd6fb5ca67c00426a4a5a6f664528a6fac283f983fd608b1798d567da35a57b7783a68b39f9ede4ab4752d5ba175806996c4e133971f311afade892d53f3 SHA512 9a9602163e477fc608f26c8e747513bda4f3c3460576aeb89f1abe86f7b0faa865fd3c203969f680fc36d1bbc407393f1be15076218f513fad8d4370198defd5
+EBUILD dolphin-21.04.0.ebuild 3283 BLAKE2B c9f99f9de9eb24d6baf9780a8c9864a4a680ccc43575baaf501ddebfdd314c6f377464fe49687c5c7c8c056571c77ef19a7295a884143a32c9caf9c91c86c748 SHA512 0278f356307724de1b60da9e8f967a16dde6fe6f10ca7683f9628f60e4a5b86ed4017918cd56dd8d96b7c661b7103a9588175a7927eb068b52adf539a95c4549
 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 7f9f2d90c9af..84ed6041e315 100644
--- a/kde-apps/dolphin/dolphin-20.12.3-r1.ebuild
+++ b/kde-apps/dolphin/dolphin-20.12.3-r1.ebuild
@@ -64,6 +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
 )
 
 src_configure() {
diff --git a/kde-apps/dolphin/dolphin-21.04.0.ebuild b/kde-apps/dolphin/dolphin-21.04.0.ebuild
index 2f5121e83267..c9439d4dddc3 100644
--- a/kde-apps/dolphin/dolphin-21.04.0.ebuild
+++ b/kde-apps/dolphin/dolphin-21.04.0.ebuild
@@ -62,6 +62,9 @@ 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
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON
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
new file mode 100644
index 000000000000..4f97a53c5230
--- /dev/null
+++ b/kde-apps/dolphin/files/dolphin-21.04.0-fix-no-semantic-desktop.patch
@@ -0,0 +1,23 @@
+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)