* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-nm/files/
@ 2021-07-11 14:42 Conrad Kostecki
0 siblings, 0 replies; 3+ messages in thread
From: Conrad Kostecki @ 2021-07-11 14:42 UTC (permalink / raw
To: gentoo-commits
commit: 1857c5db2a3642b024c8091b73a58c6ee91f89c1
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Jul 11 11:32:23 2021 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Jul 11 14:42:52 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1857c5db
kde-plasma/plasma-nm: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/21595
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
...sma-nm-5.22.0-qt-5.15.2ff-missing-include.patch | 30 ----------------------
1 file changed, 30 deletions(-)
diff --git a/kde-plasma/plasma-nm/files/plasma-nm-5.22.0-qt-5.15.2ff-missing-include.patch b/kde-plasma/plasma-nm/files/plasma-nm-5.22.0-qt-5.15.2ff-missing-include.patch
deleted file mode 100644
index 133b3e225c5..00000000000
--- a/kde-plasma/plasma-nm/files/plasma-nm-5.22.0-qt-5.15.2ff-missing-include.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 55ab9bfd83fb74d14e26cc1a3d8f257bc47c45ea Mon Sep 17 00:00:00 2001
-From: Heiko Becker <heiko.becker@kde.org>
-Date: Sun, 6 Jun 2021 19:34:16 +0200
-Subject: [PATCH] Add missing QFile include
-
-Used since 40d056195bc400bc4e249cd152993000011687c2. I suppose it's
-implicitly pulled in some cases, but for me the build fails against
-Qt from KDE's patch collection with "libs/handler.cpp:704:5: error:
-'QFile' was not declared in this scope;".
-
-(cherry picked from commit 6cac88b61da1277dcb9a801e47f2d69829c68086)
----
- libs/handler.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libs/handler.cpp b/libs/handler.cpp
-index 470b0fc1..7c8302be 100644
---- a/libs/handler.cpp
-+++ b/libs/handler.cpp
-@@ -45,6 +45,7 @@
- #include <QDBusError>
- #include <QDBusMetaType>
- #include <QDBusPendingReply>
-+#include <QFile>
- #include <QIcon>
-
- #include <KNotification>
---
-GitLab
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-nm/files/
@ 2019-12-27 17:10 Aaron Bauman
0 siblings, 0 replies; 3+ messages in thread
From: Aaron Bauman @ 2019-12-27 17:10 UTC (permalink / raw
To: gentoo-commits
commit: b91bd0512a3bbf37466c03deb20eadfcfb7379ea
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Dec 27 15:59:25 2019 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri Dec 27 17:09:40 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b91bd051
kde-plasma/plasma-nm: remove unused patch(es)
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/14137
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
| 62 ----------------------
1 file changed, 62 deletions(-)
diff --git a/kde-plasma/plasma-nm/files/plasma-nm-5.16.5-missing-headers.patch b/kde-plasma/plasma-nm/files/plasma-nm-5.16.5-missing-headers.patch
deleted file mode 100644
index 676087e89ac..00000000000
--- a/kde-plasma/plasma-nm/files/plasma-nm-5.16.5-missing-headers.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From a7eb3cb599fbb1d66c6980d53550822cbbfd1520 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 14 Aug 2019 11:25:49 +0200
-Subject: Add missing headers with DISABLE_MODEMMANAGER_SUPPORT=ON
-
-Reviewers: jgrulich
-
-Reviewed By: jgrulich
-
-Subscribers: plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D23148
----
- libs/declarative/networkstatus.cpp | 2 ++
- libs/handler.cpp | 1 +
- libs/handler.h | 1 +
- 3 files changed, 4 insertions(+)
-
-diff --git a/libs/declarative/networkstatus.cpp b/libs/declarative/networkstatus.cpp
-index b9db376..e94b7ea 100644
---- a/libs/declarative/networkstatus.cpp
-+++ b/libs/declarative/networkstatus.cpp
-@@ -20,7 +20,9 @@
-
- #include "networkstatus.h"
- #include "uiutils.h"
-+
- #include <QDBusConnection>
-+#include <QDBusConnectionInterface>
-
- #include <NetworkManagerQt/ActiveConnection>
- #include <NetworkManagerQt/Connection>
-diff --git a/libs/handler.cpp b/libs/handler.cpp
-index 40b4b43..0095aa7 100644
---- a/libs/handler.cpp
-+++ b/libs/handler.cpp
-@@ -46,6 +46,7 @@
- #endif
-
- #include <QDBusError>
-+#include <QDBusMetaType>
- #include <QDBusPendingReply>
- #include <QIcon>
-
-diff --git a/libs/handler.h b/libs/handler.h
-index f8b7941..4c72699 100644
---- a/libs/handler.h
-+++ b/libs/handler.h
-@@ -22,6 +22,7 @@
- #define PLASMA_NM_HANDLER_H
-
- #include <QDBusInterface>
-+#include <QTimer>
-
- #include <NetworkManagerQt/Connection>
- #include <NetworkManagerQt/Settings>
---
-cgit v1.1
-
-
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-nm/files/
@ 2018-05-27 16:11 Aaron Bauman
0 siblings, 0 replies; 3+ messages in thread
From: Aaron Bauman @ 2018-05-27 16:11 UTC (permalink / raw
To: gentoo-commits
commit: 1ceecc7b581e17ac113f76ae3a35529f9384cfb6
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun May 27 12:02:01 2018 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sun May 27 16:09:49 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ceecc7b
kde-plasma/plasma-nm: remove unused patch(es)
.../plasma-nm/files/plasma-nm-add_EAP-PWD.patch | 201 ---------------------
1 file changed, 201 deletions(-)
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
deleted file mode 100644
index 896a8144d52..00000000000
--- a/kde-plasma/plasma-nm/files/plasma-nm-add_EAP-PWD.patch
+++ /dev/null
@@ -1,201 +0,0 @@
-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
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-07-11 14:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-07-11 14:42 [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-nm/files/ Conrad Kostecki
-- strict thread matches above, loose matches on Subject: below --
2019-12-27 17:10 Aaron Bauman
2018-05-27 16:11 Aaron Bauman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox