commit: e049a8de6a38f3027fbcf0b84bd5be53c840c1a3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 30 14:20:21 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Nov 30 14:32:18 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e049a8de
kde-plasma/plasma-workspace: drop 5.23.3*
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-plasma/plasma-workspace/Manifest | 1 -
...earchrunner-emit-DBus-error-when-disabled.patch | 75 --------
...systemtray-check-if-service-already-added.patch | 41 ----
...pace-5.23.3-systemtray-fix-race-condition.patch | 54 ------
.../plasma-workspace-5.23.3-r2.ebuild | 212 ---------------------
5 files changed, 383 deletions(-)
diff --git a/kde-plasma/plasma-workspace/Manifest
b/kde-plasma/plasma-workspace/Manifest
index d16cc13a2fe9..b47676d433af 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1,3 +1,2 @@
DIST plasma-workspace-5.22.5.tar.xz 8401412 BLAKE2B
3479549ffb302f8beca8f37853540bd71cc03a02183826435ec47ded0df69f4b19e103d8b6e2cd16af001a9c04a34e2f37a98a461f40fb8837ed7e7128a6fcba
SHA512
753ba35c3f0c3a5affe10d3a6149f1ebca7ed51b0710c079606e33ceada94a50eee1c1bafbb465fcc194038915c33edef1d79e0865e5702aab7a334d6d508c47
-DIST plasma-workspace-5.23.3.tar.xz 9006500 BLAKE2B
651780480736ae0478b059e8dcff40d5411310693d3b0b24b9a8a5c442c45c555e69a99c3e0f20d82a4e0dc3a099537c172589e17afa2b34c68d314164913e73
SHA512
34f8835d35063b582b12b343475474b2c7b338ecef148871f28348fe73f2b1ea36d938553c8e97fd108ce441cbb7c97b450590b186c788608c9cf29c82d8c786
DIST plasma-workspace-5.23.4.tar.xz 9012468 BLAKE2B
491c211bbfdecb1a4e7adb15647c6f9d7d2ded3314ddef855b79b4a222e1bedb4ac88b8a380d66ea296b6696248d67d0ce4757853d01300abdfbe85394936abe
SHA512
730e8a69e5dc2e22db1356832aa2adc9255de179ed139c0abe06ad6b44dd0cffb8f214b32eb1f882eb73c337f44e16f64873789130939e25b2b8bab23d2dcfc2
diff --git
a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.3-baloosearchrunner-emit-DBus-error-when-disabled.patch
b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.3-baloosearchrunner-emit-DBus-error-when-disabled.patch
deleted file mode 100644
index be4b6e51b3e2..000000000000
---
a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.3-baloosearchrunner-emit-DBus-error-when-disabled.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From afff43effadd78ab682ecf4c6c9919bdcbbedbcd Mon Sep 17 00:00:00 2001
-From: Alexander Lohnau <alexander.loh...@gmx.de>
-Date: Fri, 12 Nov 2021 11:10:15 +0100
-Subject: [PATCH] baloosearchruner: Emit DBus error when baloo is disabled
-
-Otherwise we exit and KRunner runner into a long timeout.
-
-By making this a dedicated DBus error KRunner can also know, that this
-runner can not be started. Consequently making new attempts to query
-this runner can be prevented.
-
-Because the runner is DBus-Activated, we can not exit the process, otherwise
other
-processes (like the search in the app launcher) will have the same issue with
the timeout.
-BUG: 445342
-
-
-(cherry picked from commit fa5ac3fe3421a0077d9d80f52b89536daa732afa)
----
- runners/baloo/baloosearchrunner.cpp | 14 ++++++++++----
- runners/baloo/baloosearchrunner.h | 2 +-
- 2 files changed, 11 insertions(+), 5 deletions(-)
-
-diff --git a/runners/baloo/baloosearchrunner.cpp
b/runners/baloo/baloosearchrunner.cpp
-index 08f24b362..768709cee 100644
---- a/runners/baloo/baloosearchrunner.cpp
-+++ b/runners/baloo/baloosearchrunner.cpp
-@@ -31,10 +31,6 @@ static const QString s_openParentDirId =
QStringLiteral("openParentDir");
-
- int main(int argc, char **argv)
- {
-- Baloo::IndexerConfig config;
-- if (!config.fileIndexingEnabled()) {
-- return -1;
-- }
- QCoreApplication::setAttribute(Qt::AA_DisableSessionManager);
- QApplication::setQuitOnLastWindowClosed(false);
- QApplication app(argc, argv); // KRun needs widgets for error message
boxes
-@@ -60,11 +56,21 @@ SearchRunner::~SearchRunner()
-
- RemoteActions SearchRunner::Actions()
- {
-+ Baloo::IndexerConfig config;
-+ if (!config.fileIndexingEnabled()) {
-+ sendErrorReply(QDBusError::ErrorType::NotSupported);
-+ }
- return RemoteActions({RemoteAction{s_openParentDirId, i18n("Open
Containing Folder"), QStringLiteral("document-open-folder")}});
- }
-
- RemoteMatches SearchRunner::Match(const QString &searchTerm)
- {
-+ Baloo::IndexerConfig config;
-+ if (!config.fileIndexingEnabled()) {
-+ sendErrorReply(QDBusError::ErrorType::NotSupported);
-+ return {};
-+ }
-+
- // Do not try to show results for queries starting with =
- // this should trigger the calculator, but the AdvancedQueryParser::parse
method
- // in baloo interpreted it as an operator, BUG 345134
-diff --git a/runners/baloo/baloosearchrunner.h
b/runners/baloo/baloosearchrunner.h
-index 5006c9ae3..4836769c9 100644
---- a/runners/baloo/baloosearchrunner.h
-+++ b/runners/baloo/baloosearchrunner.h
-@@ -14,7 +14,7 @@
- #include "dbusutils_p.h"
- #include <KRunner/QueryMatch>
-
--class SearchRunner : public QObject
-+class SearchRunner : public QObject, protected QDBusContext
- {
- Q_OBJECT
-
---
-GitLab
-
diff --git
a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.3-systemtray-check-if-service-already-added.patch
b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.3-systemtray-check-if-service-already-added.patch
deleted file mode 100644
index 6258b66f6e70..000000000000
---
a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.3-systemtray-check-if-service-already-added.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 931a5441746daf10d9476409f347263719ef6c63 Mon Sep 17 00:00:00 2001
-From: Fushan Wen <qydwhotm...@gmail.com>
-Date: Mon, 1 Nov 2021 22:17:53 +0800
-Subject: [PATCH] systemtray: Check if a service is already added before
- processing QDBusReply
-
-Due to async nature of QDBusPendingReply, services could be already
-registered by QDBusServiceWatcher when the pending reply takes a long
-time to finish, so it's possible that QDBusServiceWatcher::serviceRegistered
-signal is emitted before the pending reply emits
QDBusPendingCallWatcher::finished,
-which will make the same service added twice and crash plasmashell.
-
-We need to check if a service is already added in m_sniServices before
-processing registered items in QDBusReply.
-
-BUG: 443961
-
-
-(cherry picked from commit c0b8f6871e75bbc268165844ad5780f13a5f88ac)
----
- applets/systemtray/statusnotifieritemhost.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/applets/systemtray/statusnotifieritemhost.cpp
b/applets/systemtray/statusnotifieritemhost.cpp
-index c17eedd6c..4108b2b82 100644
---- a/applets/systemtray/statusnotifieritemhost.cpp
-+++ b/applets/systemtray/statusnotifieritemhost.cpp
-@@ -101,7 +101,9 @@ void StatusNotifierItemHost::registerWatcher(const QString
&service)
- QDBusReply<QDBusVariant> reply = *watcher;
- QStringList registeredItems =
reply.value().variant().toStringList();
- foreach (const QString &service, registeredItems) {
-- addSNIService(service);
-+ if (!m_sniServices.contains(service)) { // due to async
nature of this call, service may be already there
-+ addSNIService(service);
-+ }
- }
- });
-
---
-GitLab
-
diff --git
a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.3-systemtray-fix-race-condition.patch
b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.3-systemtray-fix-race-condition.patch
deleted file mode 100644
index bbe9a152c608..000000000000
---
a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.3-systemtray-fix-race-condition.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From a9fba8b5416dd3b130045ccac40e5412714563ea Mon Sep 17 00:00:00 2001
-From: Fushan Wen <qydwhotm...@gmail.com>
-Date: Sat, 20 Nov 2021 21:04:06 +0800
-Subject: [PATCH] systemtray: Connect to StatusNotifierWatcher before
- initializing QDBusPendingReply
-
-This fixes a race condition.
-
-
-(cherry picked from commit 644588739e617cfde8ee097dff4a72cc08c421aa)
----
- applets/systemtray/statusnotifieritemhost.cpp | 19 +++++++++----------
- 1 file changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/applets/systemtray/statusnotifieritemhost.cpp
b/applets/systemtray/statusnotifieritemhost.cpp
-index 4108b2b82..117c29f17 100644
---- a/applets/systemtray/statusnotifieritemhost.cpp
-+++ b/applets/systemtray/statusnotifieritemhost.cpp
-@@ -93,6 +93,15 @@ void StatusNotifierItemHost::registerWatcher(const QString
&service)
-
m_statusNotifierWatcher->path(),
-
m_statusNotifierWatcher->connection());
-
-+ connect(m_statusNotifierWatcher,
-+
&OrgKdeStatusNotifierWatcherInterface::StatusNotifierItemRegistered,
-+ this,
-+ &StatusNotifierItemHost::serviceRegistered);
-+ connect(m_statusNotifierWatcher,
-+
&OrgKdeStatusNotifierWatcherInterface::StatusNotifierItemUnregistered,
-+ this,
-+ &StatusNotifierItemHost::serviceUnregistered);
-+
- QDBusPendingReply<QDBusVariant> pendingItems =
propetriesIface.Get(m_statusNotifierWatcher->interface(),
"RegisteredStatusNotifierItems");
-
- QDBusPendingCallWatcher *watcher = new
QDBusPendingCallWatcher(pendingItems, this);
-@@ -106,16 +115,6 @@ void StatusNotifierItemHost::registerWatcher(const
QString &service)
- }
- }
- });
--
-- connect(m_statusNotifierWatcher,
--
&OrgKdeStatusNotifierWatcherInterface::StatusNotifierItemRegistered,
-- this,
-- &StatusNotifierItemHost::serviceRegistered);
-- connect(m_statusNotifierWatcher,
--
&OrgKdeStatusNotifierWatcherInterface::StatusNotifierItemUnregistered,
-- this,
-- &StatusNotifierItemHost::serviceUnregistered);
--
- } else {
- delete m_statusNotifierWatcher;
- m_statusNotifierWatcher = nullptr;
---
-GitLab
-
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.23.3-r2.ebuild
b/kde-plasma/plasma-workspace/plasma-workspace-5.23.3-r2.ebuild
deleted file mode 100644
index 9d9161b72295..000000000000
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.23.3-r2.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.86.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma workspace"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="appstream +calculator +calendar +fontconfig geolocation gps screencast
-+semantic-desktop telemetry"
-
-REQUIRED_USE="gps? ( geolocation )"
-RESTRICT="test"
-
-# slot op: various private QtWaylandClient headers
-COMMON_DEPEND="
- >=dev-libs/wayland-1.15
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
- >=dev-qt/qtgui-${QTMIN}:5=[jpeg,libinput]
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwayland-${QTMIN}:5=
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtx11extras-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- >=kde-frameworks/kactivities-${KFMIN}:5
- >=kde-frameworks/kactivities-stats-${KFMIN}:5
- >=kde-frameworks/karchive-${KFMIN}:5
- >=kde-frameworks/kauth-${KFMIN}:5
- >=kde-frameworks/kbookmarks-${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/kdeclarative-${KFMIN}:5
- >=kde-frameworks/kded-${KFMIN}:5
- >=kde-frameworks/kglobalaccel-${KFMIN}:5
- >=kde-frameworks/kguiaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kidletime-${KFMIN}:5
- >=kde-frameworks/kinit-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kitemmodels-${KFMIN}:5
- >=kde-frameworks/kitemviews-${KFMIN}:5
- >=kde-frameworks/kjobwidgets-${KFMIN}:5
- >=kde-frameworks/knewstuff-${KFMIN}:5
- >=kde-frameworks/knotifications-${KFMIN}:5
- >=kde-frameworks/knotifyconfig-${KFMIN}:5
- >=kde-frameworks/kpackage-${KFMIN}:5
- >=kde-frameworks/kpeople-${KFMIN}:5
- >=kde-frameworks/krunner-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/ktexteditor-${KFMIN}:5
- >=kde-frameworks/ktextwidgets-${KFMIN}:5
- >=kde-frameworks/kunitconversion-${KFMIN}:5
- >=kde-frameworks/kwallet-${KFMIN}:5
- >=kde-frameworks/kwayland-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-frameworks/plasma-${KFMIN}:5
- >=kde-frameworks/prison-${KFMIN}:5[qml]
- >=kde-frameworks/solid-${KFMIN}:5
- >=kde-plasma/breeze-${PVCUT}:5
- >=kde-plasma/kscreenlocker-${PVCUT}:5
- >=kde-plasma/kwin-${PVCUT}:5
- >=kde-plasma/layer-shell-qt-${PVCUT}:5
- >=kde-plasma/libkscreen-${PVCUT}:5
- >=kde-plasma/libksysguard-${PVCUT}:5
- >=kde-plasma/libkworkspace-${PVCUT}:5
- >=media-libs/phonon-4.11.0
- sys-libs/zlib
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXau
- x11-libs/libxcb
- x11-libs/libXcursor
- x11-libs/libXfixes
- x11-libs/libXrender
- x11-libs/libXtst
- x11-libs/xcb-util
- x11-libs/xcb-util-image
- appstream? ( dev-libs/appstream[qt5] )
- calculator? ( sci-libs/libqalculate:= )
- calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
- fontconfig? (
- >=dev-qt/qtprintsupport-${QTMIN}:5
- media-libs/fontconfig
- x11-libs/libXft
- x11-libs/xcb-util-image
- )
- geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
- gps? ( sci-geosciences/gpsd )
- screencast? (
- >=dev-qt/qtgui-${QTMIN}:5=[egl]
- media-libs/libglvnd
- >=media-video/pipewire-0.3:=
- x11-libs/libdrm
- )
- semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
- telemetry? ( dev-libs/kuserfeedback:5 )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/plasma-wayland-protocols-1.1.1
- >=dev-qt/qtconcurrent-${QTMIN}:5
- >=dev-util/wayland-scanner-1.19.0
- x11-base/xorg-proto
- fontconfig? ( x11-libs/libXrender )
-"
-RDEPEND="${COMMON_DEPEND}
- app-text/iso-codes
- >=dev-qt/qdbus-${QTMIN}:5
- >=dev-qt/qtgraphicaleffects-${QTMIN}:5
- >=dev-qt/qtpaths-${QTMIN}:5
- >=dev-qt/qtquickcontrols-${QTMIN}:5[widgets]
- >=dev-qt/qtquickcontrols2-${QTMIN}:5
- kde-apps/kio-extras:5
- >=kde-frameworks/kdesu-${KFMIN}:5
- >=kde-frameworks/kirigami-${KFMIN}:5
- >=kde-frameworks/kquickcharts-${KFMIN}:5
- >=kde-plasma/milou-${PVCUT}:5
- >=kde-plasma/plasma-integration-${PVCUT}:5
- x11-apps/xmessage
- x11-apps/xprop
- x11-apps/xrdb
- x11-apps/xsetroot
- sys-apps/dbus
- !<kde-plasma/breeze-5.22.90:5
- !<kde-plasma/plasma-desktop-5.21.90:5
-"
-BDEPEND="virtual/pkgconfig"
-PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
-
-PATCHES=(
- "${FILESDIR}/${PN}-5.21.5-split-libkworkspace.patch" # downstream
- "${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream:
KDE-bug 432975, bug 767478
-
"${FILESDIR}/${P}-baloosearchrunner-emit-DBus-error-when-disabled.patch" #
KDE-bug 445342
- "${FILESDIR}/${P}-systemtray-check-if-service-already-added.patch" #
KDE-bug 443961
- "${FILESDIR}/${P}-systemtray-fix-race-condition.patch"
-)
-
-src_prepare() {
- ecm_src_prepare
-
- cmake_comment_add_subdirectory libkworkspace
- # delete colliding libkworkspace translations
- if [[ ${KDE_BUILD_TYPE} = release ]]; then
- find po -type f -name "*po" -and -name "libkworkspace*" -delete
|| die
- fi
-
- # TODO: try to get a build switch upstreamed
- if ! use screencast; then
- sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt
|| die
- fi
-
- # KDE-bug: 433730
- use calculator ||
- cmake_run_in runners cmake_comment_add_subdirectory calculator
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_xembed-sni-proxy=OFF
- -DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON
- $(cmake_use_find_package appstream AppStreamQt)
- $(cmake_use_find_package calendar KF5Holidays)
- $(cmake_use_find_package fontconfig Fontconfig)
- $(cmake_use_find_package geolocation KF5NetworkManagerQt)
- $(cmake_use_find_package semantic-desktop KF5Baloo)
- $(cmake_use_find_package telemetry KUserFeedback)
- )
-
- use geolocation && mycmakeargs+=( $(cmake_use_find_package gps libgps) )
-
- ecm_src_configure
-}
-
-src_install() {
- ecm_src_install
-
- # default startup and shutdown scripts
- insinto /etc/xdg/plasma-workspace/env
- doins "${FILESDIR}"/10-agent-startup.sh
-
- insinto /etc/xdg/plasma-workspace/shutdown
- doins "${FILESDIR}"/10-agent-shutdown.sh
- fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh
-}
-
-pkg_postinst () {
- ecm_pkg_postinst
-
- elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
- elog "edit ${EPREFIX}/etc/xdg/plasma-workspace/env/10-agent-startup.sh"
- elog "and
${EPREFIX}/etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh"
-}
