From d443f4f78cd553a37326f005a90b5a8f8030bf3c Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Thu, 13 Feb 2020 22:37:14 +0100
Subject: plasma-desktop: fix annoying bugs affecting user experience

KDEBUG #401508): Unlock widgets. Otherwise systems which had their widgets
  locked before update to Plasma 5.18 would have no way in the desktop to
  unlock them any longer.

KDEBUG #416358): Cannot apply font changes (button remains inactive).
---
 kde/build/plasma-desktop                           |  1 +
 kde/patch/plasma-desktop.patch                     |  8 +++++++
 .../plasma-desktop_kdebug_416358.patch             | 16 ++++++++++++++
 .../plasma-desktop_kdebug_417424.patch             | 25 ++++++++++++++++++++++
 4 files changed, 50 insertions(+)
 create mode 100644 kde/build/plasma-desktop
 create mode 100644 kde/patch/plasma-desktop/plasma-desktop_kdebug_416358.patch
 create mode 100644 kde/patch/plasma-desktop/plasma-desktop_kdebug_417424.patch

diff --git a/kde/build/plasma-desktop b/kde/build/plasma-desktop
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/kde/build/plasma-desktop
@@ -0,0 +1 @@
+2
diff --git a/kde/patch/plasma-desktop.patch b/kde/patch/plasma-desktop.patch
index e2fc54e..ed450fd 100644
--- a/kde/patch/plasma-desktop.patch
+++ b/kde/patch/plasma-desktop.patch
@@ -10,3 +10,11 @@
 # Fix for Plasma 5.14.4 (KDEBUG #401508):
 #cat $CWD/patch/plasma-desktop/plasma-desktop_kdebug_401508.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
 
+# KDEBUG #401508): unlock widgets.
+# Fixed in Plasma 5.18.1:
+cat $CWD/patch/plasma-desktop/plasma-desktop_kdebug_417424.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
+# KDEBUG #416358): Cannot apply font changes (button remains inactive).
+# Fixed in Plasma 5.18.1:
+cat $CWD/patch/plasma-desktop/plasma-desktop_kdebug_416358.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
diff --git a/kde/patch/plasma-desktop/plasma-desktop_kdebug_416358.patch b/kde/patch/plasma-desktop/plasma-desktop_kdebug_416358.patch
new file mode 100644
index 0000000..34ca670
--- /dev/null
+++ b/kde/patch/plasma-desktop/plasma-desktop_kdebug_416358.patch
@@ -0,0 +1,16 @@
+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/patch/plasma-desktop/plasma-desktop_kdebug_417424.patch b/kde/patch/plasma-desktop/plasma-desktop_kdebug_417424.patch
new file mode 100644
index 0000000..a840d6e
--- /dev/null
+++ b/kde/patch/plasma-desktop/plasma-desktop_kdebug_417424.patch
@@ -0,0 +1,25 @@
+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
+
+
-- 
cgit v1.2.3