public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-nm/files/, kde-plasma/plasma-nm/
@ 2017-12-16 13:17 Michael Palimaka
  0 siblings, 0 replies; 4+ messages in thread
From: Michael Palimaka @ 2017-12-16 13:17 UTC (permalink / raw
  To: gentoo-commits

commit:     897bcef18a8a0d41aebb4fbcc07b2d3811d7543b
Author:     Nils Freydank <holgersson <AT> posteo <DOT> de>
AuthorDate: Sat Dec 16 13:16:37 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Dec 16 13:17:00 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=897bcef1

kde-plasma/plasma-nm: kde-plasma/plasma-nm: Add EAP-PWD support.

Wrt upstream bug https://bugs.kde.org/show_bug.cgi?id=387685.

Package-Manager: Portage-2.3.14, Repoman-2.3.6

 .../plasma-nm/files/plasma-nm-add_EAP-PWD.patch    | 201 +++++++++++++++++++++
 kde-plasma/plasma-nm/plasma-nm-5.11.49.9999.ebuild |   4 +-
 2 files changed, 204 insertions(+), 1 deletion(-)

diff --git a/kde-plasma/plasma-nm/files/plasma-nm-add_EAP-PWD.patch b/kde-plasma/plasma-nm/files/plasma-nm-add_EAP-PWD.patch
new file mode 100644
index 0000000000..896a8144d5
--- /dev/null
+++ b/kde-plasma/plasma-nm/files/plasma-nm-add_EAP-PWD.patch
@@ -0,0 +1,201 @@
+From b98333458ca1edd1cafb2a5b83d45f46faf14103 Mon Sep 17 00:00:00 2001
+From: Jan Grulich <jgrulich@redhat.com>
+Date: Wed, 13 Dec 2017 08:51:06 +0100
+Subject: 802-1x: Add support for EAP-PWD
+
+BUG:387685
+---
+ libs/editor/settings/security802-1x.cpp | 49 +++++++++++++++++++++++++++++----
+ libs/editor/settings/ui/802-1x.ui       | 49 +++++++++++++++++++++++++++++----
+ 3 files changed, 88 insertions(+), 12 deletions(-)
+
+diff --git a/libs/editor/settings/security802-1x.cpp b/libs/editor/settings/security802-1x.cpp
+index d6405bf..461a38c 100644
+--- a/libs/editor/settings/security802-1x.cpp
++++ b/libs/editor/settings/security802-1x.cpp
+@@ -40,6 +40,7 @@ Security8021x::Security8021x(const NetworkManager::Setting::Ptr &setting, bool w
+     m_ui->leapPassword->setPasswordOptionsEnabled(true);
+     m_ui->md5Password->setPasswordOptionsEnabled(true);
+     m_ui->peapPassword->setPasswordOptionsEnabled(true);
++    m_ui->pwdPassword->setPasswordOptionsEnabled(true);
+     m_ui->tlsPrivateKeyPassword->setPasswordOptionsEnabled(true);
+     m_ui->ttlsPassword->setPasswordOptionsEnabled(true);
+ 
+@@ -49,18 +50,20 @@ Security8021x::Security8021x(const NetworkManager::Setting::Ptr &setting, bool w
+ 
+         m_ui->auth->setItemData(0, NetworkManager::Security8021xSetting::EapMethodTls);
+         m_ui->auth->setItemData(1, NetworkManager::Security8021xSetting::EapMethodLeap);
+-        m_ui->auth->setItemData(2, NetworkManager::Security8021xSetting::EapMethodFast);
+-        m_ui->auth->setItemData(3, NetworkManager::Security8021xSetting::EapMethodTtls);
+-        m_ui->auth->setItemData(4, NetworkManager::Security8021xSetting::EapMethodPeap);
++        m_ui->auth->setItemData(2, NetworkManager::Security8021xSetting::EapMethodPwd);
++        m_ui->auth->setItemData(3, NetworkManager::Security8021xSetting::EapMethodFast);
++        m_ui->auth->setItemData(4, NetworkManager::Security8021xSetting::EapMethodTtls);
++        m_ui->auth->setItemData(5, NetworkManager::Security8021xSetting::EapMethodPeap);
+     } else {
+         m_ui->auth->removeItem(2); // LEAP
+         m_ui->stackedWidget->removeWidget(m_ui->leapPage);
+ 
+         m_ui->auth->setItemData(0, NetworkManager::Security8021xSetting::EapMethodMd5);
+         m_ui->auth->setItemData(1, NetworkManager::Security8021xSetting::EapMethodTls);
+-        m_ui->auth->setItemData(2, NetworkManager::Security8021xSetting::EapMethodFast);
+-        m_ui->auth->setItemData(3, NetworkManager::Security8021xSetting::EapMethodTtls);
+-        m_ui->auth->setItemData(4, NetworkManager::Security8021xSetting::EapMethodPeap);
++        m_ui->auth->setItemData(2, NetworkManager::Security8021xSetting::EapMethodPwd);
++        m_ui->auth->setItemData(3, NetworkManager::Security8021xSetting::EapMethodFast);
++        m_ui->auth->setItemData(4, NetworkManager::Security8021xSetting::EapMethodTtls);
++        m_ui->auth->setItemData(5, NetworkManager::Security8021xSetting::EapMethodPeap);
+     }
+ 
+     // Set PEAP authentication as default
+@@ -88,6 +91,8 @@ Security8021x::Security8021x(const NetworkManager::Setting::Ptr &setting, bool w
+     connect(m_ui->leapPassword, &PasswordField::passwordOptionChanged, this, &Security8021x::slotWidgetChanged);
+     connect(m_ui->fastAllowPacProvisioning, &QCheckBox::stateChanged, this, &Security8021x::slotWidgetChanged);
+     connect(m_ui->pacFile, &KUrlRequester::textChanged, this, &Security8021x::slotWidgetChanged);
++    connect(m_ui->pwdUsername, &KLineEdit::textChanged, this, &Security8021x::slotWidgetChanged);
++    connect(m_ui->pwdPassword, &PasswordField::textChanged, this, &Security8021x::slotWidgetChanged);
+     connect(m_ui->fastUsername, &KLineEdit::textChanged, this, &Security8021x::slotWidgetChanged);
+     connect(m_ui->fastPassword, &PasswordField::textChanged, this, &Security8021x::slotWidgetChanged);
+     connect(m_ui->fastPassword, &PasswordField::passwordOptionChanged, this, &Security8021x::slotWidgetChanged);
+@@ -175,6 +180,18 @@ void Security8021x::loadConfig(const NetworkManager::Setting::Ptr &setting)
+         } else {
+             m_ui->leapPassword->setPasswordOption(PasswordField::AlwaysAsk);
+         }
++
++    } else if (eapMethods.contains(NetworkManager::Security8021xSetting::EapMethodPwd)) {
++        m_ui->auth->setCurrentIndex(m_ui->auth->findData(NetworkManager::Security8021xSetting::EapMethodPwd));
++        m_ui->pwdUsername->setText(securitySetting->identity());
++
++        if (securitySetting->passwordFlags().testFlag(NetworkManager::Setting::None)) {
++            m_ui->pwdPassword->setPasswordOption(PasswordField::StoreForAllUsers);
++        } else if (securitySetting->passwordFlags().testFlag(NetworkManager::Setting::AgentOwned)) {
++            m_ui->pwdPassword->setPasswordOption(PasswordField::StoreForUser);
++        } else {
++            m_ui->pwdPassword->setPasswordOption(PasswordField::AlwaysAsk);
++        }
+     } else if (eapMethods.contains(NetworkManager::Security8021xSetting::EapMethodFast)) {
+         m_ui->auth->setCurrentIndex(m_ui->auth->findData(NetworkManager::Security8021xSetting::EapMethodFast));
+         m_ui->fastAnonIdentity->setText(securitySetting->anonymousIdentity());
+@@ -256,6 +273,8 @@ void Security8021x::loadSecrets(const NetworkManager::Setting::Ptr &setting)
+             m_ui->leapPassword->setText(securitySetting->password());
+         } else if (eapMethods.contains(NetworkManager::Security8021xSetting::EapMethodFast)) {
+             m_ui->fastPassword->setText(securitySetting->password());
++        } else if (eapMethods.contains(NetworkManager::Security8021xSetting::EapMethodPwd)) {
++            m_ui->pwdPassword->setText(securitySetting->password());
+         } else if (eapMethods.contains(NetworkManager::Security8021xSetting::EapMethodTtls)) {
+             m_ui->ttlsPassword->setText(securitySetting->password());
+         } else if (eapMethods.contains(NetworkManager::Security8021xSetting::EapMethodPeap)) {
+@@ -366,6 +385,22 @@ QVariantMap Security8021x::setting() const
+         } else {
+             setting.setPasswordFlags(NetworkManager::Setting::NotSaved);
+         }
++    } else if (method == NetworkManager::Security8021xSetting::EapMethodPwd) {
++        if (!m_ui->pwdUsername->text().isEmpty()) {
++            setting.setIdentity(m_ui->pwdUsername->text());
++        }
++
++        if (m_ui->pwdPassword->passwordOption() == PasswordField::StoreForAllUsers) {
++            setting.setPasswordFlags(NetworkManager::Setting::None);
++        } else if (m_ui->pwdPassword->passwordOption() == PasswordField::StoreForUser) {
++            setting.setPasswordFlags(NetworkManager::Setting::AgentOwned);
++        } else {
++            setting.setPasswordFlags(NetworkManager::Setting::NotSaved);
++        }
++
++        if (!m_ui->pwdPassword->text().isEmpty()) {
++            setting.setPassword(m_ui->pwdPassword->text());
++        }
+     } else if (method == NetworkManager::Security8021xSetting::EapMethodFast) {
+         if (!m_ui->fastAnonIdentity->text().isEmpty()) {
+             setting.setAnonymousIdentity(m_ui->fastAnonIdentity->text());
+@@ -580,6 +615,8 @@ bool Security8021x::isValid() const
+         // TODO Validate other certificates??
+     } else if (method == NetworkManager::Security8021xSetting::EapMethodLeap) {
+         return !m_ui->leapUsername->text().isEmpty() && (!m_ui->leapPassword->text().isEmpty() || m_ui->leapPassword->passwordOption() == PasswordField::AlwaysAsk);
++    } else if (method == NetworkManager::Security8021xSetting::EapMethodPwd) {
++        return !m_ui->pwdUsername->text().isEmpty() && (!m_ui->pwdPassword->text().isEmpty() || m_ui->pwdPassword->passwordOption() == PasswordField::AlwaysAsk);
+     } else if (method == NetworkManager::Security8021xSetting::EapMethodFast) {
+         if (!m_ui->fastAllowPacProvisioning->isChecked() && !m_ui->pacFile->url().isValid()) {
+             return false;
+diff --git a/libs/editor/settings/ui/802-1x.ui b/libs/editor/settings/ui/802-1x.ui
+index aaa46fa..202cdf8 100644
+--- a/libs/editor/settings/ui/802-1x.ui
++++ b/libs/editor/settings/ui/802-1x.ui
+@@ -50,6 +50,11 @@
+      </item>
+      <item>
+       <property name="text">
++       <string>PWD</string>
++      </property>
++     </item>
++     <item>
++      <property name="text">
+        <string>FAST</string>
+       </property>
+      </item>
+@@ -298,6 +303,40 @@
+        </item>
+       </layout>
+      </widget>
++     <widget class="QWidget" name="pwdPage">
++      <layout class="QFormLayout" name="formLayout_8">
++       <item row="0" column="0">
++        <widget class="QLabel" name="label_33">
++         <property name="text">
++          <string>Username:</string>
++         </property>
++         <property name="buddy">
++          <cstring>md5UserName</cstring>
++         </property>
++        </widget>
++       </item>
++       <item row="0" column="1">
++        <widget class="KLineEdit" name="pwdUsername"/>
++       </item>
++       <item row="1" column="0">
++        <widget class="QLabel" name="label_34">
++         <property name="text">
++          <string>Password:</string>
++         </property>
++         <property name="buddy">
++          <cstring>md5Password</cstring>
++         </property>
++        </widget>
++       </item>
++       <item row="1" column="1">
++        <widget class="PasswordField" name="pwdPassword">
++         <property name="passwordModeEnabled" stdset="0">
++          <bool>true</bool>
++         </property>
++        </widget>
++       </item>
++      </layout>
++     </widget>
+      <widget class="QWidget" name="fastPage">
+       <layout class="QFormLayout" name="formLayout_4">
+        <item row="0" column="0">
+@@ -696,16 +735,16 @@
+    <header>kcombobox.h</header>
+   </customwidget>
+   <customwidget>
+-   <class>KUrlRequester</class>
+-   <extends>QWidget</extends>
+-   <header>kurlrequester.h</header>
+-  </customwidget>
+-  <customwidget>
+    <class>KLineEdit</class>
+    <extends>QLineEdit</extends>
+    <header>klineedit.h</header>
+   </customwidget>
+   <customwidget>
++   <class>KUrlRequester</class>
++   <extends>QWidget</extends>
++   <header>kurlrequester.h</header>
++  </customwidget>
++  <customwidget>
+    <class>PasswordField</class>
+    <extends>QLineEdit</extends>
+    <header>passwordfield.h</header>
+-- 
+cgit v0.11.2
+

diff --git a/kde-plasma/plasma-nm/plasma-nm-5.11.49.9999.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.11.49.9999.ebuild
index a6ff8ff294..d6d9be0027 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.11.49.9999.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.11.49.9999.ebuild
@@ -10,6 +10,8 @@ LICENSE="GPL-2 LGPL-2.1"
 KEYWORDS=""
 IUSE="modemmanager openconnect teamd"
 
+PATCHES=( "${FILESDIR}"/${PN}-add_EAP-PWD.patch )
+
 DEPEND="
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
@@ -28,7 +30,7 @@ DEPEND="
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep networkmanager-qt 'teamd=')
+	$(add_frameworks_dep networkmanager-qt 'teamd=' '5.41.0-r1')
 	$(add_frameworks_dep plasma)
 	$(add_frameworks_dep solid)
 	$(add_qt_dep qtdbus)


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-nm/files/, kde-plasma/plasma-nm/
@ 2018-10-09 14:14 Andreas Sturmlechner
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2018-10-09 14:14 UTC (permalink / raw
  To: gentoo-commits

commit:     d46715889205ac9915ad9661bf4dcade478f226d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  9 14:14:11 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Oct  9 14:14:11 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d4671588

kde-plasma/plasma-nm: Fix build with USE=openconnect

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 .../plasma-nm/files/plasma-nm-5.14.0-cmake.patch   | 48 ++++++++++++++++++++++
 kde-plasma/plasma-nm/plasma-nm-5.14.0.ebuild       |  2 +
 2 files changed, 50 insertions(+)

diff --git a/kde-plasma/plasma-nm/files/plasma-nm-5.14.0-cmake.patch b/kde-plasma/plasma-nm/files/plasma-nm-5.14.0-cmake.patch
new file mode 100644
index 0000000000..d2a7f5126b
--- /dev/null
+++ b/kde-plasma/plasma-nm/files/plasma-nm-5.14.0-cmake.patch
@@ -0,0 +1,48 @@
+From 20514e001ed9f91326181ac2d7ef2a7b2c718903 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Tue, 9 Oct 2018 16:03:12 +0200
+Subject: [PATCH] openconnect: add missing dependency Qt5Xml
+
+Summary: QDomDocument is imported from vpn/openconnect/openconnectauth.cpp
+
+Test Plan: Build succeeds now.
+
+Reviewers: #plasma
+
+Subscribers: plasma-devel
+
+Tags: #plasma
+
+Differential Revision: https://phabricator.kde.org/D16073
+---
+ CMakeLists.txt                 | 1 +
+ vpn/openconnect/CMakeLists.txt | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ef1ed46a..cb4eb858 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -25,6 +25,7 @@ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
+     Network
+     Quick
+     Widgets
++    Xml
+ )
+ 
+ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
+diff --git a/vpn/openconnect/CMakeLists.txt b/vpn/openconnect/CMakeLists.txt
+index cf43740d..fa1bd4a0 100644
+--- a/vpn/openconnect/CMakeLists.txt
++++ b/vpn/openconnect/CMakeLists.txt
+@@ -49,6 +49,7 @@ if (OPENCONNECT_FOUND)
+             KF5::IconThemes
+             KF5::KIOWidgets
+             KF5::CoreAddons
++            Qt5::Xml
+             ${OPENCONNECT_LIBRARIES}
+             ${maybe_OPENSSL_LIBRARIES}
+         )
+-- 
+2.19.1
+

diff --git a/kde-plasma/plasma-nm/plasma-nm-5.14.0.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.14.0.ebuild
index 86195daf56..0ad55aa99f 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.14.0.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.14.0.ebuild
@@ -53,6 +53,8 @@ RDEPEND="${DEPEND}
 	!kde-plasma/plasma-nm:4
 "
 
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		-DDISABLE_MODEMMANAGER_SUPPORT=$(usex !modemmanager)


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-nm/files/, kde-plasma/plasma-nm/
@ 2019-05-19 20:37 Andreas Sturmlechner
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2019-05-19 20:37 UTC (permalink / raw
  To: gentoo-commits

commit:     dcd95a5f03a7d4d42bb088e59440fab1e899e7b8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 19 20:28:03 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 19 20:28:03 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=dcd95a5f

kde-plasma/plasma-nm: Add missing headers to fix build

Closes: https://bugs.gentoo.org/686290
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/plasma-nm-5.15.90-includes.patch         | 51 ++++++++++++++++++++++
 kde-plasma/plasma-nm/plasma-nm-5.15.90.ebuild      |  2 +
 2 files changed, 53 insertions(+)

diff --git a/kde-plasma/plasma-nm/files/plasma-nm-5.15.90-includes.patch b/kde-plasma/plasma-nm/files/plasma-nm-5.15.90-includes.patch
new file mode 100644
index 0000000000..a8a9db5528
--- /dev/null
+++ b/kde-plasma/plasma-nm/files/plasma-nm-5.15.90-includes.patch
@@ -0,0 +1,51 @@
+From fbf0fc710cfbf6f6f9caa88bbe7f5406c2118d1d Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Sat, 18 May 2019 12:15:47 +1000
+Subject: Add missing includes
+
+Summary:
+These includes aren't always available transitively, so
+include them explicitly to avoid build failure.
+
+Reviewers: jgrulich!, davidedmundson
+
+Reviewed By: davidedmundson
+
+Subscribers: asturmlechner, plasma-devel
+
+Tags: #plasma
+
+Differential Revision: https://phabricator.kde.org/D21268
+---
+ libs/editor/settings/wireguardinterfacewidget.cpp | 3 +++
+ libs/editor/settings/wireguardpeerwidget.cpp      | 1 +
+ 2 files changed, 4 insertions(+)
+
+diff --git a/libs/editor/settings/wireguardinterfacewidget.cpp b/libs/editor/settings/wireguardinterfacewidget.cpp
+index dc148ee..4d5eeb3 100644
+--- a/libs/editor/settings/wireguardinterfacewidget.cpp
++++ b/libs/editor/settings/wireguardinterfacewidget.cpp
+@@ -26,6 +26,9 @@
+ #include "simpleiplistvalidator.h"
+ #include "wireguardkeyvalidator.h"
+ 
++#include <QFile>
++#include <QFileInfo>
++#include <QPointer>
+ #include <QStandardItemModel>
+ 
+ #include <NetworkManagerQt/Utils>
+diff --git a/libs/editor/settings/wireguardpeerwidget.cpp b/libs/editor/settings/wireguardpeerwidget.cpp
+index ee45bfc..37ab04b 100644
+--- a/libs/editor/settings/wireguardpeerwidget.cpp
++++ b/libs/editor/settings/wireguardpeerwidget.cpp
+@@ -27,6 +27,7 @@
+ #include "wireguardkeyvalidator.h"
+ 
+ #include <QStandardItemModel>
++#include <QUrl>
+ 
+ #include <NetworkManagerQt/Utils>
+ #include <NetworkManagerQt/WireguardSetting>
+-- 
+cgit v1.1

diff --git a/kde-plasma/plasma-nm/plasma-nm-5.15.90.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.15.90.ebuild
index 995f4b6b6b..81ddaf457a 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.15.90.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.15.90.ebuild
@@ -53,6 +53,8 @@ RDEPEND="${DEPEND}
 	$(add_plasma_dep kde-cli-tools)
 "
 
+PATCHES=( "${FILESDIR}/${P}-includes.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		-DDISABLE_MODEMMANAGER_SUPPORT=$(usex !modemmanager)


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-nm/files/, kde-plasma/plasma-nm/
@ 2020-06-21 21:59 Andreas Sturmlechner
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2020-06-21 21:59 UTC (permalink / raw
  To: gentoo-commits

commit:     60ca0fd5793903e1ec78076b43ee4de79508b7f3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 21 20:59:33 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 21 21:41:41 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=60ca0fd5

kde-plasma/plasma-nm: [2/2] Fix password is asked twice

See also: https://mail.kde.org/pipermail/distributions/2020-June/000367.html
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=423093

Upstream commit 271332cfc19ede398854113d037abfb35503179f
"[applet] Fix inline password field component not working properly"

Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...lasma-nm-5.19.2-fix-inline-password-field.patch | 30 ++++++++++++++++++++++
 kde-plasma/plasma-nm/plasma-nm-5.19.49.9999.ebuild |  4 +++
 2 files changed, 34 insertions(+)

diff --git a/kde-plasma/plasma-nm/files/plasma-nm-5.19.2-fix-inline-password-field.patch b/kde-plasma/plasma-nm/files/plasma-nm-5.19.2-fix-inline-password-field.patch
new file mode 100644
index 0000000000..170e20ea22
--- /dev/null
+++ b/kde-plasma/plasma-nm/files/plasma-nm-5.19.2-fix-inline-password-field.patch
@@ -0,0 +1,30 @@
+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
+

diff --git a/kde-plasma/plasma-nm/plasma-nm-5.19.49.9999.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.19.49.9999.ebuild
index 055bcf9133..c93d0347c1 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.19.49.9999.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.19.49.9999.ebuild
@@ -61,6 +61,10 @@ RDEPEND="${DEPEND}
 	>=kde-plasma/kde-cli-tools-${PVCUT}:5
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.19.2-fix-inline-password-field.patch # KDE-bug #423093
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DDISABLE_MODEMMANAGER_SUPPORT=$(usex !modemmanager)


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2020-06-21 21:59 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-10-09 14:14 [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-nm/files/, kde-plasma/plasma-nm/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2020-06-21 21:59 Andreas Sturmlechner
2019-05-19 20:37 Andreas Sturmlechner
2017-12-16 13:17 Michael Palimaka

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox