diff options
Diffstat (limited to 'kde-plasma/plasma-workspace')
11 files changed, 149 insertions, 392 deletions
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest index ecd1b10995b6..f87c36812651 100644 --- a/kde-plasma/plasma-workspace/Manifest +++ b/kde-plasma/plasma-workspace/Manifest @@ -1,14 +1,11 @@ AUX 10-agent-shutdown.sh 398 BLAKE2B f6c06021040aee856421ba536b96b81f119153f099cb1c242bdc73637b5b0f017da2355f9e135d9f40a6f47cf05e1c7910d2ff93ddc932e771794378cbb30390 SHA512 25a6f1ac242e4cbae8ab63c033af5cc320fc0f02cdc95000d5604ddfc8e2a3352055a9bbc629e5490011df2744cd0de59354c137bcb3766f0b0755773f2eb190 AUX 10-agent-startup.sh 2139 BLAKE2B 7ea9ee0e6d949eecbdfbc41bd0286919094b6d6837e4c7a6ba1a8d223e890ca2287f9c842019e04ead5015840d6d2f9b9d89320a7b0f6c20197b1d90d56506b4 SHA512 718feed12544deb1750730bebf1d618cbccdec9a4815a28b9f17278fdc9c21466b098778b9a20785625b99b5eb930049a84a67a0c033b684610ec8eb5b5ec678 AUX plasma-workspace-5.14.2-split-libkworkspace.patch 1100 BLAKE2B 7583bed4a71867de37c9741416d9a9711e2e8a9a26f5f50e826ec74a1b8efc03d4a592b06ca24df525381d7f98870329082cbafd86e1b29797ca68e78c928d81 SHA512 07a80880960719106ddb65d3b55fba5af7a71829dcb91bd9ae6bc1531ad019aeece968e01f243625f7fea2b34081590d317528797833fd9485b95cb1fd3f001d -AUX plasma-workspace-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch 1780 BLAKE2B 1462650fed75b2b33c945e34281cfec1304f9d325a41deeeea5d0030d5469f270e7d2c50cab3b897298229f9c285c335c37f9a5d330d8a19e15da7711a403b50 SHA512 c7fb22f77a8841450c1c6c3f448401bfa29f5ca4bd58d30674dae29b7acc8db9ac367f4eac2cd1dc151893dea526c167744ae2a52d08797d0e8bba8486224bbc -AUX plasma-workspace-5.19.5-gpsd-3.21.patch 997 BLAKE2B 034a08a4c524ce7b4be4d41ba945f049d03e30e4810fa107d2f7198913476a90aef0e9e0fa381413f94bd1725a4694a07eeafa147b31e2baa2810257ee0e608c SHA512 6d8eadea96bb388a64704e1b1c30190cd06b0c872b084a8b6e16f1c510fd619dd2e64ae0b9c65b39e3c020a312a451a73a8ba241b3c8575870528e97c59d46fd -AUX plasma-workspace-5.19.5-guard-against-no-virtual-desktops.patch 1608 BLAKE2B 1d6b2679d7f41863f83c69a2d11791b972275f7e9b838bc8a252c8ed4661f5774d6b43c019d9c4653f7f9af407b154869378d6845fec878972b6bd59e4fdbfa8 SHA512 08971de678b6e4c9148c4f55b44eb64870a639c9b0ecbeacdcea3565e9204f720205fd9707cc52c3284d94c0228d3f2e1464a70551582af4d49e95172f64f390 -AUX plasma-workspace-5.19.5-login-button-size.patch 2035 BLAKE2B 57618eda7a8d5071501998c9b420bfb007acd181df81068a2982fd2d40ba18398876177f221203de8daa4c53c4ec00260cb85a9f8f10c3bbe5d2f9449d9bf831 SHA512 16ae3fc015318d24c8e01adfabff4b304c98292854b805384328c47c7823d7749ad52eeb6acccc1ae9f2a2d4547929a4039e4174ab58db87de6c864b91d0f135 AUX plasma-workspace-5.20.5-avoid-render-invisible-contents.patch 1584 BLAKE2B a834e83b005575379f4ff3aec18b48bfa045c52ad5fb1483c41902c8dca6a9cadd855b8186128c0ebcbdf4ec63cbefdebe3f9e65b1a4ea9dfb94ad66702ac9db SHA512 4be1982217a33f9a90c929308e2ddfd8d92285d08a521f3039b1588bdfaa62b52dae1053aee19e25dda841e987698f286cf277d247a293868f087809747d0ebd AUX plasma-workspace-5.20.5-fix-crash-on-screen-changes.patch 2326 BLAKE2B 97dd0c98b06bb37272e322ce6fda980d26213d4621f5bb82b91ac3293ea41f2c84c243d1f54a86f4f0a5848ecac03d7a39242e0bdf2de7648dec07f29cdf2320 SHA512 9c2ac24acb748975f0c7a5a5f1c3c6fb586151c01714e7dc35b46179ab7917ea2e47c9e5edaa324ea75346cd95d4ad625616c3971b7a078f5d903be7cefe3013 -DIST plasma-workspace-5.19.5.tar.xz 5682264 BLAKE2B 435ea4c73fe50fb78911efb607f1a22ce6fe4a8f089b90b44374e7932d4f0111069dbce0168eedb61de09affdae3549563365bf85b4bbafb33fc69fad6b343e8 SHA512 4cab64c1f817f391a61ae15e37bf1fc936ddd3fb3b234e281a3e5750b67dab05c1c156789446096cbde719bf972e876757c1c5ae78adde4e85f3591fa8df5df9 +AUX plasma-workspace-5.20.5-fix-digitalclock-agenda-view.patch 1493 BLAKE2B 2b81bd9371d72913b4cb13e305a968e6944984f606c5e4645ac34a3fd1002e2297133cc320c5b015a094ba62c18689a508ae785adc0b709c9bb256ae2bddb6e8 SHA512 0a65b90bb73b0a42233ea469be145f5ab1bb33d0da1264beaf1e1a665c8b77448d59372f076dba38d023f7eba3a502e965a53de198b9685d3a0b8b828fd5d4c7 +AUX plasma-workspace-5.20.5-fix-wake-screensaver-mode-w-keypress.patch 2671 BLAKE2B 9dde17739f7c3bef298d0ec7b1d21a5a321e85356a8591d82f82c213e8adcf4cce807d45b79821d113068de7647f460d6439ec849fdc7e9ca8b71953f0193cdb SHA512 60b008f84049b59b41ed11cb7a2c0699767381b0a41303b23c2a41c6ae1cfb20f36778dc4055bd54821d323287f18bb9ca62fd1e144df99f81da40f93958412a +AUX plasma-workspace-5.20.5-wayland-fix-XKB-variable-setup.patch 1475 BLAKE2B 79b9ca4dff4f88c2343e294c9243a2221f20d14ebbda8dca87b371143eee618b7f9118ec1435c6168cc1be81a129ab9b6d21615c08f777355b0cdd6978b9847e SHA512 0a0c87db98be7fed51d0b193f683a60fe6119f7f47e82966bc01cc5c5afe6f74d7f3edd8939e709f2f72363741a5cbd7f464890fbe0bb88d25c4f5b235d3dfb2 DIST plasma-workspace-5.20.5.tar.xz 9041964 BLAKE2B b0bef6f74999d503064d55fdc670bd320a141c4619c0cfb7491158485096dfd636ad31dfbb4e9d7be3d86eca7b52bce97acb7aefe57377cce9e6a5ce1ad3cb9b SHA512 bd63502fdaa79deb380d254a3649a2810e4b2c6e748e9a38606f561cc46573a6e75631584a340a220742135f4682f9deea28c78b7fe4ad88ee6491f190b3212f -EBUILD plasma-workspace-5.19.5-r2.ebuild 7161 BLAKE2B 616371d4525a652790da41eb4e8f126f35f73b200bb90cec0715b2194b249dd9b0db638c93b40c042a261268c87c22d8ae95324790592f2841c43629c3c9d0d1 SHA512 6e757950dd26c93fdec581dcb8a04eaf5b090d9d12843a8309a142e278e3cbd2278a170616a48dd72ac64ce6face681d72ee48b2bec407f14f3537319564c149 -EBUILD plasma-workspace-5.20.5-r1.ebuild 6133 BLAKE2B db76b7ea70089f783343e8c5a798b60a4b10a5aa71be70e528c1f094381723c6f504e2370007e559952523c8f88962674a90ab947e9c8996b6f7d8d8aa7477d3 SHA512 2053f891d927fb3c3174c50813fb9fb788faa4ed7a5e9dec06c47996ab6e25bb6a0adf1b74f2cbfba6dd4ef3e68b494c5c2ba1e53027e4121ff76e65c138d399 -MISC metadata.xml 848 BLAKE2B 60b6be066ec5e396d88f6e57774e7bde6e9906de72b808d7e4887fde6f8fdd4e99667e30e244602e92c10aa8950d583adf78b6e122b4a9dc60a7a538aa69663b SHA512 77e385066c166cb8a43b531e0e079f39004d645364237d1ead4a26816297edec7283cf551310f1c0643692eb8794bce74a949b00b049f140da2e2f7a6fb2689a +EBUILD plasma-workspace-5.20.5-r3.ebuild 6339 BLAKE2B 33ac47bb12ea5b8108c65d33ca094817e37d4947240d9029fabaf361f84ee85369a12562ddb3498514f36fb9681cf7cb5c804809ab37de9007bce715ecc72775 SHA512 84988ecad6415f617e7a9d133a5a85ce7da539ed5381490d008e1cc8d94be51a937e05d2772ebd9bd691b9539f59c882b45ca9bb186bdbcd4da7c38b84b92176 +MISC metadata.xml 723 BLAKE2B 14f4d2f1ec1c0e8d511be9b01aa0f3ad09bc7bb8e6b26a9ad770834d38bf1539443a4e81af7c4237e094f4964ba7203d9dbf4ea3558a07b6df12636e48294d67 SHA512 2bcfe167618c426ac72a47160a6f62d4b9b93624a7926f978b347c64212e80c7a9678221fa0799d303860e84dd9f3f8aa96e6f64a5a67335817dfbf24010eece diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch deleted file mode 100644 index 527e199cc66d..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch +++ /dev/null @@ -1,44 +0,0 @@ -From faef126255222f727219bf69ac2b89857dc61ab2 Mon Sep 17 00:00:00 2001 -From: Nate Graham <nate@kde.org> -Date: Sun, 14 Jun 2020 09:08:21 -0600 -Subject: [PATCH] Port applets to use PlasmaExtras.PlaceholderMessage - -The Kirigami version uses QQC2 elements which don't respect the plasma -theme and color scheme, leading to thing slooking out of place -especially when using a dark color theme or scheme. - -Depends on https://invent.kde.org/frameworks/plasma-framework/-/merge_requests/13 ---- - applets/clipboard/contents/ui/Menu.qml | 2 +- - .../notifications/package/contents/ui/FullRepresentation.qml | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/applets/clipboard/contents/ui/Menu.qml b/applets/clipboard/contents/ui/Menu.qml -index 0bd6064a5..cac8380db 100644 ---- a/applets/clipboard/contents/ui/Menu.qml -+++ b/applets/clipboard/contents/ui/Menu.qml -@@ -55,7 +55,7 @@ PlasmaExtras.ScrollArea { - onAction: menu.action(uuid) - } - -- Kirigami.PlaceholderMessage { -+ PlasmaExtras.PlaceholderMessage { - id: emptyHint - - anchors.centerIn: parent -diff --git a/applets/notifications/package/contents/ui/FullRepresentation.qml b/applets/notifications/package/contents/ui/FullRepresentation.qml -index b34dee7af..989cb4341 100644 ---- a/applets/notifications/package/contents/ui/FullRepresentation.qml -+++ b/applets/notifications/package/contents/ui/FullRepresentation.qml -@@ -585,7 +585,7 @@ PlasmaComponents3.Page { - } - } - -- Kirigami.PlaceholderMessage { -+ PlasmaExtras.PlaceholderMessage { - anchors.centerIn: parent - width: parent.width - (units.largeSpacing * 4) - --- -2.27.0 - diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-gpsd-3.21.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-gpsd-3.21.patch deleted file mode 100644 index 64c5e106e10f..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-gpsd-3.21.patch +++ /dev/null @@ -1,29 +0,0 @@ -From e3134289f522edb140797818fffd60d641b86cd8 Mon Sep 17 00:00:00 2001 -From: Antonio Rojas <arojas@archlinux.org> -Date: Wed, 5 Aug 2020 14:07:24 +0200 -Subject: [PATCH] Fix build with gpsd 3.21 - -Adapt to API changes ---- - dataengines/geolocation/location_gps.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/dataengines/geolocation/location_gps.cpp b/dataengines/geolocation/location_gps.cpp -index 021c29ac5..476117ca3 100644 ---- a/dataengines/geolocation/location_gps.cpp -+++ b/dataengines/geolocation/location_gps.cpp -@@ -65,7 +65,11 @@ void Gpsd::run() - if (m_gpsdata->online) { - #endif - //qDebug() << "online"; -+#if GPSD_API_MAJOR_VERSION >= 10 -+ if (m_gpsdata->fix.status != STATUS_NO_FIX) { -+#else - if (m_gpsdata->status != STATUS_NO_FIX) { -+#endif - //qDebug() << "fix"; - d["accuracy"] = 30; - d["latitude"] = QString::number(m_gpsdata->fix.latitude); --- -GitLab - diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-guard-against-no-virtual-desktops.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-guard-against-no-virtual-desktops.patch deleted file mode 100644 index 21e335315907..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-guard-against-no-virtual-desktops.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 5cb38daedbfa5ef26a47d82d197c96230a004b0f Mon Sep 17 00:00:00 2001 -From: David Edmundson <kde@davidedmundson.co.uk> -Date: Wed, 30 Sep 2020 08:56:16 +0000 -Subject: [PATCH] [containmentactions] Guard against having no virtual desktops - -It can apparently happen that virtual desktops is empty at a given point -in time. Potentially due to other bugs on the system. - -Calls to desktopIds.at(N) will fail. - -BUG: 427106 - - -(cherry picked from commit 2441c82a2a92535ccc0a9643715427eb362c98e8) ---- - containmentactions/switchdesktop/desktop.cpp | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/containmentactions/switchdesktop/desktop.cpp b/containmentactions/switchdesktop/desktop.cpp -index 809543a49..dda78c584 100644 ---- a/containmentactions/switchdesktop/desktop.cpp -+++ b/containmentactions/switchdesktop/desktop.cpp -@@ -85,6 +85,10 @@ void SwitchDesktop::switchTo() - void SwitchDesktop::performNextAction() - { - const QVariantList &desktopIds = m_virtualDesktopInfo->desktopIds(); -+ if (desktopIds.isEmpty()) { -+ return; -+ } -+ - const QVariant ¤tDesktop = m_virtualDesktopInfo->currentDesktop(); - const int currentDesktopIndex = desktopIds.indexOf(currentDesktop); - -@@ -100,6 +104,9 @@ void SwitchDesktop::performNextAction() - void SwitchDesktop::performPreviousAction() - { - const QVariantList &desktopIds = m_virtualDesktopInfo->desktopIds(); -+ if (desktopIds.isEmpty()) { -+ return; -+ } - const QVariant ¤tDesktop = m_virtualDesktopInfo->currentDesktop(); - const int currentDesktopIndex = desktopIds.indexOf(currentDesktop); - --- -GitLab - diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-login-button-size.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-login-button-size.patch deleted file mode 100644 index aa30a4d2cf2a..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-login-button-size.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 9a8fc811282e303ec2f93c978228a85961dae263 Mon Sep 17 00:00:00 2001 -From: Noah Davis <noahadvs@gmail.com> -Date: Mon, 14 Sep 2020 10:18:57 -0400 -Subject: [PATCH] [sddm-theme/lockscreen] Fix login button size - -Some users reported this button becoming too small after KF5.74 was released, but I could not reproduce it myself. However, this code did look suspicious. Hopefully this fixes the issue. ---- - lookandfeel/contents/lockscreen/MainBlock.qml | 4 ++-- - sddm-theme/Login.qml | 5 ++--- - 2 files changed, 4 insertions(+), 5 deletions(-) - ---- a/lookandfeel/contents/lockscreen/MainBlock.qml -+++ b/lookandfeel/contents/lockscreen/MainBlock.qml -@@ -97,7 +97,8 @@ - PlasmaComponents.Button { - id: loginButton - Accessible.name: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Unlock") -- implicitHeight: passwordBox.height - units.smallSpacing * 0.5 // otherwise it comes out taller than the password field -+ Layout.preferredHeight: passwordBox.implicitHeight -+ Layout.preferredWidth: loginButton.Layout.preferredHeight - - PlasmaCore.IconItem { // no iconSource because if you take away half a unit (implicitHeight), "go-next" gets cut off - anchors.fill: parent ---- a/sddm-theme/Login.qml -+++ b/sddm-theme/Login.qml -@@ -112,8 +112,8 @@ - PlasmaComponents.Button { - id: loginButton - Accessible.name: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Log In") -- implicitHeight: passwordBox.height - units.smallSpacing * 0.5 // otherwise it comes out taller than the password field -- Layout.rightMargin: 1 // prevents it from extending beyond the username field -+ Layout.preferredHeight: passwordBox.implicitHeight -+ Layout.preferredWidth: loginButton.Layout.preferredHeight - - PlasmaCore.IconItem { // no iconSource because if you take away half a unit (implicitHeight), "go-next" gets cut off - anchors.fill: parent diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-fix-digitalclock-agenda-view.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-fix-digitalclock-agenda-view.patch new file mode 100644 index 000000000000..a7580b44475a --- /dev/null +++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-fix-digitalclock-agenda-view.patch @@ -0,0 +1,37 @@ +From aa5215a0b3f8febfe9eda2ab586d9bf8ba647c7c Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Mon, 11 Jan 2021 16:03:31 +0100 +Subject: [PATCH] [applets/digitalclock] Fix showing agenda view when enabling + plugins + +The agenda view is only shown when at least one event source is active. +When going from 0 to 1 active sources the view wasn't updated correctly. + +This was because the visibility of rightColumn was bound to the +visibility of its child, but since the visibility of the parent affects +the visibility of its childred (https://doc.qt.io/qt-5/qml-qtquick-item.html#visible-prop) that resulted in a broken binding. + +Bind to the source property directly to avoid this + +BUG: 431433 +(cherry picked from commit 56064d80ff2e798460967b28243c8117ee6ebaec) +--- + applets/digital-clock/package/contents/ui/CalendarView.qml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/applets/digital-clock/package/contents/ui/CalendarView.qml b/applets/digital-clock/package/contents/ui/CalendarView.qml +index a7104100e..1541a3501 100644 +--- a/applets/digital-clock/package/contents/ui/CalendarView.qml ++++ b/applets/digital-clock/package/contents/ui/CalendarView.qml +@@ -145,7 +145,7 @@ PlasmaComponents3.Page { + ColumnLayout { + id: rightColumn + +- visible: agenda.visible || worldClocks.visible ++ visible: calendar.showAgenda || calendar.showClocks + + Layout.minimumWidth: units.gridUnit * 14 + +-- +GitLab + diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-fix-wake-screensaver-mode-w-keypress.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-fix-wake-screensaver-mode-w-keypress.patch new file mode 100644 index 000000000000..8d2c0ddfbdb8 --- /dev/null +++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-fix-wake-screensaver-mode-w-keypress.patch @@ -0,0 +1,67 @@ +From 13057013d55ae19e76d29b9edc96510e52da2a7a Mon Sep 17 00:00:00 2001 +From: David Edmundson <kde@davidedmundson.co.uk> +Date: Fri, 8 Jan 2021 12:40:07 +0000 +Subject: [PATCH] [lookandfeel] Fix wake existing screensaver mode with key + presses + +In commit 45e0a722fb85bb5d1ab8bef92080e934254b13aa we changed the focus +on the textfield with the intention of fixing the cusor blinking. + +This had the unfortunate side effect of breaking waking out of the +screensaver mode with just the keyboard. + +That screensaver mode was bound to: +``` +property bool blockUI: mainBlock.mainPasswordBox.text.length > 0 +``` +for that to change, we need to have focus. + +Instead this patches cursor blinking more explicity. + +Doing it only in the lock screen (as opposed to the toolkit) makes sense +as this only happens due to somewhat unusual usage inside the +lockscreen. + +BUG: 431286 + + +(cherry picked from commit 2cbd7e4c70d0592d16cdaf58ed43effe4a716aa4) +--- + lookandfeel/contents/lockscreen/LockScreenUi.qml | 3 --- + lookandfeel/contents/lockscreen/MainBlock.qml | 6 ++++++ + 2 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/lookandfeel/contents/lockscreen/LockScreenUi.qml b/lookandfeel/contents/lockscreen/LockScreenUi.qml +index d2f8a2b7d..c4f9e8a45 100644 +--- a/lookandfeel/contents/lockscreen/LockScreenUi.qml ++++ b/lookandfeel/contents/lockscreen/LockScreenUi.qml +@@ -229,9 +229,6 @@ PlasmaCore.ColorScope { + + // this isn't implicit, otherwise items still get processed for the scenegraph + visible: opacity > 0 +- // changing enabled will toggle if an item can have activeFocus, which otherwise +- //keeps the text cursor blinking even when invisble +- enabled: visible + + initialItem: MainBlock { + id: mainBlock +diff --git a/lookandfeel/contents/lockscreen/MainBlock.qml b/lookandfeel/contents/lockscreen/MainBlock.qml +index 4bd5df0e5..e8f5ced47 100644 +--- a/lookandfeel/contents/lockscreen/MainBlock.qml ++++ b/lookandfeel/contents/lockscreen/MainBlock.qml +@@ -66,6 +66,12 @@ SessionManagementScreen { + enabled: !authenticator.graceLocked + revealPasswordButtonShown: true + ++ // In Qt this is implicitly active based on focus rather than visibility ++ // in any other application having a focussed invisible object would be weird ++ // but here we are using to wake out of screensaver mode ++ // We need to explicitly disable cursor flashing to avoid unnecessary renders ++ cursorVisible: visible ++ + onAccepted: { + if (lockScreenUiVisible) { + startLogin(); +-- +GitLab + diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-wayland-fix-XKB-variable-setup.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-wayland-fix-XKB-variable-setup.patch new file mode 100644 index 000000000000..3018b73cefa0 --- /dev/null +++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-wayland-fix-XKB-variable-setup.patch @@ -0,0 +1,35 @@ +From 2a6718ff53aa70d3a6c0d9a78a7aaa491907b130 Mon Sep 17 00:00:00 2001 +From: Fabian Vogt <fabian@ritter-vogt.de> +Date: Mon, 18 Jan 2021 12:56:00 +0000 +Subject: [PATCH] startplasma-wayland: Fix XKB variable setup + +When this was ported to C++, it missed the actual variable assignments. + + +(cherry picked from commit 76088e21ea2ec09d13bd462d61c4b8ffc7bc4729) +--- + startkde/startplasma-wayland.cpp | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/startkde/startplasma-wayland.cpp b/startkde/startplasma-wayland.cpp +index 500435853..38e325843 100644 +--- a/startkde/startplasma-wayland.cpp ++++ b/startkde/startplasma-wayland.cpp +@@ -61,10 +61,10 @@ int main(int argc, char** argv) + qputenv(var, r.toUtf8()); + }; + +- queryAndSet("X11MODEL", QStringLiteral("X11Model")); +- queryAndSet("X11LAYOUT", QStringLiteral("X11Layout")); +- queryAndSet("X11VARIANT", QStringLiteral("X11Variant")); +- queryAndSet("X11OPTIONS", QStringLiteral("X11Options")); ++ queryAndSet("XKB_DEFAULT_MODEL", QStringLiteral("X11Model")); ++ queryAndSet("XKB_DEFAULT_LAYOUT", QStringLiteral("X11Layout")); ++ queryAndSet("XKB_DEFAULT_VARIANT", QStringLiteral("X11Variant")); ++ queryAndSet("XKB_DEFAULT_OPTIONS", QStringLiteral("X11Options")); + } else { + qWarning() << "not a reply org.freedesktop.locale1" << resultMessage; + } +-- +GitLab + diff --git a/kde-plasma/plasma-workspace/metadata.xml b/kde-plasma/plasma-workspace/metadata.xml index b52b6b485856..599877f90bfb 100644 --- a/kde-plasma/plasma-workspace/metadata.xml +++ b/kde-plasma/plasma-workspace/metadata.xml @@ -9,7 +9,6 @@ <flag name="appstream">Enable AppStream software metadata support</flag> <flag name="geolocation">Enables dataengine providing location information</flag> <flag name="qalculate">Enable Qalculate runner using <pkg>sci-libs/libqalculate</pkg></flag> - <flag name="qrcode">Enable support for creating QR codes from clipboard data using <pkg>kde-frameworks/prison</pkg></flag> <flag name="screencast">Enable screencast portal using <pkg>media-video/pipewire</pkg></flag> <flag name="telemetry">Enable User Feedback control module for <pkg>kde-plasma/systemsettings</pkg></flag> </use> diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.19.5-r2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.19.5-r2.ebuild deleted file mode 100644 index 472f6c66c2de..000000000000 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.19.5-r2.ebuild +++ /dev/null @@ -1,225 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_HANDBOOK="forceoptional" -ECM_TEST="forceoptional" -KFMIN=5.71.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.14.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="KDE Plasma workspace" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" -IUSE="appstream +calendar geolocation gps qalculate qrcode +semantic-desktop systemd telemetry" - -REQUIRED_USE="gps? ( geolocation )" - -COMMON_DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] - >=dev-qt/qtgui-${QTMIN}:5[jpeg] - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtsql-${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/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/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/kidletime-${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/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/solid-${KFMIN}:5 - >=kde-plasma/kscreenlocker-${PVCUT}:5 - >=kde-plasma/kwin-${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/libXfixes - x11-libs/libXrender - x11-libs/libXtst - x11-libs/xcb-util - x11-libs/xcb-util-image - appstream? ( dev-libs/appstream[qt5] ) - calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 ) - geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 ) - gps? ( sci-geosciences/gpsd ) - qalculate? ( sci-libs/libqalculate:= ) - qrcode? ( >=kde-frameworks/prison-${KFMIN}:5 ) - semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 ) - telemetry? ( dev-libs/kuserfeedback:5 ) -" -DEPEND="${COMMON_DEPEND} - >=dev-qt/qtconcurrent-${QTMIN}:5 - x11-base/xorg-proto -" -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-19.04.3:5 - >=kde-frameworks/kquickcharts-${KFMIN}:5 - >=kde-frameworks/kdesu-${KFMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-plasma/ksysguard-${PVCUT}:5 - >=kde-plasma/milou-${PVCUT}:5 - >=kde-plasma/plasma-integration-${PVCUT}:5 - x11-apps/xmessage - x11-apps/xprop - x11-apps/xrdb - x11-apps/xsetroot - systemd? ( sys-apps/dbus[user-session] ) - !systemd? ( sys-apps/dbus ) - !<kde-plasma/plasma-desktop-5.16.80:5 -" -PDEPEND=" - >=kde-plasma/kde-cli-tools-${PVCUT}:5 -" - -PATCHES=( - "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" - "${FILESDIR}/${PN}-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch" # KDE-Bug #422684 - "${FILESDIR}/${P}-gpsd-3.21.patch" # bug 742392 - "${FILESDIR}/${P}-login-button-size.patch" - "${FILESDIR}/${P}-guard-against-no-virtual-desktops.patch" # KDE-Bug #427106 -) - -RESTRICT+=" test" - -pkg_setup() { - ecm_pkg_setup - - local md5 - local srcfile=/etc/plasma/XX/10-agent-XX.sh - local newdir="${EPREFIX}"/etc/xdg/plasma-workspace - - if [[ -f "${EROOT}"${srcfile//XX/startup} ]]; then - md5=$(md5sum "${EROOT}"${srcfile//XX/startup}) - if [[ ${md5%% *} != 90caaabb40b56bfbe65388841a6dd6ca ]]; then - elog "Existing modified ${EPREFIX}${srcfile//XX/startup} detected." - elog "Copying to ${newdir}/env/10-agent-startup.sh..." - cp -v "${EROOT}"${srcfile//XX/startup} "${T}"/ || die - fi - fi - - if [[ -f "${EROOT}"${srcfile//XX/shutdown} ]]; then - md5=$(md5sum "${EROOT}"${srcfile//XX/shutdown}) - if [[ ${md5%% *} != d7bffa0273f92abd999c7c3c43dbc23d ]]; then - elog "Existing modified ${EPREFIX}${srcfile//XX/shutdown} detected." - elog "Copying to ${newdir}/shutdown/10-agent-shutdown.sh..." - cp -v "${EROOT}"${srcfile//XX/shutdown} "${T}"/ || die - fi - fi -} - -src_prepare() { - ecm_src_prepare - - if [[ ! -f "${T}"/10-agent-startup.sh ]]; then - cp "${FILESDIR}"/10-agent-startup.sh "${T}"/ || die - fi - if [[ ! -f "${T}"/10-agent-shutdown.sh ]]; then - cp "${FILESDIR}"/10-agent-shutdown.sh "${T}"/ || die - fi - - 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 -} - -src_configure() { - local mycmakeargs=( - -DBUILD_xembed-sni-proxy=OFF - $(cmake_use_find_package appstream AppStreamQt) - $(cmake_use_find_package calendar KF5Holidays) - $(cmake_use_find_package geolocation KF5NetworkManagerQt) - $(cmake_use_find_package qalculate Qalculate) - $(cmake_use_find_package qrcode KF5Prison) - $(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 "${T}"/10-agent-startup.sh - - insinto /etc/xdg/plasma-workspace/shutdown - doins "${T}"/10-agent-shutdown.sh - fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh -} - -pkg_postinst () { - ecm_pkg_postinst - - # Clean up pre-5.17.4 scripts - if [[ -e "${EROOT}"/etc/plasma/startup/10-agent-startup.sh ]]; then - rm "${EROOT}"/etc/plasma/startup/10-agent-startup.sh || die - elog "Removed obsolete ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh" - fi - if [[ -e "${EROOT}"/etc/plasma/shutdown/10-agent-shutdown.sh ]]; then - rm "${EROOT}"/etc/plasma/shutdown/10-agent-shutdown.sh || die - elog "Removed obsolete ${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh" - fi - rmdir -v "${EROOT}"/etc/plasma{/startup,/shutdown,} 2> /dev/null - - 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" -} diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.20.5-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.20.5-r3.ebuild index 1e0e478654ec..5bb5619001c4 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.20.5-r1.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.20.5-r3.ebuild @@ -15,10 +15,11 @@ DESCRIPTION="KDE Plasma workspace" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" IUSE="appstream +calendar +fontconfig geolocation gps qalculate screencast +semantic-desktop systemd telemetry" REQUIRED_USE="gps? ( geolocation )" +RESTRICT+=" test" BDEPEND="virtual/pkgconfig" COMMON_DEPEND=" @@ -144,11 +145,12 @@ PDEPEND=" PATCHES=( "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" "${FILESDIR}/${P}-avoid-render-invisible-contents.patch" # KDE-Bug 347772 + "${FILESDIR}/${P}-fix-wake-screensaver-mode-w-keypress.patch" # KDE-Bug 431286 "${FILESDIR}/${P}-fix-crash-on-screen-changes.patch" # KDE-Bug 425711 + "${FILESDIR}/${P}-fix-digitalclock-agenda-view.patch" # KDE-Bug 431433 + "${FILESDIR}/${P}-wayland-fix-XKB-variable-setup.patch" ) -RESTRICT+=" test" - src_prepare() { ecm_src_prepare |