summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'kde-apps/dolphin')
-rw-r--r--kde-apps/dolphin/Manifest4
-rw-r--r--kde-apps/dolphin/dolphin-22.12.3.ebuild (renamed from kde-apps/dolphin/dolphin-22.12.1.ebuild)2
-rw-r--r--kde-apps/dolphin/dolphin-23.04.1.ebuild (renamed from kde-apps/dolphin/dolphin-22.08.3.ebuild)11
-rw-r--r--kde-apps/dolphin/files/dolphin-23.04.1-fix-startup-delay.patch121
4 files changed, 132 insertions, 6 deletions
diff --git a/kde-apps/dolphin/Manifest b/kde-apps/dolphin/Manifest
index dd0eaf112b76..3492bff29a08 100644
--- a/kde-apps/dolphin/Manifest
+++ b/kde-apps/dolphin/Manifest
@@ -1,2 +1,2 @@
-DIST dolphin-22.08.3.tar.xz 5369436 BLAKE2B c1d60aa79603a40ad559f1bcac8d9211e0032c58374d2268ec7530c8a3e38233271b990e24eabaa258085942f5c0dfa9a9c6a91da92caee45dd165670d62918c SHA512 1abb4f3fe47c61eef93378e069b11c894812892b5a3aec84a2ee2007a235b37aec02d2a9680581d2092596c680427e8eabbac2a0b5b64e48c7d7ea1da8f0c5b5
-DIST dolphin-22.12.1.tar.xz 5683064 BLAKE2B a32b5a79ad9b6b111156898c9f4c8874d17b01122c062660e0dc1c8f779100d067a1e7800398fbcca694d4f7d4ce7db3a0ddfa40039f3ca1231941dd82954e16 SHA512 c218fd0a11b01bda6bac0e6157a9bb01008fb409081924b87b4516c550529687989bee498197d866d8c8f57d2c8747cf644298146100eaa6e8383285c420764b
+DIST dolphin-22.12.3.tar.xz 5693220 BLAKE2B cf156536d18fe6f8fb9d563be4e7cd96ad012b32e23a367e061beb5b3567039d1c7e42a6e32b348d493f16b59def3423f3c66bbea00c14017cac6383ded391c3 SHA512 2683d02831ac75b311fc0ef3610f1086cf2a00860fb9495c2049b86dee5deb4deeee81d8dbb1c6647e33afc7323b2f4a620e0c6512fa1a499e4b830a9bf6e0e1
+DIST dolphin-23.04.1.tar.xz 5735960 BLAKE2B 5d04c5f258ed2db3a6154885051868834a235ee1808430bed97fc837367d4cb1ef813270a97630c578006967ea5e0f010e045b94e31afb380e008933cb59eddb SHA512 9211d171ed3e7cc293af0757eea113d01411dafbdd3d4bc53b2a21302b44973705c06a7420a23983d2ed026d1a7205f07eb982526c913f6892a2d7115197724e
diff --git a/kde-apps/dolphin/dolphin-22.12.1.ebuild b/kde-apps/dolphin/dolphin-22.12.3.ebuild
index f4970af42075..ab3d54f039e4 100644
--- a/kde-apps/dolphin/dolphin-22.12.1.ebuild
+++ b/kde-apps/dolphin/dolphin-22.12.3.ebuild
@@ -16,7 +16,7 @@ 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"
+KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
IUSE="activities semantic-desktop telemetry"
DEPEND="
diff --git a/kde-apps/dolphin/dolphin-22.08.3.ebuild b/kde-apps/dolphin/dolphin-23.04.1.ebuild
index dac899f762df..c323a3f3ea19 100644
--- a/kde-apps/dolphin/dolphin-22.08.3.ebuild
+++ b/kde-apps/dolphin/dolphin-23.04.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
ECM_HANDBOOK="optional"
ECM_TEST="true"
PVCUT=$(ver_cut 1-3)
-KFMIN=5.96.0
+KFMIN=5.104.0
QTMIN=5.15.5
VIRTUALX_REQUIRED="test"
inherit ecm gear.kde.org optfeature
@@ -16,7 +16,7 @@ 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"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
IUSE="activities semantic-desktop telemetry"
DEPEND="
@@ -24,6 +24,7 @@ DEPEND="
>=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
@@ -61,6 +62,10 @@ 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
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
new file mode 100644
index 000000000000..6a34ff66efb3
--- /dev/null
+++ b/kde-apps/dolphin/files/dolphin-23.04.1-fix-startup-delay.patch
@@ -0,0 +1,121 @@
+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()));
++ }
+ }
+ }
+