gentoo resync : 17.02.2020

3 files changed, 37 insertions, 25 deletions

diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.17.4-pager-regression.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.17.4-pager-regression.patch
deleted file mode 100644
index d8057f22a4c2..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.17.4-pager-regression.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 2b5e86323f180f0c51ef9af898a69a522bc379ad Mon Sep 17 00:00:00 2001
-From: David Faure <faure@kde.org>
-Date: Sat, 14 Dec 2019 00:29:32 +0100
-Subject: Fix regression in "Port the pager applet away from QtWidgets"
-
-BUG: 414849
----
- applets/pager/plugin/windowmodel.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/applets/pager/plugin/windowmodel.cpp b/applets/pager/plugin/windowmodel.cpp
-index 93273bb..bcda333 100644
---- a/applets/pager/plugin/windowmodel.cpp
-+++ b/applets/pager/plugin/windowmodel.cpp
-@@ -77,7 +77,7 @@ QVariant WindowModel::data(const QModelIndex &index, int role) const
-     if (role == AbstractTasksModel::Geometry) {
-         QRect windowGeo = TaskFilterProxyModel::data(index, role).toRect();
-         QList<QScreen *> screens = QGuiApplication::screens();
--        const QRect desktopGeo = screens.at(0)->geometry();
-+        const QRect desktopGeo = screens.at(0)->virtualGeometry();
- 
-         if (KWindowSystem::mapViewport()) {
-             int x = windowGeo.center().x() % desktopGeo.width();
--- 
-cgit v1.1
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.0-kcm_fonts.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.0-kcm_fonts.patch
new file mode 100644
index 000000000000..ec05442beff1
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.0-kcm_fonts.patch
@@ -0,0 +1,14 @@
+diff --git a/kcms/fonts/fonts.cpp b/kcms/fonts/fonts.cpp
+--- a/kcms/fonts/fonts.cpp
++++ b/kcms/fonts/fonts.cpp
+@@ -572,8 +572,8 @@
+     // previews
+     engine()->addImageProvider("preview", new PreviewImageProvider(m_settings->font()));
+ 
+-    // reload state after loading by emiting a settings signal
+-    emit m_settings->activeFontChanged();
++    // KCM expect save state to be false at this point (can be true because of setNearestExistingFonts
++    setNeedsSave(false);
+ }
+ 
+ void KFonts::save()
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.0-unlock-widgets.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.0-unlock-widgets.patch
new file mode 100644
index 000000000000..9ea643b86597
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.0-unlock-widgets.patch
@@ -0,0 +1,23 @@
+From 2bc3c5e92d4789146548e8de4d520cd191994e1c Mon Sep 17 00:00:00 2001
+From: Marco Martin <notmart@gmail.com>
+Date: Tue, 11 Feb 2020 16:41:26 +0100
+Subject: unlock widgets
+
+5.18 doesn't offer a way anymore from the gui
+so unlock them if they're locked
+BUG:417424
+---
+ desktoppackage/contents/updates/unlock_widgets.js | 2 ++
+ 1 file changed, 2 insertions(+)
+ create mode 100644 desktoppackage/contents/updates/unlock_widgets.js
+
+diff --git a/desktoppackage/contents/updates/unlock_widgets.js b/desktoppackage/contents/updates/unlock_widgets.js
+new file mode 100644
+index 0000000..c332270
+--- /dev/null
++++ b/desktoppackage/contents/updates/unlock_widgets.js
+@@ -0,0 +1,2 @@
++
++__AppInterface.locked = false;
+-- 
+cgit v1.1