| 1 |
commit: 44e86e8d09dd248450f2ab24664eb4b995c81647 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 7 17:43:25 2022 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 7 20:38:45 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44e86e8d |
| 7 |
|
| 8 |
kde-plasma/plasma-desktop: Add two 5.24.7 backports |
| 9 |
|
| 10 |
Upstream commits: |
| 11 |
fffa899345df967ed815104cf88de8466d97b374 |
| 12 |
0351cdfc9210f6f88863419534250ab7b8ce04ed |
| 13 |
|
| 14 |
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=456525 |
| 15 |
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=435113 |
| 16 |
|
| 17 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 18 |
|
| 19 |
...plasma-desktop-5.24.6-fix-buttongroupmgmt.patch | 108 +++++++++++++ |
| 20 |
...desktop-5.24.6-fix-mouse-settings-loading.patch | 44 +++++ |
| 21 |
.../plasma-desktop/plasma-desktop-5.24.6-r2.ebuild | 180 +++++++++++++++++++++ |
| 22 |
3 files changed, 332 insertions(+) |
| 23 |
|
| 24 |
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 |
| 25 |
new file mode 100644 |
| 26 |
index 000000000000..0a86d08c5121 |
| 27 |
--- /dev/null |
| 28 |
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.6-fix-buttongroupmgmt.patch |
| 29 |
@@ -0,0 +1,108 @@ |
| 30 |
+From fffa899345df967ed815104cf88de8466d97b374 Mon Sep 17 00:00:00 2001 |
| 31 |
+From: ivan tkachenko <me@×××××××.tk> |
| 32 |
+Date: Sat, 9 Jul 2022 21:45:37 +0300 |
| 33 |
+Subject: [PATCH] [applets/pager] Fix button group management on configuration |
| 34 |
+ page |
| 35 |
+ |
| 36 |
+More declarative and centralized approach fixes the case when the "Text |
| 37 |
+display:" section may have no radio buttons selected. |
| 38 |
+ |
| 39 |
+Amends c50e4b987dc365d741880794ee6f2924065a87a6. |
| 40 |
+ |
| 41 |
+BUG: 456525 |
| 42 |
+FIXED-IN: 5.24.7 5.25.4 5.26 |
| 43 |
+(cherry picked from commit 4d835be8808b6372d69c424a66c3c7a1493cd6c3) |
| 44 |
+--- |
| 45 |
+ .../package/contents/ui/configGeneral.qml | 48 ++++--------------- |
| 46 |
+ 1 file changed, 10 insertions(+), 38 deletions(-) |
| 47 |
+ |
| 48 |
+diff --git a/applets/pager/package/contents/ui/configGeneral.qml b/applets/pager/package/contents/ui/configGeneral.qml |
| 49 |
+index b66620e16..c5404b9e1 100644 |
| 50 |
+--- a/applets/pager/package/contents/ui/configGeneral.qml |
| 51 |
++++ b/applets/pager/package/contents/ui/configGeneral.qml |
| 52 |
+@@ -25,39 +25,6 @@ Kirigami.FormLayout { |
| 53 |
+ property alias cfg_showOnlyCurrentScreen: showOnlyCurrentScreen.checked |
| 54 |
+ property alias cfg_wrapPage: wrapPage.checked |
| 55 |
+ |
| 56 |
+- onCfg_displayedTextChanged: { |
| 57 |
+- switch (cfg_displayedText) { |
| 58 |
+- case 0: |
| 59 |
+- displayedTextGroup.checkedButton = desktopNumberRadio; |
| 60 |
+- break; |
| 61 |
+- case 1: |
| 62 |
+- displayedTextGroup.checkedButton = desktopNameRadio; |
| 63 |
+- break; |
| 64 |
+- default: |
| 65 |
+- case 2: |
| 66 |
+- displayedTextGroup.checkedButton = noTextRadio; |
| 67 |
+- break; |
| 68 |
+- } |
| 69 |
+- } |
| 70 |
+- |
| 71 |
+- onCfg_currentDesktopSelectedChanged: { |
| 72 |
+- switch (cfg_currentDesktopSelected) { |
| 73 |
+- case 0: |
| 74 |
+- currentDesktopSelectedGroup.checkedButton = doesNothingRadio; |
| 75 |
+- break; |
| 76 |
+- case 1: |
| 77 |
+- currentDesktopSelectedGroup.checkedButton = showsDesktopRadio; |
| 78 |
+- break; |
| 79 |
+- default: |
| 80 |
+- break; |
| 81 |
+- } |
| 82 |
+- } |
| 83 |
+- |
| 84 |
+- Component.onCompleted: { |
| 85 |
+- cfg_currentDesktopSelectedChanged(); |
| 86 |
+- cfg_displayedTextChanged(); |
| 87 |
+- } |
| 88 |
+- |
| 89 |
+ QtControls.ButtonGroup { |
| 90 |
+ id: displayedTextGroup |
| 91 |
+ } |
| 92 |
+@@ -113,19 +80,22 @@ Kirigami.FormLayout { |
| 93 |
+ |
| 94 |
+ QtControls.ButtonGroup.group: displayedTextGroup |
| 95 |
+ text: i18n("No text") |
| 96 |
+- onCheckedChanged: if (checked) cfg_displayedText = 2; |
| 97 |
++ checked: cfg_displayedText === 2 |
| 98 |
++ onToggled: if (checked) cfg_displayedText = 2; |
| 99 |
+ } |
| 100 |
+ QtControls.RadioButton { |
| 101 |
+ id: desktopNumberRadio |
| 102 |
+ QtControls.ButtonGroup.group: displayedTextGroup |
| 103 |
+ text: isActivityPager ? i18n("Activity number") : i18n("Desktop number") |
| 104 |
+- onCheckedChanged: if (checked) cfg_displayedText = 0; |
| 105 |
++ checked: cfg_displayedText === 0 |
| 106 |
++ onToggled: if (checked) cfg_displayedText = 0; |
| 107 |
+ } |
| 108 |
+ QtControls.RadioButton { |
| 109 |
+ id: desktopNameRadio |
| 110 |
+ QtControls.ButtonGroup.group: displayedTextGroup |
| 111 |
+ text: isActivityPager ? i18n("Activity name") : i18n("Desktop name") |
| 112 |
+- onCheckedChanged: if (checked) cfg_displayedText = 1; |
| 113 |
++ checked: cfg_displayedText === 1 |
| 114 |
++ onToggled: if (checked) cfg_displayedText = 1; |
| 115 |
+ } |
| 116 |
+ |
| 117 |
+ |
| 118 |
+@@ -141,12 +111,14 @@ Kirigami.FormLayout { |
| 119 |
+ |
| 120 |
+ QtControls.ButtonGroup.group: currentDesktopSelectedGroup |
| 121 |
+ text: i18n("Does nothing") |
| 122 |
+- onCheckedChanged: if (checked) cfg_currentDesktopSelected = 0; |
| 123 |
++ checked: cfg_currentDesktopSelected === 0 |
| 124 |
++ onToggled: if (checked) cfg_currentDesktopSelected = 0; |
| 125 |
+ } |
| 126 |
+ QtControls.RadioButton { |
| 127 |
+ id: showsDesktopRadio |
| 128 |
+ QtControls.ButtonGroup.group: currentDesktopSelectedGroup |
| 129 |
+ text: i18n("Shows the desktop") |
| 130 |
+- onCheckedChanged: if (checked) cfg_currentDesktopSelected = 1; |
| 131 |
++ checked: cfg_currentDesktopSelected === 1 |
| 132 |
++ onToggled: if (checked) cfg_currentDesktopSelected = 1; |
| 133 |
+ } |
| 134 |
+ } |
| 135 |
+-- |
| 136 |
+GitLab |
| 137 |
+ |
| 138 |
|
| 139 |
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 |
| 140 |
new file mode 100644 |
| 141 |
index 000000000000..69996e532e10 |
| 142 |
--- /dev/null |
| 143 |
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.6-fix-mouse-settings-loading.patch |
| 144 |
@@ -0,0 +1,44 @@ |
| 145 |
+From 0351cdfc9210f6f88863419534250ab7b8ce04ed Mon Sep 17 00:00:00 2001 |
| 146 |
+From: ivan tkachenko <me@×××××××.tk> |
| 147 |
+Date: Mon, 25 Jul 2022 20:06:12 +0300 |
| 148 |
+Subject: [PATCH] Fix mouse settings not being loaded when a mouse is connected |
| 149 |
+ |
| 150 |
+Keyboard daemon was calling into the wrong module name. There are only |
| 151 |
+so much kcminit modules, and all of them are required to be named and |
| 152 |
+referenced with a "kcm_" prefix. |
| 153 |
+ |
| 154 |
+Postmortem: |
| 155 |
+ |
| 156 |
+- Mouse settings' saving and loading worked fine. |
| 157 |
+- Changing settings on the fly worked fine, and if they were not loaded |
| 158 |
+ before due to this bug, KCM loaded them and applied, after which |
| 159 |
+ mouse worked fine until disconnected. |
| 160 |
+- Starting computer with mouse already connected worked fine. |
| 161 |
+- Plug&Play (i.e. connecting mouse after session has started) was the |
| 162 |
+ only thing that was broken, because this reconfiguration failed to |
| 163 |
+ launch the proper mouse module. |
| 164 |
+ |
| 165 |
+Co-Authored-By: David Edmundson <kde@×××××××××××××××××.uk> |
| 166 |
+BUG: 435113 |
| 167 |
+FIXED-IN: 5.24.7, 5.25.4, 5.26 |
| 168 |
+(cherry picked from commit 0d7eccfbba7c3656487396dd381fcee0717bb1ec) |
| 169 |
+--- |
| 170 |
+ kcms/keyboard/keyboard_daemon.cpp | 2 +- |
| 171 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
| 172 |
+ |
| 173 |
+diff --git a/kcms/keyboard/keyboard_daemon.cpp b/kcms/keyboard/keyboard_daemon.cpp |
| 174 |
+index ae44b0ef2..56a93c4aa 100644 |
| 175 |
+--- a/kcms/keyboard/keyboard_daemon.cpp |
| 176 |
++++ b/kcms/keyboard/keyboard_daemon.cpp |
| 177 |
+@@ -89,7 +89,7 @@ void KeyboardDaemon::configureKeyboard() |
| 178 |
+ void KeyboardDaemon::configureMouse() |
| 179 |
+ { |
| 180 |
+ QStringList modules; |
| 181 |
+- modules << QStringLiteral("mouse"); |
| 182 |
++ modules << QStringLiteral("kcm_mouse"); |
| 183 |
+ QProcess::startDetached(QStringLiteral("kcminit"), modules); |
| 184 |
+ } |
| 185 |
+ |
| 186 |
+-- |
| 187 |
+GitLab |
| 188 |
+ |
| 189 |
|
| 190 |
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 |
| 191 |
new file mode 100644 |
| 192 |
index 000000000000..7c43685d3136 |
| 193 |
--- /dev/null |
| 194 |
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.24.6-r2.ebuild |
| 195 |
@@ -0,0 +1,180 @@ |
| 196 |
+# Copyright 1999-2022 Gentoo Authors |
| 197 |
+# Distributed under the terms of the GNU General Public License v2 |
| 198 |
+ |
| 199 |
+EAPI=8 |
| 200 |
+ |
| 201 |
+ECM_HANDBOOK="forceoptional" |
| 202 |
+ECM_TEST="true" |
| 203 |
+KFMIN=5.92.0 |
| 204 |
+PVCUT=$(ver_cut 1-3) |
| 205 |
+QTMIN=5.15.4 |
| 206 |
+VIRTUALX_REQUIRED="test" |
| 207 |
+inherit ecm plasma.kde.org optfeature |
| 208 |
+ |
| 209 |
+DESCRIPTION="KDE Plasma desktop" |
| 210 |
+XORGHDRS="${PN}-override-include-dirs-2" |
| 211 |
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz" |
| 212 |
+ |
| 213 |
+LICENSE="GPL-2" # TODO: CHECK |
| 214 |
+SLOT="5" |
| 215 |
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" |
| 216 |
+IUSE="emoji ibus +kaccounts scim +semantic-desktop telemetry" |
| 217 |
+ |
| 218 |
+COMMON_DEPEND=" |
| 219 |
+ >=dev-qt/qtconcurrent-${QTMIN}:5 |
| 220 |
+ >=dev-qt/qtdbus-${QTMIN}:5 |
| 221 |
+ >=dev-qt/qtdeclarative-${QTMIN}:5 |
| 222 |
+ >=dev-qt/qtgui-${QTMIN}:5 |
| 223 |
+ >=dev-qt/qtnetwork-${QTMIN}:5 |
| 224 |
+ >=dev-qt/qtprintsupport-${QTMIN}:5 |
| 225 |
+ >=dev-qt/qtsql-${QTMIN}:5 |
| 226 |
+ >=dev-qt/qtsvg-${QTMIN}:5 |
| 227 |
+ >=dev-qt/qtwidgets-${QTMIN}:5 |
| 228 |
+ >=dev-qt/qtx11extras-${QTMIN}:5 |
| 229 |
+ >=dev-qt/qtxml-${QTMIN}:5 |
| 230 |
+ >=kde-frameworks/attica-${KFMIN}:5 |
| 231 |
+ >=kde-frameworks/kactivities-${KFMIN}:5 |
| 232 |
+ >=kde-frameworks/kactivities-stats-${KFMIN}:5 |
| 233 |
+ >=kde-frameworks/karchive-${KFMIN}:5 |
| 234 |
+ >=kde-frameworks/kauth-${KFMIN}:5 |
| 235 |
+ >=kde-frameworks/kbookmarks-${KFMIN}:5 |
| 236 |
+ >=kde-frameworks/kcmutils-${KFMIN}:5 |
| 237 |
+ >=kde-frameworks/kcodecs-${KFMIN}:5 |
| 238 |
+ >=kde-frameworks/kcompletion-${KFMIN}:5 |
| 239 |
+ >=kde-frameworks/kconfig-${KFMIN}:5 |
| 240 |
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5 |
| 241 |
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5 |
| 242 |
+ >=kde-frameworks/kcrash-${KFMIN}:5 |
| 243 |
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5 |
| 244 |
+ >=kde-frameworks/kdeclarative-${KFMIN}:5 |
| 245 |
+ >=kde-frameworks/kded-${KFMIN}:5 |
| 246 |
+ >=kde-frameworks/kdelibs4support-${KFMIN}:5 |
| 247 |
+ >=kde-frameworks/kglobalaccel-${KFMIN}:5 |
| 248 |
+ >=kde-frameworks/kguiaddons-${KFMIN}:5 |
| 249 |
+ >=kde-frameworks/ki18n-${KFMIN}:5 |
| 250 |
+ >=kde-frameworks/kiconthemes-${KFMIN}:5 |
| 251 |
+ >=kde-frameworks/kio-${KFMIN}:5 |
| 252 |
+ >=kde-frameworks/kitemmodels-${KFMIN}:5 |
| 253 |
+ >=kde-frameworks/kitemviews-${KFMIN}:5 |
| 254 |
+ >=kde-frameworks/kjobwidgets-${KFMIN}:5 |
| 255 |
+ >=kde-frameworks/knewstuff-${KFMIN}:5 |
| 256 |
+ >=kde-frameworks/knotifications-${KFMIN}:5 |
| 257 |
+ >=kde-frameworks/knotifyconfig-${KFMIN}:5 |
| 258 |
+ >=kde-frameworks/kparts-${KFMIN}:5 |
| 259 |
+ >=kde-frameworks/krunner-${KFMIN}:5 |
| 260 |
+ >=kde-frameworks/kservice-${KFMIN}:5 |
| 261 |
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 |
| 262 |
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5 |
| 263 |
+ >=kde-frameworks/kxmlgui-${KFMIN}:5 |
| 264 |
+ >=kde-frameworks/plasma-${KFMIN}:5 |
| 265 |
+ >=kde-frameworks/solid-${KFMIN}:5 |
| 266 |
+ >=kde-frameworks/sonnet-${KFMIN}:5 |
| 267 |
+ >=kde-plasma/kwin-${PVCUT}:5 |
| 268 |
+ >=kde-plasma/libksysguard-${PVCUT}:5 |
| 269 |
+ >=kde-plasma/libkworkspace-${PVCUT}:5 |
| 270 |
+ >=kde-plasma/plasma-workspace-${PVCUT}:5 |
| 271 |
+ >=media-libs/phonon-4.11.0 |
| 272 |
+ x11-libs/libX11 |
| 273 |
+ x11-libs/libXfixes |
| 274 |
+ x11-libs/libXi |
| 275 |
+ x11-libs/libxcb[xkb] |
| 276 |
+ x11-libs/libxkbfile |
| 277 |
+ emoji? ( |
| 278 |
+ app-i18n/ibus[emoji] |
| 279 |
+ dev-libs/glib:2 |
| 280 |
+ media-fonts/noto-emoji |
| 281 |
+ ) |
| 282 |
+ ibus? ( |
| 283 |
+ app-i18n/ibus |
| 284 |
+ dev-libs/glib:2 |
| 285 |
+ >=dev-qt/qtx11extras-${QTMIN}:5 |
| 286 |
+ x11-libs/libxcb |
| 287 |
+ x11-libs/xcb-util-keysyms |
| 288 |
+ ) |
| 289 |
+ kaccounts? ( |
| 290 |
+ kde-apps/kaccounts-integration:5 |
| 291 |
+ net-libs/accounts-qt |
| 292 |
+ ) |
| 293 |
+ scim? ( app-i18n/scim ) |
| 294 |
+ semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 ) |
| 295 |
+ telemetry? ( dev-libs/kuserfeedback:5 ) |
| 296 |
+" |
| 297 |
+DEPEND="${COMMON_DEPEND} |
| 298 |
+ dev-libs/boost |
| 299 |
+ x11-base/xorg-proto |
| 300 |
+" |
| 301 |
+RDEPEND="${COMMON_DEPEND} |
| 302 |
+ !kde-plasma/user-manager |
| 303 |
+ >=dev-qt/qtgraphicaleffects-${QTMIN}:5 |
| 304 |
+ >=dev-qt/qtquickcontrols2-${QTMIN}:5 |
| 305 |
+ >=kde-frameworks/kirigami-${KFMIN}:5 |
| 306 |
+ >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5 |
| 307 |
+ >=kde-plasma/kde-cli-tools-${PVCUT}:5 |
| 308 |
+ >=kde-plasma/oxygen-${PVCUT}:5 |
| 309 |
+ sys-apps/util-linux |
| 310 |
+ x11-apps/setxkbmap |
| 311 |
+ x11-misc/xdg-user-dirs |
| 312 |
+ kaccounts? ( net-libs/signon-oauth2 ) |
| 313 |
+" |
| 314 |
+BDEPEND="virtual/pkgconfig" |
| 315 |
+ |
| 316 |
+PATCHES=( |
| 317 |
+ "${WORKDIR}/${XORGHDRS}/${PN}-5.24.6-override-include-dirs.patch" # downstream patch |
| 318 |
+ "${FILESDIR}/${P}-fix-buttongroupmgmt.patch" # KDE-bug 456525 |
| 319 |
+ "${FILESDIR}/${P}-fix-mouse-settings-loading.patch" # KDE-bug 435113 |
| 320 |
+) |
| 321 |
+ |
| 322 |
+src_prepare() { |
| 323 |
+ ecm_src_prepare |
| 324 |
+ |
| 325 |
+ if ! use ibus; then |
| 326 |
+ sed -e "s/Qt5X11Extras_FOUND AND XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \ |
| 327 |
+ -i applets/kimpanel/backend/ibus/CMakeLists.txt || die |
| 328 |
+ fi |
| 329 |
+ |
| 330 |
+ use emoji || cmake_run_in applets/kimpanel/backend/ibus \ |
| 331 |
+ cmake_comment_add_subdirectory emojier |
| 332 |
+ |
| 333 |
+ # TODO: try to get a build switch upstreamed |
| 334 |
+ if ! use scim; then |
| 335 |
+ sed -e "s/^pkg_check_modules.*SCIM/#&/" -i CMakeLists.txt || die |
| 336 |
+ fi |
| 337 |
+} |
| 338 |
+ |
| 339 |
+src_configure() { |
| 340 |
+ local mycmakeargs=( |
| 341 |
+ -DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON # not packaged |
| 342 |
+ -DEVDEV_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include |
| 343 |
+ -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include |
| 344 |
+ -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include |
| 345 |
+ -DSYNAPTICS_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include |
| 346 |
+ $(cmake_use_find_package kaccounts AccountsQt5) |
| 347 |
+ $(cmake_use_find_package kaccounts KAccounts) |
| 348 |
+ $(cmake_use_find_package semantic-desktop KF5Baloo) |
| 349 |
+ $(cmake_use_find_package telemetry KUserFeedback) |
| 350 |
+ ) |
| 351 |
+ if ! use emoji && ! use ibus; then |
| 352 |
+ mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_GLIB2=ON ) |
| 353 |
+ fi |
| 354 |
+ |
| 355 |
+ ecm_src_configure |
| 356 |
+} |
| 357 |
+ |
| 358 |
+src_test() { |
| 359 |
+ # parallel tests fail, foldermodeltest,positionertest hang, bug #646890 |
| 360 |
+ # test_kio_fonts needs D-Bus, bug #634166 |
| 361 |
+ # lookandfeel-kcmTest is unreliable for a long time, bug #607918 |
| 362 |
+ local myctestargs=( |
| 363 |
+ -j1 |
| 364 |
+ -E "(foldermodeltest|positionertest|test_kio_fonts|lookandfeel-kcmTest)" |
| 365 |
+ ) |
| 366 |
+ |
| 367 |
+ ecm_src_test |
| 368 |
+} |
| 369 |
+ |
| 370 |
+pkg_postinst() { |
| 371 |
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then |
| 372 |
+ optfeature "screen reader support" app-accessibility/orca |
| 373 |
+ fi |
| 374 |
+ ecm_pkg_postinst |
| 375 |
+} |
Archives