From d7ed2b01311f15ba54fe8ea872aab7d59ab2b193 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 29 Jan 2021 18:03:51 +0000 Subject: gentoo resync : 29.01.2021 --- ....19.2-use-PlasmaExtras.PlaceholderMessage.patch | 44 -------------- .../files/plasma-workspace-5.19.5-gpsd-3.21.patch | 29 ---------- ...-5.19.5-guard-against-no-virtual-desktops.patch | 46 --------------- ...plasma-workspace-5.19.5-login-button-size.patch | 36 ------------ ...space-5.20.5-fix-digitalclock-agenda-view.patch | 37 ++++++++++++ ...20.5-fix-wake-screensaver-mode-w-keypress.patch | 67 ++++++++++++++++++++++ ...ace-5.20.5-wayland-fix-XKB-variable-setup.patch | 35 +++++++++++ 7 files changed, 139 insertions(+), 155 deletions(-) delete mode 100644 kde-plasma/plasma-workspace/files/plasma-workspace-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch delete mode 100644 kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-gpsd-3.21.patch delete mode 100644 kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-guard-against-no-virtual-desktops.patch delete mode 100644 kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-login-button-size.patch create mode 100644 kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-fix-digitalclock-agenda-view.patch create mode 100644 kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-fix-wake-screensaver-mode-w-keypress.patch create mode 100644 kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-wayland-fix-XKB-variable-setup.patch (limited to 'kde-plasma/plasma-workspace/files') 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 -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 -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 -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 -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 +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 +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 +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 + -- cgit v1.2.3