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

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

commit:     e7fade83b75818e8616a08e68fb9dc8027c0de86
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  8 12:13:31 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 10 09:47:06 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7fade83

kde-plasma/plasma-desktop: drop 5.24.6-r2

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

 kde-plasma/plasma-desktop/Manifest                 |   1 -
 ...plasma-desktop-5.24.6-fix-buttongroupmgmt.patch | 108 -------------
 ...desktop-5.24.6-fix-mouse-settings-loading.patch |  44 -----
 .../plasma-desktop/plasma-desktop-5.24.6-r2.ebuild | 180 ---------------------
 4 files changed, 333 deletions(-)

diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 6ac2291173c1..399f42fbaa49 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,3 +1,2 @@
-DIST plasma-desktop-5.24.6.tar.xz 6246924 BLAKE2B dff70688c684437eddbf74ba8487be6de3d71591ef1644841d8da11e05eb00a97d96500caeac4744d8bb6a00f7ab14d16f45c59aed10bc85ba78d0fb254e0873 SHA512 5a9324473fbb78b804c2311c223e97f66a0a00a91848818de47eb92167af6e86db22c4323a9709642a4fc58818c2a451b2afebeda35c203ad8136f119fa40023
 DIST plasma-desktop-5.25.5.tar.xz 6327616 BLAKE2B b0693b2097b3cbee01c82c19b803c64401139a5206014de5ceaa17a253de159948d93b870910d37d205989e99e66f245480ca1c79b09338babc0d56eef387399 SHA512 8bcf570ae73c21af7780706a33cf905bd566465badb457cc64515717c01ed332cd8543ca353a82222abdc8b63a762ae85d7881706742b3fe8f93c77584261ec4
 DIST plasma-desktop-override-include-dirs-2.tar.xz 8324 BLAKE2B 5ddf9340edf6b6fa76e80158a982ac887b0fb464bc40d5bc4dcd3d6b8f5a87c2d6ecdd153e67e168454aa7faff8d84defb90ba16096b64f3af1e7a74570a00c6 SHA512 452923555bd419d3e389e808c4c9ea35e48795d4f0d78c5845aea677e21f594068540538a8968c2d4034aacb11e910a7b69908e10518eba486ebcc0dda39221a

diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.6-fix-buttongroupmgmt.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.6-fix-buttongroupmgmt.patch
deleted file mode 100644
index 0a86d08c5121..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.6-fix-buttongroupmgmt.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From fffa899345df967ed815104cf88de8466d97b374 Mon Sep 17 00:00:00 2001
-From: ivan tkachenko <me@ratijas.tk>
-Date: Sat, 9 Jul 2022 21:45:37 +0300
-Subject: [PATCH] [applets/pager] Fix button group management on configuration
- page
-
-More declarative and centralized approach fixes the case when the "Text
-display:" section may have no radio buttons selected.
-
-Amends c50e4b987dc365d741880794ee6f2924065a87a6.
-
-BUG: 456525
-FIXED-IN: 5.24.7 5.25.4 5.26
-(cherry picked from commit 4d835be8808b6372d69c424a66c3c7a1493cd6c3)
----
- .../package/contents/ui/configGeneral.qml     | 48 ++++---------------
- 1 file changed, 10 insertions(+), 38 deletions(-)
-
-diff --git a/applets/pager/package/contents/ui/configGeneral.qml b/applets/pager/package/contents/ui/configGeneral.qml
-index b66620e16..c5404b9e1 100644
---- a/applets/pager/package/contents/ui/configGeneral.qml
-+++ b/applets/pager/package/contents/ui/configGeneral.qml
-@@ -25,39 +25,6 @@ Kirigami.FormLayout {
-     property alias cfg_showOnlyCurrentScreen: showOnlyCurrentScreen.checked
-     property alias cfg_wrapPage: wrapPage.checked
- 
--    onCfg_displayedTextChanged: {
--        switch (cfg_displayedText) {
--        case 0:
--            displayedTextGroup.checkedButton = desktopNumberRadio;
--            break;
--        case 1:
--            displayedTextGroup.checkedButton = desktopNameRadio;
--            break;
--        default:
--        case 2:
--            displayedTextGroup.checkedButton = noTextRadio;
--            break;
--        }
--    }
--
--    onCfg_currentDesktopSelectedChanged: {
--        switch (cfg_currentDesktopSelected) {
--        case 0:
--            currentDesktopSelectedGroup.checkedButton = doesNothingRadio;
--            break;
--        case 1:
--            currentDesktopSelectedGroup.checkedButton = showsDesktopRadio;
--            break;
--        default:
--            break;
--        }
--    }
--
--    Component.onCompleted: {
--        cfg_currentDesktopSelectedChanged();
--        cfg_displayedTextChanged();
--    }
--
-     QtControls.ButtonGroup {
-         id: displayedTextGroup
-     }
-@@ -113,19 +80,22 @@ Kirigami.FormLayout {
- 
-         QtControls.ButtonGroup.group: displayedTextGroup
-         text: i18n("No text")
--        onCheckedChanged: if (checked) cfg_displayedText = 2;
-+        checked: cfg_displayedText === 2
-+        onToggled: if (checked) cfg_displayedText = 2;
-     }
-     QtControls.RadioButton {
-         id: desktopNumberRadio
-         QtControls.ButtonGroup.group: displayedTextGroup
-         text: isActivityPager ? i18n("Activity number") : i18n("Desktop number")
--        onCheckedChanged: if (checked) cfg_displayedText = 0;
-+        checked: cfg_displayedText === 0
-+        onToggled: if (checked) cfg_displayedText = 0;
-     }
-     QtControls.RadioButton {
-         id: desktopNameRadio
-         QtControls.ButtonGroup.group: displayedTextGroup
-         text: isActivityPager ? i18n("Activity name") : i18n("Desktop name")
--        onCheckedChanged: if (checked) cfg_displayedText = 1;
-+        checked: cfg_displayedText === 1
-+        onToggled: if (checked) cfg_displayedText = 1;
-     }
- 
- 
-@@ -141,12 +111,14 @@ Kirigami.FormLayout {
- 
-         QtControls.ButtonGroup.group: currentDesktopSelectedGroup
-         text: i18n("Does nothing")
--        onCheckedChanged: if (checked) cfg_currentDesktopSelected = 0;
-+        checked: cfg_currentDesktopSelected === 0
-+        onToggled: if (checked) cfg_currentDesktopSelected = 0;
-     }
-     QtControls.RadioButton {
-         id: showsDesktopRadio
-         QtControls.ButtonGroup.group: currentDesktopSelectedGroup
-         text: i18n("Shows the desktop")
--        onCheckedChanged: if (checked) cfg_currentDesktopSelected = 1;
-+        checked: cfg_currentDesktopSelected === 1
-+        onToggled: if (checked) cfg_currentDesktopSelected = 1;
-     }
- }
--- 
-GitLab
-

diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.6-fix-mouse-settings-loading.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.6-fix-mouse-settings-loading.patch
deleted file mode 100644
index 69996e532e10..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.6-fix-mouse-settings-loading.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 0351cdfc9210f6f88863419534250ab7b8ce04ed Mon Sep 17 00:00:00 2001
-From: ivan tkachenko <me@ratijas.tk>
-Date: Mon, 25 Jul 2022 20:06:12 +0300
-Subject: [PATCH] Fix mouse settings not being loaded when a mouse is connected
-
-Keyboard daemon was calling into the wrong module name. There are only
-so much kcminit modules, and all of them are required to be named and
-referenced with a "kcm_" prefix.
-
-Postmortem:
-
-- Mouse settings' saving and loading worked fine.
-- Changing settings on the fly worked fine, and if they were not loaded
-  before due to this bug, KCM loaded them and applied, after which
-  mouse worked fine until disconnected.
-- Starting computer with mouse already connected worked fine.
-- Plug&Play (i.e. connecting mouse after session has started) was the
-  only thing that was broken, because this reconfiguration failed to
-  launch the proper mouse module.
-
-Co-Authored-By: David Edmundson <kde@davidedmundson.co.uk>
-BUG: 435113
-FIXED-IN: 5.24.7, 5.25.4, 5.26
-(cherry picked from commit 0d7eccfbba7c3656487396dd381fcee0717bb1ec)
----
- kcms/keyboard/keyboard_daemon.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/kcms/keyboard/keyboard_daemon.cpp b/kcms/keyboard/keyboard_daemon.cpp
-index ae44b0ef2..56a93c4aa 100644
---- a/kcms/keyboard/keyboard_daemon.cpp
-+++ b/kcms/keyboard/keyboard_daemon.cpp
-@@ -89,7 +89,7 @@ void KeyboardDaemon::configureKeyboard()
- void KeyboardDaemon::configureMouse()
- {
-     QStringList modules;
--    modules << QStringLiteral("mouse");
-+    modules << QStringLiteral("kcm_mouse");
-     QProcess::startDetached(QStringLiteral("kcminit"), modules);
- }
- 
--- 
-GitLab
-

diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.24.6-r2.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.24.6-r2.ebuild
deleted file mode 100644
index 5b816b2adcf6..000000000000
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.24.6-r2.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-KFMIN=5.92.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.4
-VIRTUALX_REQUIRED="test"
-inherit ecm plasma.kde.org optfeature
-
-DESCRIPTION="KDE Plasma desktop"
-XORGHDRS="${PN}-override-include-dirs-2"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="emoji ibus +kaccounts scim +semantic-desktop telemetry"
-
-COMMON_DEPEND="
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/attica-${KFMIN}: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/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/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kded-${KFMIN}:5
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${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/kparts-${KFMIN}:5
-	>=kde-frameworks/krunner-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=kde-plasma/kwin-${PVCUT}:5
-	>=kde-plasma/libksysguard-${PVCUT}:5
-	>=kde-plasma/libkworkspace-${PVCUT}:5
-	>=kde-plasma/plasma-workspace-${PVCUT}:5
-	>=media-libs/phonon-4.11.0
-	x11-libs/libX11
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libxcb[xkb]
-	x11-libs/libxkbfile
-	emoji? (
-		app-i18n/ibus[emoji]
-		dev-libs/glib:2
-		media-fonts/noto-emoji
-	)
-	ibus? (
-		app-i18n/ibus
-		dev-libs/glib:2
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libxcb
-		x11-libs/xcb-util-keysyms
-	)
-	kaccounts? (
-		kde-apps/kaccounts-integration:5
-		net-libs/accounts-qt
-	)
-	scim? ( app-i18n/scim )
-	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
-	telemetry? ( dev-libs/kuserfeedback:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	x11-base/xorg-proto
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-plasma/user-manager
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-	>=kde-plasma/oxygen-${PVCUT}:5
-	sys-apps/util-linux
-	x11-apps/setxkbmap
-	x11-misc/xdg-user-dirs
-	kaccounts? ( net-libs/signon-oauth2 )
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${WORKDIR}/${XORGHDRS}/${PN}-5.24.6-override-include-dirs.patch" # downstream patch
-	"${FILESDIR}/${P}-fix-buttongroupmgmt.patch" # KDE-bug 456525
-	"${FILESDIR}/${P}-fix-mouse-settings-loading.patch" # KDE-bug 435113
-)
-
-src_prepare() {
-	ecm_src_prepare
-
-	if ! use ibus; then
-		sed -e "s/Qt5X11Extras_FOUND AND XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \
-			-i applets/kimpanel/backend/ibus/CMakeLists.txt || die
-	fi
-
-	use emoji || cmake_run_in applets/kimpanel/backend/ibus \
-		cmake_comment_add_subdirectory emojier
-
-	# TODO: try to get a build switch upstreamed
-	if ! use scim; then
-		sed -e "s/^pkg_check_modules.*SCIM/#&/" -i CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON # not packaged
-		-DEVDEV_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		-DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		-DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		-DSYNAPTICS_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		$(cmake_use_find_package kaccounts AccountsQt5)
-		$(cmake_use_find_package kaccounts KAccounts)
-		$(cmake_use_find_package semantic-desktop KF5Baloo)
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-	if ! use emoji && ! use ibus; then
-		mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_GLIB2=ON )
-	fi
-
-	ecm_src_configure
-}
-
-src_test() {
-	# parallel tests fail, foldermodeltest,positionertest hang, bug #646890
-	# test_kio_fonts needs D-Bus, bug #634166
-	# lookandfeel-kcmTest is unreliable for a long time, bug #607918
-	local myctestargs=(
-		-j1
-		-E "(foldermodeltest|positionertest|test_kio_fonts|lookandfeel-kcmTest)"
-	)
-
-	ecm_src_test
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "screen reader support" app-accessibility/orca
-	fi
-	ecm_pkg_postinst
-}