Fix KDEBUG 423093

See https://bugs.kde.org/show_bug.cgi?id=423093
  (Password is asked twice when connecting to a new WiFi network)
Fixed in Frameworks 5.72.0 and Plasma 5.20.0, but annoying enough
that I applied the patches that were made available.

7 files changed, 69 insertions, 1 deletions

diff --git a/kde/patch/plasma-framework.patch b/kde/patch/plasma-framework.patch
index c74f454..601f16c 100644
--- a/kde/patch/plasma-framework.patch
+++ b/kde/patch/plasma-framework.patch
@@ -6,3 +6,7 @@
 # KDEBUG 359388; fixed in Frameworks 5.20.
 #cat $CWD/patch/plasma-framework/plasma-framework_KDEBUG_359388.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
 
+# Password is asked twice when connecting to a new WiFi network, 
+# KDEBUG 423093; fixed in Frameworks 5.72 and Plasma 5.20.
+cat $CWD/patch/plasma-framework/plasma-framework_KDEBUG_423093.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
diff --git a/kde/patch/plasma-framework/plasma-framework_KDEBUG_423093.patch b/kde/patch/plasma-framework/plasma-framework_KDEBUG_423093.patch
new file mode 100644
index 0000000..ba1b35a
--- /dev/null
+++ b/kde/patch/plasma-framework/plasma-framework_KDEBUG_423093.patch
@@ -0,0 +1,29 @@
+From 7f9e189d87c040a952533713ff48d32872e0eadd Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Sun, 7 Jun 2020 08:46:39 -0600
+Subject: [PATCH] Add property to access the ExpandableListItem loader's item
+
+---
+ .../plasmaextracomponents/qml/ExpandableListItem.qml        | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/declarativeimports/plasmaextracomponents/qml/ExpandableListItem.qml b/src/declarativeimports/plasmaextracomponents/qml/ExpandableListItem.qml
+index d9d0662ee..ed21ab8e4 100644
+--- a/src/declarativeimports/plasmaextracomponents/qml/ExpandableListItem.qml
++++ b/src/declarativeimports/plasmaextracomponents/qml/ExpandableListItem.qml
+@@ -261,6 +261,12 @@ Item {
+      */
+     property var customExpandedViewContent: actionsListComponent
+ 
++    /*
++     * The actual instance of the custom view content, if loaded
++     * @since 5.72
++     */
++    property alias customExpandedViewContentItem: expandedView.item
++
+     /*
+      * isBusy: bool
+      * Whether or not to display a busy indicator on the list item. Set to true
+-- 
+2.27.0
+
diff --git a/kde/patch/plasma-nm.patch b/kde/patch/plasma5-nm.patch
index e86bcd1..deb03e5 100644
--- a/kde/patch/plasma-nm.patch
+++ b/kde/patch/plasma5-nm.patch
@@ -6,5 +6,9 @@
 #cat $CWD/patch/plasma-nm/plasma-nm_modemmanager-qt_api.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
 
 # Fix compilation against NetworkManager 1.0.6:
-cat $CWD/patch/plasma-nm/plasma-nm_networkmanager.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+#cat $CWD/patch/plasma-nm/plasma-nm_networkmanager.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
+# Password is asked twice when connecting to a new WiFi network,
+# KDEBUG 423093; fixed in Frameworks 5.72 and Plasma 5.20.
+cat $CWD/patch/plasma5-nm/plasma5-nm_KDEBUG_423093.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
 
diff --git a/kde/patch/plasma-nm/plasma-nm-fixes.patch b/kde/patch/plasma5-nm/plasma-nm-fixes.patch
index d98448d..d98448d 100644
--- a/kde/patch/plasma-nm/plasma-nm-fixes.patch
+++ b/kde/patch/plasma5-nm/plasma-nm-fixes.patch
diff --git a/kde/patch/plasma-nm/plasma-nm_modemmanager-qt_api.patch b/kde/patch/plasma5-nm/plasma-nm_modemmanager-qt_api.patch
index 4c59f4c..4c59f4c 100644
--- a/kde/patch/plasma-nm/plasma-nm_modemmanager-qt_api.patch
+++ b/kde/patch/plasma5-nm/plasma-nm_modemmanager-qt_api.patch
diff --git a/kde/patch/plasma-nm/plasma-nm_networkmanager.patch b/kde/patch/plasma5-nm/plasma-nm_networkmanager.patch
index e635954..e635954 100644
--- a/kde/patch/plasma-nm/plasma-nm_networkmanager.patch
+++ b/kde/patch/plasma5-nm/plasma-nm_networkmanager.patch
diff --git a/kde/patch/plasma5-nm/plasma5-nm_KDEBUG_423093.patch b/kde/patch/plasma5-nm/plasma5-nm_KDEBUG_423093.patch
new file mode 100644
index 0000000..53ea613
--- /dev/null
+++ b/kde/patch/plasma5-nm/plasma5-nm_KDEBUG_423093.patch
@@ -0,0 +1,31 @@
+From 271332cfc19ede398854113d037abfb35503179f Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Thu, 18 Jun 2020 15:34:40 +0000
+Subject: [PATCH] [WIP] [applet] Fix inline password field component not
+ working properly
+
+BUG: 423093
+FIXED-IN: 5.20
+---
+ applet/contents/ui/ConnectionItem.qml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/applet/contents/ui/ConnectionItem.qml b/applet/contents/ui/ConnectionItem.qml
+index 98240928..06c7ab25 100644
+--- a/applet/contents/ui/ConnectionItem.qml
++++ b/applet/contents/ui/ConnectionItem.qml
+@@ -231,8 +231,8 @@ PlasmaExtras.ExpandableListItem {
+                 if (!predictableWirelessPassword && !Uuid) {
+                     handler.addAndActivateConnection(DevicePath, SpecificPath)
+                 } else if (connectionItem.customExpandedViewContent == passwordDialogComponent) {
+-                    if (passwordDialogComponent.password != "") {
+-                        handler.addAndActivateConnection(DevicePath, SpecificPath, passwordDialogComponent.password)
++                    if (connectionItem.customExpandedViewContentItem.password != "") {
++                        handler.addAndActivateConnection(DevicePath, SpecificPath, connectionItem.customExpandedViewContentItem.password)
+                         connectionItem.customExpandedViewContent = detailsComponent
+                         connectionItem.collapse()
+                     } else {
+-- 
+2.27.0
+
+