diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-09-23 10:22:15 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-09-23 10:22:15 +0100 |
commit | 8b4ace9c50842c5b83401ea7b179dcab940387e1 (patch) | |
tree | 230f3135ceaace633cf93e9838b185c4a6664c2e /kde-plasma/plasma-workspace/files | |
parent | 9ee6d97c2883d42f204a533a8bc1f4562df778fb (diff) |
gentoo resync : 23.09.2020
Diffstat (limited to 'kde-plasma/plasma-workspace/files')
-rw-r--r-- | kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-gpsd-3.21.patch | 29 | ||||
-rw-r--r-- | kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-login-button-size.patch | 36 |
2 files changed, 65 insertions, 0 deletions
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 new file mode 100644 index 000000000000..64c5e106e10f --- /dev/null +++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-gpsd-3.21.patch @@ -0,0 +1,29 @@ +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-login-button-size.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-login-button-size.patch new file mode 100644 index 000000000000..aa30a4d2cf2a --- /dev/null +++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-login-button-size.patch @@ -0,0 +1,36 @@ +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 |