diff options
Diffstat (limited to 'kde-plasma/plasma-desktop')
4 files changed, 335 insertions, 0 deletions
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest index 4fef10e8ed96..03574a11b71b 100644 --- a/kde-plasma/plasma-desktop/Manifest +++ b/kde-plasma/plasma-desktop/Manifest @@ -1,6 +1,9 @@ +AUX plasma-desktop-5.24.6-fix-buttongroupmgmt.patch 3830 BLAKE2B b462e016083dbd1eb58b073f72b76536480742003b539ce5afbddd06c8b3b468fc98af05794cb0d624766059b917f60e6371844656816b29ec438876a3537fbf SHA512 2132451ee4d3a05ef847e106b5920f82589e9ee041fc88df4db10f5fce9e00a4961817e3e7f113e5ab410202e0861c1e0ddb6d631b654a2eb44d9d2197dbf679 +AUX plasma-desktop-5.24.6-fix-mouse-settings-loading.patch 1637 BLAKE2B 7dbd5ef28a1f77540029788f08826eb107b4b9d1de8e4ff620900304c17b7a7afe30c899cbce0e9baafff8b8ebfdd717e668ea9305570d70dc8e3ed2a836875e SHA512 e6c606bea1ccad7e7116bda4309585621ac16955a48dee7fa7a778d6523db81f90d94342a003f65be78a04feefd193ad091cc98813165f3d000bee48daf6b43c DIST plasma-desktop-5.24.6.tar.xz 6246924 BLAKE2B dff70688c684437eddbf74ba8487be6de3d71591ef1644841d8da11e05eb00a97d96500caeac4744d8bb6a00f7ab14d16f45c59aed10bc85ba78d0fb254e0873 SHA512 5a9324473fbb78b804c2311c223e97f66a0a00a91848818de47eb92167af6e86db22c4323a9709642a4fc58818c2a451b2afebeda35c203ad8136f119fa40023 DIST plasma-desktop-5.25.4.tar.xz 6300800 BLAKE2B c1f36192c437989a637d9929963353cbc38184a907bf9b2d19b137f7c0fc406ca2ab2ac6c719a2ce8a2ebcbe6a3a0b3a7f6174d808bc66061e32f403cc2aee61 SHA512 271d38bc2c1bd5b8aa355fc33f432952e30b4b4087280d939a38e829b3187c1a40c8faa257854f41b9049cb74f136f8ba2b0589f5f7847b2681cc824fb034547 DIST plasma-desktop-override-include-dirs-2.tar.xz 8324 BLAKE2B 5ddf9340edf6b6fa76e80158a982ac887b0fb464bc40d5bc4dcd3d6b8f5a87c2d6ecdd153e67e168454aa7faff8d84defb90ba16096b64f3af1e7a74570a00c6 SHA512 452923555bd419d3e389e808c4c9ea35e48795d4f0d78c5845aea677e21f594068540538a8968c2d4034aacb11e910a7b69908e10518eba486ebcc0dda39221a EBUILD plasma-desktop-5.24.6-r1.ebuild 5212 BLAKE2B 9e3292213d22aa001054312f084233ddb6219eaa97f5f52c01e274dcb51acf35d04512fcf3dfd58130a479bdd3d5cd19aadb810b384998aff36129de2b0fb663 SHA512 ca15c914bd7285044dca71c22bed509c2fb834f75d945d8b34b7d8c30004e493bf7557519d7304a2bfdcc72b90aa785af9c45a3bcad3d25dd4f1c07e2b08e8ca +EBUILD plasma-desktop-5.24.6-r2.ebuild 5348 BLAKE2B 60c60abaad0c55b3cfab40c8b392b9f4a4de3c8fbec5e94a591044229bd9bfe6edbbb9caf7ce8b4c3d2c63505d01e88205af8b432e768bf25289ea9a4ce41f6c SHA512 bc76802bd88ddd6d6ecfab80ee56d944bee48a5e07f57b299ce93cd1d9be5a2a8550f3c4476f5b79b7b02a477f661f45a8f0b9246177815e0061cc2f52710ea1 EBUILD plasma-desktop-5.25.4.ebuild 5215 BLAKE2B 01e1822a2eaf6eea3122ef571338fb01f77d9cc1a5f1f130dc673f2f291cf2ea2d9d896af18496dc5ea151a8f81563dada9734493d6c29ff1a111bd97b513a4d SHA512 e8545e7a8a0aa8ed74bee801758be0888b7cad77a18af7bc911a6a2da65b9d419c6f1b65401a3028ae8719a4f9860e6b1d4d00078e424fa7c002a00eb29d0a2a MISC metadata.xml 682 BLAKE2B fbd378484f259e8b85c9c8776c5ce7eb034432f9a4e547453e0b810b22273bc8c494fdcc5f435c1b660c9660fc68b4860fc40987b0c6b8ee82764cc7fd15e771 SHA512 dff0c23d15a172b901fb0d0b9e383b8cfbc47b2123cf06545c3f9064db492987043695305de4af66fedc8d1900fcfb266b120f4883e2384303c9e4f2a208bee5 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 new file mode 100644 index 000000000000..0a86d08c5121 --- /dev/null +++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.6-fix-buttongroupmgmt.patch @@ -0,0 +1,108 @@ +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 new file mode 100644 index 000000000000..69996e532e10 --- /dev/null +++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.6-fix-mouse-settings-loading.patch @@ -0,0 +1,44 @@ +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 new file mode 100644 index 000000000000..7c43685d3136 --- /dev/null +++ b/kde-plasma/plasma-desktop/plasma-desktop-5.24.6-r2.ebuild @@ -0,0 +1,180 @@ +# 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 +} |