[gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     b9e122254eaaa3db6a4874c927a4fd2b074fc5c9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  8 22:40:15 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr 10 18:23:54 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9e12225

kde-plasma/plasma-workspace: drop 5.27.3-r1

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-plasma/plasma-workspace/Manifest               |   1 -
 .../files/plasma-workspace-5.27.3-cmake.patch      |  37 ----
 ...space-5.27.3-dashboard-skip-task-switcher.patch |  33 ---
 ...pace-5.27.3-nightcolor-fix-timing-strings.patch |  52 -----
 .../plasma-workspace-5.27.3-r1.ebuild              | 232 ---------------------
 5 files changed, 355 deletions(-)

diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index 959576c3c5ec..25888a987361 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1,4 +1,3 @@
 DIST plasma-workspace-5.26.5.tar.xz 17470516 BLAKE2B 4809ad1ec93e4e6d27b17197457b76f5971ea6c74ac64f64e68ecfe828068f7f33af69bdd03411a4cd0cf8fb26080ebf9c85741eacc0e53d6b782af4eabb4b8a SHA512 9fb840d3f36e1cb25126a715d5599bf89680b0c3ff2a674f07f83246dc15358e15c7e31565d39570e33f6b4d3292822d5fdde05e4795f2eef13e1a0ff2f1c687
-DIST plasma-workspace-5.27.3.tar.xz 18642372 BLAKE2B f77a8c87e3ea89f63b6c796232258d8d82613aea63de038dc7c64ad6b26df4817dcf6c7430cc51a2edf3ea9fa1c4b7c300ced505922a8346c3169ab32fd23b4a SHA512 132db99ff1a81778be928c87f59557cac40547f7ffc92f1738ea1fb575db150590a43838a3a2871e001a7e2975ce91399febfb948e444d2bd42e8a55700af96f
 DIST plasma-workspace-5.27.4.1-patchset-1.tar.xz 3496 BLAKE2B 1be7d6eee007225bf7df3dbcff7fc5757d89501920a2b5a3f567c21bb86754aa96b0cebd6ac95c065b3b3f8724f7381ae8349e1b4471538ccbdf5eccefb90936 SHA512 f99099e8645a085a510aafef9793f2ecbd7216aff5f11fac95695a73cd772cbeebe53361435ead1becde84e326c121db657535c0295a225383706b36d88e3c32
 DIST plasma-workspace-5.27.4.1.tar.xz 19405228 BLAKE2B 06e92e7c6f81c9c0dc7e2ffc7abbc5b4e121cdfd9adcceffc56464be2890cbccb4d1a25e1f298b080288ec4f87b783cdfaabccfb7dcee469c5defeeb23e4c172 SHA512 f79acb3129d7119937ecec227ebab1b50becc084b1563c1e72aa624502e8f337bd9c825d018d8080bcfcacab3cb53667005e92aa24d0cad9f25a298b1db19ae0

diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.3-cmake.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.3-cmake.patch
deleted file mode 100644
index e151a214dc4e..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.3-cmake.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 3f81a6559cd48d8735a7b0e7ca7cedac92db8cc8 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Thu, 23 Mar 2023 09:32:09 +0100
-Subject: [PATCH] Find PkgConfig before first call to pkg_check_modules
-
-Follow-up to a0d707014150786ba2e508c144b2bc6b8ad8f316
-
-For some reason this would fail only when disabling Fontconfig.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 556e017d8..c05e7275e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -76,6 +76,7 @@ set_package_properties(KF5Baloo PROPERTIES DESCRIPTION "File Searching"
-                        PURPOSE "Needed for the File Search runner."
-                       )
- 
-+find_package(PkgConfig REQUIRED)
- pkg_check_modules(QALCULATE libqalculate>2.0 REQUIRED IMPORTED_TARGET)
- 
- find_package(KWinDBusInterface CONFIG REQUIRED)
-@@ -151,7 +152,6 @@ else()
-     set(HAVE_XFIXES 0)
- endif()
- 
--find_package(PkgConfig REQUIRED)
- pkg_check_modules(PipeWire IMPORTED_TARGET libpipewire-0.3)
- add_feature_info(PipeWire PipeWire_FOUND "Required for Wayland screencasting")
- 
--- 
-2.40.0
-

diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.3-dashboard-skip-task-switcher.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.3-dashboard-skip-task-switcher.patch
deleted file mode 100644
index 2ebb9aa09fd6..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.3-dashboard-skip-task-switcher.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 29eb56d4d16c9a5544ba2b1da2369a9ed3190bb7 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Sun, 5 Feb 2023 16:49:04 +0100
-Subject: [PATCH] [dashboard] Skip task switcher
-
-CCBUG: 465303
-(cherry picked from commit 813dcc46c125fbdff4a208a23cec0ae1363f7cd8)
----
- applets/kicker/plugin/dashboardwindow.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/applets/kicker/plugin/dashboardwindow.cpp b/applets/kicker/plugin/dashboardwindow.cpp
-index fc6baedcb8..ac7522aab8 100644
---- a/applets/kicker/plugin/dashboardwindow.cpp
-+++ b/applets/kicker/plugin/dashboardwindow.cpp
-@@ -124,12 +124,12 @@ bool DashboardWindow::event(QEvent *event)
-     if (event->type() == QEvent::Expose) {
-         // FIXME TODO: We can remove this once we depend on Qt 5.6.1+.
-         // See: https://bugreports.qt.io/browse/QTBUG-26978
--        KWindowSystem::setState(winId(), NET::SkipTaskbar | NET::SkipPager);
-+        KWindowSystem::setState(winId(), NET::SkipTaskbar | NET::SkipPager | NET::SkipSwitcher);
-     } else if (event->type() == QEvent::PlatformSurface) {
-         const QPlatformSurfaceEvent *pSEvent = static_cast<QPlatformSurfaceEvent *>(event);
- 
-         if (pSEvent->surfaceEventType() == QPlatformSurfaceEvent::SurfaceCreated) {
--            KWindowSystem::setState(winId(), NET::SkipTaskbar | NET::SkipPager);
-+            KWindowSystem::setState(winId(), NET::SkipTaskbar | NET::SkipPager | NET::SkipSwitcher);
-         }
-     } else if (event->type() == QEvent::Show) {
-         updateTheme();
--- 
-GitLab
-

diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.3-nightcolor-fix-timing-strings.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.3-nightcolor-fix-timing-strings.patch
deleted file mode 100644
index 9230e2b2354f..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.3-nightcolor-fix-timing-strings.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 32982eff1abe7653f96f746cc15c0d6d1bbbb249 Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@kde.org>
-Date: Tue, 14 Mar 2023 14:29:54 -0600
-Subject: [PATCH] kcms/nightcolor: fix timing strings with narrow window widths
-
-These labels lived in an item that had `anchors.centerIn: parent` set on
-it, which makes it have no maximum width and it can overflow. Clearly it
-was the intent to avoid that, because all the child items had their
-properties set up correctly for it.
-
-To fix this, instead anchor to the parent's size and center the
-contents, and then make the parent fill the available width.
-
-Resolves https://invent.kde.org/plasma/plasma-mobile/-/issues/244
-
-
-(cherry picked from commit 16a243c88b6f5e36ec4d3f9108f2e967b4e97ad8)
----
- kcms/nightcolor/package/contents/ui/main.qml | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/kcms/nightcolor/package/contents/ui/main.qml b/kcms/nightcolor/package/contents/ui/main.qml
-index 60605b3180..c37cc0ea9a 100644
---- a/kcms/nightcolor/package/contents/ui/main.qml
-+++ b/kcms/nightcolor/package/contents/ui/main.qml
-@@ -406,7 +406,7 @@ KCM.SimpleKCM {
-             visible: kcm.nightColorSettings.mode === NightColorMode.Automatic || kcm.nightColorSettings.mode === NightColorMode.Location
-                 && kcm.nightColorSettings.active
-             Layout.topMargin: Kirigami.Units.largeSpacing * 4
--            Layout.alignment: Qt.AlignHCenter
-+            Layout.fillWidth: true
- 
-             Kirigami.LoadingPlaceholder {
-                 visible: kcm.nightColorSettings.active && kcm.nightColorSettings.mode === NightColorMode.Automatic && (!locator || !root.doneLocating)
-@@ -416,9 +416,13 @@ KCM.SimpleKCM {
- 
-             TimingsView {
-                 id: timings
-+                anchors {
-+                    top: parent.top
-+                    left: parent.left
-+                    right: parent.right
-+                }
-                 visible: kcm.nightColorSettings.mode === NightColorMode.Location ||
-                     (kcm.nightColorSettings.mode === NightColorMode.Automatic && root.doneLocating) && kcm.nightColorSettings.active
--                anchors.centerIn: parent
-                 enabled: kcm.nightColorSettings.active
-                 latitude: kcm.nightColorSettings.mode === NightColorMode.Automatic
-                     && (locator !== undefined) ? locator.latitude : kcm.nightColorSettings.latitudeFixed
--- 
-GitLab
-

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.27.3-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.27.3-r1.ebuild
deleted file mode 100644
index f228665007ac..000000000000
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.27.3-r1.ebuild
+++ /dev/null
@@ -1,232 +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="forceoptional"
-KFMIN=5.102.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.7
-VIRTUALX_REQUIRED="test"
-inherit ecm plasma.kde.org
-
-DESCRIPTION="KDE Plasma workspace"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="appstream +calendar +fontconfig geolocation gps +policykit
-screencast +semantic-desktop telemetry +wallpaper-metadata"
-
-REQUIRED_USE="gps? ( geolocation )"
-RESTRICT="test"
-
-# kde-frameworks/kwindowsystem[X]: Uses KX11Extras
-# slot op: various private QtWaylandClient headers
-COMMON_DEPEND="
-	dev-libs/icu:=
-	>=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[X]
-	>=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
-	sci-libs/libqalculate:=
-	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
-	appstream? ( dev-libs/appstream[qt5] )
-	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 )
-	policykit? (
-		sys-auth/polkit-qt
-		virtual/libcrypt:=
-	)
-	screencast? (
-		>=dev-qt/qtgui-${QTMIN}:5=[egl]
-		>=kde-plasma/kpipewire-${PVCUT}:5
-		media-libs/libglvnd
-		>=media-video/pipewire-0.3:=
-		x11-libs/libdrm
-	)
-	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
-	telemetry? ( dev-libs/kuserfeedback:5 )
-	wallpaper-metadata? ( kde-apps/libkexiv2:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/plasma-wayland-protocols-1.6.0
-	>=dev-libs/wayland-protocols-1.31
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	x11-base/xorg-proto
-	fontconfig? ( x11-libs/libXrender )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-plasma/breeze-5.22.90:5
-	!<kde-plasma/plasma-desktop-5.27.0:5
-	app-text/iso-codes
-	>=dev-qt/qdbus-${QTMIN}:*
-	>=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/kirigami-${KFMIN}:5
-	>=kde-frameworks/kquickcharts-${KFMIN}:5
-	>=kde-plasma/milou-${PVCUT}:5
-	>=kde-plasma/plasma-integration-${PVCUT}:5
-	sys-apps/dbus
-	x11-apps/xmessage
-	x11-apps/xprop
-	x11-apps/xrdb
-	x11-apps/xsetroot
-	policykit? ( sys-apps/accountsservice )
-"
-BDEPEND="
-	>=dev-qt/qtwaylandscanner-${QTMIN}:5
-	>=dev-util/wayland-scanner-1.19.0
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	virtual/pkgconfig
-"
-PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.24.80-split-libkworkspace.patch" # downstream
-	"${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478
-	"${FILESDIR}/${P}-dashboard-skip-task-switcher.patch" # KDE-bug 465303
-	"${FILESDIR}/${P}-nightcolor-fix-timing-strings.patch"
-	"${FILESDIR}/${P}-cmake.patch" # bug 902797
-)
-
-src_prepare() {
-	ecm_src_prepare
-
-	cmake_comment_add_subdirectory libkworkspace
-	# delete colliding libkworkspace translations
-	find po -type f -name "*po" -and -name "libkworkspace*" -delete || die
-
-	# TODO: try to get a build switch upstreamed
-	if ! use screencast; then
-		ecm_punt_bogus_dep KPipeWire
-		sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
-	fi
-
-	# TODO: try to get a build switch upstreamed
-	if use geolocation; then
-		use gps || sed -e "s/^pkg_check_modules.*LIBGPS/#&/" \
-			-i dataengines/geolocation/CMakeLists.txt || die
-	fi
-
-	if ! use policykit; then
-		cmake_run_in kcms cmake_comment_add_subdirectory users
-	fi
-
-	if ! use fontconfig; then
-		ecm_punt_bogus_dep XCB IMAGE
-		sed -e "s/check_X11_lib(Xft)/#&/" -i CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_xembed-sni-proxy=OFF
-		-DGLIBC_LOCALE_GEN=$(usex policykit)
-		$(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)
-	)
-
-	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"
-}