summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2023-06-08 12:53:53 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2023-06-08 13:36:26 +0200
commit8839dae3b2bf092b276d732417f020b20ab43b08 (patch)
tree6ec6d19c9d2dc7c758765ca33db66c743d000230 /kde-apps/dolphin
parentkde-apps/baloo-widgets: drop 23.04.1 (diff)
downloadgentoo-8839dae3b2bf092b276d732417f020b20ab43b08.tar.gz
gentoo-8839dae3b2bf092b276d732417f020b20ab43b08.tar.bz2
gentoo-8839dae3b2bf092b276d732417f020b20ab43b08.zip
kde-apps/dolphin: drop 23.04.1
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-apps/dolphin')
-rw-r--r--kde-apps/dolphin/Manifest1
-rw-r--r--kde-apps/dolphin/dolphin-23.04.1.ebuild100
-rw-r--r--kde-apps/dolphin/files/dolphin-23.04.1-fix-startup-delay.patch121
3 files changed, 0 insertions, 222 deletions
diff --git a/kde-apps/dolphin/Manifest b/kde-apps/dolphin/Manifest
index 9be0fa11e372..2ee6324884e5 100644
--- a/kde-apps/dolphin/Manifest
+++ b/kde-apps/dolphin/Manifest
@@ -1,3 +1,2 @@
DIST dolphin-22.12.3.tar.xz 5693220 BLAKE2B cf156536d18fe6f8fb9d563be4e7cd96ad012b32e23a367e061beb5b3567039d1c7e42a6e32b348d493f16b59def3423f3c66bbea00c14017cac6383ded391c3 SHA512 2683d02831ac75b311fc0ef3610f1086cf2a00860fb9495c2049b86dee5deb4deeee81d8dbb1c6647e33afc7323b2f4a620e0c6512fa1a499e4b830a9bf6e0e1
-DIST dolphin-23.04.1.tar.xz 5735960 BLAKE2B 5d04c5f258ed2db3a6154885051868834a235ee1808430bed97fc837367d4cb1ef813270a97630c578006967ea5e0f010e045b94e31afb380e008933cb59eddb SHA512 9211d171ed3e7cc293af0757eea113d01411dafbdd3d4bc53b2a21302b44973705c06a7420a23983d2ed026d1a7205f07eb982526c913f6892a2d7115197724e
DIST dolphin-23.04.2.tar.xz 5736316 BLAKE2B cd51e688005b782ba825538e9e7e505f6ebeabced7dc2051fee9def157b7863cefb055db8496b1df403c23d290b56f6ded4312d4dcd4fc1973ffe6adea93aa5e SHA512 518dc88da03aedfe3ef3c117879c3c2a04728fd845a3fd2315febaf18dc41a064213b503e7d6b73aada31c16d58ed10a8329d5d9ecb916a16435912866073241
diff --git a/kde-apps/dolphin/dolphin-23.04.1.ebuild b/kde-apps/dolphin/dolphin-23.04.1.ebuild
deleted file mode 100644
index c323a3f3ea19..000000000000
--- a/kde-apps/dolphin/dolphin-23.04.1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.104.0
-QTMIN=5.15.5
-VIRTUALX_REQUIRED="test"
-inherit ecm gear.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 ~loong ~ppc64 ~riscv ~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/qtx11extras-${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
-"
-
-PATCHES=(
- "${FILESDIR}/dolphin-23.04.1-fix-startup-delay.patch"
-)
-
-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-23.04.1-fix-startup-delay.patch b/kde-apps/dolphin/files/dolphin-23.04.1-fix-startup-delay.patch
deleted file mode 100644
index 6a34ff66efb3..000000000000
--- a/kde-apps/dolphin/files/dolphin-23.04.1-fix-startup-delay.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-Revert patch https://invent.kde.org/system/dolphin/-/commit/d19800c69198b904ae47cb1e53dfe28f74618eb2
-See https://bugs.gentoo.org/906170
----
-diff -ruN dolphin-23.04.1/src/dolphinmainwindow.cpp new/src/dolphinmainwindow.cpp
---- dolphin-23.04.1/src/dolphinmainwindow.cpp 2023-05-09 10:52:07.000000000 +0200
-+++ new/src/dolphinmainwindow.cpp 2023-05-13 22:37:50.984895964 +0200
-@@ -270,31 +270,6 @@
- openFiles(QUrl::fromStringList(files), splitView);
- }
-
--bool DolphinMainWindow::isOnCurrentDesktop() const
--{
--#if HAVE_X11
-- if (KWindowSystem::isPlatformX11()) {
-- const NET::Properties properties = NET::WMDesktop;
-- KWindowInfo info(this->winId(), properties);
-- return info.isOnCurrentDesktop();
-- }
--#endif
-- return true;
--}
--
--bool DolphinMainWindow::isOnActivity(const QString &activityId) const
--{
--#if HAVE_X11 && HAVE_KACTIVITIES
-- if (KWindowSystem::isPlatformX11()) {
-- const NET::Properties properties = NET::Supported;
-- const NET::Properties2 properties2 = NET::WM2Activities;
-- KWindowInfo info(this->winId(), properties, properties2);
-- return info.activities().contains(activityId);
-- }
--#endif
-- return true;
--}
--
- void DolphinMainWindow::activateWindow(const QString &activationToken)
- {
- window()->setAttribute(Qt::WA_NativeWindow, true);
-diff -ruN dolphin-23.04.1/src/dolphinmainwindow.h new/src/dolphinmainwindow.h
---- dolphin-23.04.1/src/dolphinmainwindow.h 2023-05-09 10:52:07.000000000 +0200
-+++ new/src/dolphinmainwindow.h 2023-05-13 22:37:50.984895964 +0200
-@@ -203,9 +203,6 @@
- /** @see GeneralSettings::splitViewChanged() */
- void slotSplitViewChanged();
-
-- bool isOnActivity(const QString &activityId) const;
-- bool isOnCurrentDesktop() const;
--
- Q_SIGNALS:
- /**
- * Is sent if the selection of the currently active view has
-diff -ruN dolphin-23.04.1/src/global.cpp new/src/global.cpp
---- dolphin-23.04.1/src/global.cpp 2023-05-09 10:52:07.000000000 +0200
-+++ new/src/global.cpp 2023-05-13 22:50:40.449973915 +0200
-@@ -16,9 +16,6 @@
- #include <KIO/ApplicationLauncherJob>
- #include <KService>
- #include <KWindowSystem>
--#if HAVE_KACTIVITIES
--#include <KActivities/Consumer>
--#endif
-
- #include <QApplication>
-
-@@ -143,37 +140,13 @@
-
- QVector<QPair<QSharedPointer<OrgKdeDolphinMainWindowInterface>, QStringList>> Dolphin::dolphinGuiInstances(const QString &preferredService)
- {
--#if HAVE_KACTIVITIES
-- static std::once_flag one_consumer;
-- static KActivities::Consumer *consumer;
-- std::call_once(one_consumer, []() {
-- consumer = new KActivities::Consumer();
-- // ensures the consumer is ready for query
-- QEventLoop loop;
-- QObject::connect(consumer, &KActivities::Consumer::serviceStatusChanged, &loop, &QEventLoop::quit);
-- loop.exec();
-- });
--#endif
--
- QVector<QPair<QSharedPointer<OrgKdeDolphinMainWindowInterface>, QStringList>> dolphinInterfaces;
-- const auto tryAppendInterface = [&dolphinInterfaces](const QString &service) {
-- // Check if instance can handle our URLs
-- QSharedPointer<OrgKdeDolphinMainWindowInterface> interface(
-- new OrgKdeDolphinMainWindowInterface(service, QStringLiteral("/dolphin/Dolphin_1"), QDBusConnection::sessionBus()));
-- if (interface->isValid() && !interface->lastError().isValid()) {
--#if HAVE_KACTIVITIES
-- const auto currentActivity = consumer->currentActivity();
-- if (currentActivity.isEmpty() || currentActivity == QStringLiteral("00000000-0000-0000-0000-000000000000")
-- || interface->isOnActivity(consumer->currentActivity()))
--#endif
-- if (interface->isOnCurrentDesktop()) {
-- dolphinInterfaces.append(qMakePair(interface, QStringList()));
-- }
-- }
-- };
--
- if (!preferredService.isEmpty()) {
-- tryAppendInterface(preferredService);
-+ QSharedPointer<OrgKdeDolphinMainWindowInterface> preferredInterface(
-+ new OrgKdeDolphinMainWindowInterface(preferredService, QStringLiteral("/dolphin/Dolphin_1"), QDBusConnection::sessionBus()));
-+ if (preferredInterface->isValid() && !preferredInterface->lastError().isValid()) {
-+ dolphinInterfaces.append(qMakePair(preferredInterface, QStringList()));
-+ }
- }
-
- // Look for dolphin instances among all available dbus services.
-@@ -185,7 +158,12 @@
- const QString myPid = QLatin1Char('-') + QString::number(QCoreApplication::applicationPid());
- for (const QString &service : dbusServices) {
- if (service.startsWith(pattern) && !service.endsWith(myPid)) {
-- tryAppendInterface(service);
-+ // Check if instance can handle our URLs
-+ QSharedPointer<OrgKdeDolphinMainWindowInterface> interface(
-+ new OrgKdeDolphinMainWindowInterface(service, QStringLiteral("/dolphin/Dolphin_1"), QDBusConnection::sessionBus()));
-+ if (interface->isValid() && !interface->lastError().isValid()) {
-+ dolphinInterfaces.append(qMakePair(interface, QStringList()));
-+ }
- }
- }
-