From 616579b5d773c50af31ee56f00105d96ce641ca2 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Aug 2021 10:30:13 +0100 Subject: gentoo resync : 14.08.2021 --- kde-apps/dolphin/Manifest | 6 +- kde-apps/dolphin/dolphin-20.12.3-r1.ebuild | 102 --------------------- kde-apps/dolphin/dolphin-21.08.0.ebuild | 95 +++++++++++++++++++ ...phin-20.12.3-fix-session-restore-w-o-tabs.patch | 70 -------------- .../dolphin-21.04.1-fix-no-semantic-desktop.patch | 41 --------- 5 files changed, 97 insertions(+), 217 deletions(-) delete mode 100644 kde-apps/dolphin/dolphin-20.12.3-r1.ebuild create mode 100644 kde-apps/dolphin/dolphin-21.08.0.ebuild 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') diff --git a/kde-apps/dolphin/Manifest b/kde-apps/dolphin/Manifest index 275eeac3d934..9dc864524996 100644 --- a/kde-apps/dolphin/Manifest +++ b/kde-apps/dolphin/Manifest @@ -1,7 +1,5 @@ -AUX dolphin-20.12.3-fix-session-restore-w-o-tabs.patch 2643 BLAKE2B 07856c16e9e68739a8b9feec46e1fe16272eddf49b45a88c7030d2439cb90345dc902ea5d11e08f0565c0a45fde3c2efe912d8225547e679dd7ae5d0e3b38e18 SHA512 182fd1e6e87a7a25326123be17015174e84124b042056ea72353c7f051de7ecc550b8284885ce3cb92b2a9e88b81cd6e40426369acdeb33995c9fdc3534c9efc -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.3.tar.xz 5228312 BLAKE2B cdfbde0789b5c2dfc31d61e8c37b47e82a31877da9437770c463149b33ee46d4b5b1866aa38b1991f12e878ea27f4424c6b162113d87a865e0bcd815941abd4e SHA512 bb7d2f342aecae3b424aef93591124a5ca041e5e75909ed43c6202bc7cf7ab0e34a883050194b6e71f71425b2116ee579e67016205a648de6d5e5b0d01bf3ea8 -EBUILD dolphin-20.12.3-r1.ebuild 3366 BLAKE2B d7fc3fbb64642f656ea3e236511b622e8063bc86686c723e4f7c6e8c89b52b4653b8f02ba40d831ecfacf539280a93c18194497f99b5cf32bad70901e717ab9b SHA512 a9925a664fec0e061d3f37c3776309ba9a20c5f08d140d86ee648edad9d0aaf9742f1b81f4322de563d7dafd1c6fbf3d01e2c8b2924f3bc4474893b6da73dc93 +DIST dolphin-21.08.0.tar.xz 5298512 BLAKE2B 54962d2c200a79948553eb850f3cedfbe957f690a27cf04d613bc476ccdc41b74edefbce71aceab48c8efe6c50787d0e9d834a4042092b12a8bf4cc3fa6cda40 SHA512 a1bb96ebefbe29d018a2f91c708c62e38014dbf7725b6f4e95d5a83e486fbe2419d96a7bcc33bd592a3602f57a142350c372728948ebcc17a5bbe093f30b0154 EBUILD dolphin-21.04.3.ebuild 3135 BLAKE2B 0e8fdf0027fc4ab4e65b69c6dd5d8a244e4e6c1e296d98a68fe66bdb2fd089de3d8e6342321284c00ba7955ba325f6e799befe15b8dc95e0444e22a09160ccc6 SHA512 3503db26e163eb777b07dd44df6fd4e249edcbdcf006b41ad21e387a46e4d858af57adba4cd70ed9ae7d524ea780a444a0546a6f8a3fcedb4df4bee0d697fcdf +EBUILD dolphin-21.08.0.ebuild 3098 BLAKE2B a1cb74b6b749cdb3cd3b7f72a2c29e92ac8b320ef001b59e753ccc5bd50b7683befc64fdb052c1b2925a504d21cd7fbfdbf1d0e964026e010629efdcede88bf9 SHA512 952172e1e8993838458b6b485acf3df181eef3abc9760bb3db3f303126b34b96ac2cde7f07a05ffaebfcf87505f978d215a7d18170a86a3353e85e5e06d8125f 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 deleted file mode 100644 index e9bec9cda97d..000000000000 --- a/kde-apps/dolphin/dolphin-20.12.3-r1.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_HANDBOOK="forceoptional" -ECM_TEST="true" -PVCUT=$(ver_cut 1-3) -KFMIN=5.75.0 -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org optfeature - -DESCRIPTION="Plasma filemanager focusing on usability" -HOMEPAGE="https://apps.kde.org/dolphin/ https://userbase.kde.org/Dolphin" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="amd64 arm64 ~ppc64 x86" -IUSE="activities semantic-desktop telemetry" - -DEPEND=" - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/kbookmarks-${KFMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kcodecs-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kinit-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5= - >=kde-frameworks/kitemviews-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/solid-${KFMIN}:5 - >=media-libs/phonon-4.11.0 - activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 ) - semantic-desktop? ( - >=kde-apps/baloo-widgets-${PVCUT}:5 - >=kde-frameworks/baloo-${KFMIN}:5 - >=kde-frameworks/kfilemetadata-${KFMIN}:5 - ) - telemetry? ( dev-libs/kuserfeedback:5 ) -" -RDEPEND="${DEPEND} - >=kde-apps/kio-extras-${PVCUT}:5 -" - -PATCHES=( - "${FILESDIR}/${P}-fix-session-restore-w-o-tabs.patch" # KDE-bug 434911 - # 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() { - local mycmakeargs=( - -DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON - $(cmake_use_find_package activities KF5Activities) - $(cmake_use_find_package semantic-desktop KF5Baloo) - $(cmake_use_find_package semantic-desktop KF5BalooWidgets) - $(cmake_use_find_package semantic-desktop KF5FileMetaData) - $(cmake_use_find_package telemetry KUserFeedback) - ) - ecm_src_configure -} - -src_test() { - local myctestargs=( - # servicemenuinstaller requires ruby, no thanks - # dolphinmainwindowtest, kitemlistcontrollertest, kfileitemlistviewtest, kfileitemmodeltest hang forever - # placesitemmodeltest requires DBus - -E "(servicemenuinstaller|dolphinmainwindowtest|kfileitemlistviewtest|kfileitemmodeltest|kitemlistcontrollertest|placesitemmodeltest)" - ) - ecm_src_test -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - optfeature "compress/extract and other actions" kde-apps/ark:${SLOT} - optfeature "crypto actions" kde-apps/kleopatra:${SLOT} - optfeature "video file thumbnails" kde-apps/ffmpegthumbs:${SLOT} - optfeature "graphics file thumbnails" kde-apps/thumbnailers:${SLOT} - optfeature "'Share' context menu actions" kde-frameworks/purpose:${SLOT} - fi - ecm_pkg_postinst -} diff --git a/kde-apps/dolphin/dolphin-21.08.0.ebuild b/kde-apps/dolphin/dolphin-21.08.0.ebuild new file mode 100644 index 000000000000..57cfe86f07b8 --- /dev/null +++ b/kde-apps/dolphin/dolphin-21.08.0.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_HANDBOOK="optional" +ECM_TEST="true" +PVCUT=$(ver_cut 1-3) +KFMIN=5.84.0 +QTMIN=5.15.2 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org optfeature + +DESCRIPTION="Plasma filemanager focusing on usability" +HOMEPAGE="https://apps.kde.org/dolphin/ https://userbase.kde.org/Dolphin" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +IUSE="activities semantic-desktop telemetry" + +DEPEND=" + >=dev-qt/qtconcurrent-${QTMIN}:5 + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=kde-frameworks/kbookmarks-${KFMIN}:5 + >=kde-frameworks/kcmutils-${KFMIN}:5 + >=kde-frameworks/kcodecs-${KFMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kcrash-${KFMIN}:5 + >=kde-frameworks/kdbusaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5= + >=kde-frameworks/kitemviews-${KFMIN}:5 + >=kde-frameworks/kjobwidgets-${KFMIN}:5 + >=kde-frameworks/knewstuff-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/kparts-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/ktextwidgets-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=kde-frameworks/solid-${KFMIN}:5 + >=media-libs/phonon-4.11.0 + activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 ) + semantic-desktop? ( + >=kde-apps/baloo-widgets-${PVCUT}:5 + >=kde-frameworks/baloo-${KFMIN}:5 + >=kde-frameworks/kfilemetadata-${KFMIN}:5 + ) + telemetry? ( dev-libs/kuserfeedback:5 ) +" +RDEPEND="${DEPEND} + >=kde-apps/kio-extras-${PVCUT}:5 +" + +src_configure() { + local mycmakeargs=( + -DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON + $(cmake_use_find_package activities KF5Activities) + $(cmake_use_find_package semantic-desktop KF5Baloo) + $(cmake_use_find_package semantic-desktop KF5BalooWidgets) + $(cmake_use_find_package semantic-desktop KF5FileMetaData) + $(cmake_use_find_package telemetry KUserFeedback) + ) + ecm_src_configure +} + +src_test() { + local myctestargs=( + # servicemenuinstaller requires ruby, no thanks + # dolphinmainwindowtest, kitemlistcontrollertest, kfileitemlistviewtest, kfileitemmodeltest hang forever + # placesitemmodeltest requires DBus + -E "(servicemenuinstaller|dolphinmainwindowtest|kfileitemlistviewtest|kfileitemmodeltest|kitemlistcontrollertest|placesitemmodeltest)" + ) + ecm_src_test +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]]; then + optfeature "compress/extract and other actions" kde-apps/ark:${SLOT} + optfeature "crypto actions" kde-apps/kleopatra:${SLOT} + optfeature "video file thumbnails" kde-apps/ffmpegthumbs:${SLOT} + optfeature "graphics file thumbnails" kde-apps/thumbnailers:${SLOT} + optfeature "'Share' context menu actions" kde-frameworks/purpose:${SLOT} + fi + ecm_pkg_postinst +} 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 -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& dirs, bool splitView) - { - Q_ASSERT(dirs.size() > 0); - -+ bool somethingWasAlreadyOpen = false; -+ - QList::const_iterator it = dirs.constBegin(); - while (it != dirs.constEnd()) { - const QUrl& primaryUrl = *(it++); - const QPair 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& 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 -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 -+#include - - #include - #include -@@ -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