gentoo auto-resync : 08:06:2023 - 15:45:39

3 files changed, 4 insertions, 131 deletions

diff --git a/kde-apps/dolphin/Manifest b/kde-apps/dolphin/Manifest
index c33964bc6132..753c27bf9636 100644
--- a/kde-apps/dolphin/Manifest
+++ b/kde-apps/dolphin/Manifest
@@ -1,6 +1,5 @@
-AUX dolphin-23.04.1-fix-startup-delay.patch 5125 BLAKE2B 965da1cebb6ae2d230d5ac084beb7e0561405ca294e94045780a494323bbbc2c697e2eee11bdc127a02cb02a2f89300dc314a223e23bcebb1e476575adc0ff1f SHA512 cb9a50ab1c928b98409ce64d1177fb2b39951c4b8444503105a3641f3a63d152b413d094597746fb245fa71ba80427c7bbb8c6417b289336563f9334370d8b2a
 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
 EBUILD dolphin-22.12.3.ebuild 3115 BLAKE2B c1f712bba0b7c21e24efc0684b7c936a36f3f9934782b63726e7281d01d70eac426a73cb1ebaccb007de3944d42b382549bcb4be3ff8c328ce2b3639397faf73 SHA512 c34bb0cbce8eb2a75295b12f545fb1944ca077ecbac5f5bc2f2d50e2ae96c1d26cf748994a816a1d133b96f15b8372eb9f5fcfffebc20ec5d37dff73d87b7f7c
-EBUILD dolphin-23.04.1.ebuild 3219 BLAKE2B 55fcfa56b3ce2bd9774ddd3d037f05c6c2ebfbac7ac8e68f9979ec1b72f2eb17c2d0fd2435eb4cbb0aa4b8658d64bdb7badd8bb7943f9271de48bec9583d3705 SHA512 2566a6cfdb07b785ca02ffdee10a858b9c956135ab852ed59c580b314a4c7723f2ef9d73e887d15fb04984bc73e290f2c30245058e57ade03112a19fa4512c3e
+EBUILD dolphin-23.04.2.ebuild 3126 BLAKE2B 0c8d09a86348ce9d692ca2e238825fdab2876a4c1a1ce45a8e1ad9fde33b3c5332557f59376d5a7941a89e89a6847766e043073bfd07a12972f3a228da6aa91f SHA512 36528934e8879a1f968b9ea722f8e38ec85b3c8406c42fb2881ababe1efbc24dc8cacd62f517ff9070f9a3caf8327a0bef6c1e64c5a4bdca8ee03a8bdc9b96b7
 MISC metadata.xml 430 BLAKE2B 4e7f2312a9ff5828bb5090867a1cb3f8e80365cf7fe92e45973ee6d1fbf1bafaa9427227b6cc424214b4892c92188918c36e25ca346a89e44e2b2ea25d2871b8 SHA512 cd3e017e0c9259940450a1b7a6fa5b8c81e82963b3c4d63b0921474f42651076a0fd7c3dd90d8a23b57646ed6eb2ccba8fbd41944d4e874a4e2ac58c981a68c0
diff --git a/kde-apps/dolphin/dolphin-23.04.1.ebuild b/kde-apps/dolphin/dolphin-23.04.2.ebuild
index c323a3f3ea19..7fd2bc11ea02 100644
--- a/kde-apps/dolphin/dolphin-23.04.1.ebuild
+++ b/kde-apps/dolphin/dolphin-23.04.2.ebuild
@@ -6,9 +6,8 @@ EAPI=8
 ECM_HANDBOOK="optional"
 ECM_TEST="true"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.104.0
-QTMIN=5.15.5
-VIRTUALX_REQUIRED="test"
+KFMIN=5.106.0
+QTMIN=5.15.9
 inherit ecm gear.kde.org optfeature
 
 DESCRIPTION="Plasma filemanager focusing on usability"
@@ -62,10 +61,6 @@ 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
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()));
-+            }
-         }
-     }
-