* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-nm/files/
@ 2018-01-05 8:48 Johannes Huber
0 siblings, 0 replies; 5+ messages in thread
From: Johannes Huber @ 2018-01-05 8:48 UTC (permalink / raw
To: gentoo-commits
commit: 5343549ab73d2ae2bb32d91fbc01e197ee6e66ca
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 5 08:48:07 2018 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Jan 5 08:48:07 2018 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=5343549a
kde-plasma/plasma-nm: Remove unused patch
Package-Manager: Portage-2.3.19, Repoman-2.3.6
.../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 896a8144d5..0000000000
--- 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] 5+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-nm/files/
@ 2018-10-09 14:30 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2018-10-09 14:30 UTC (permalink / raw
To: gentoo-commits
commit: b506bb7a7461c55bfa78745c2917bc97ae4d6c5b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 9 14:29:35 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Oct 9 14:29:35 2018 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=b506bb7a
kde-plasma/plasma-nm: Improve patch
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 | 35 ++++++++++------------
1 file changed, 16 insertions(+), 19 deletions(-)
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
index d2a7f5126b..31ff517f2e 100644
--- 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
@@ -1,4 +1,4 @@
-From 20514e001ed9f91326181ac2d7ef2a7b2c718903 Mon Sep 17 00:00:00 2001
+From 2eac836c4085beb679b665c0c7cfd3f49b928230 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
@@ -15,27 +15,24 @@ 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
+ vpn/openconnect/CMakeLists.txt | 4 ++++
+ 1 file changed, 4 insertions(+)
+
diff --git a/vpn/openconnect/CMakeLists.txt b/vpn/openconnect/CMakeLists.txt
-index cf43740d..fa1bd4a0 100644
+index cf43740d..c3f07088 100644
--- a/vpn/openconnect/CMakeLists.txt
+++ b/vpn/openconnect/CMakeLists.txt
-@@ -49,6 +49,7 @@ if (OPENCONNECT_FOUND)
+@@ -6,6 +6,9 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_MODULE_PATH})
+
+ find_package(OpenConnect ${MINIMUM_OPENCONNECT_VERSION_REQUIRED} MODULE)
+ if (OPENCONNECT_FOUND)
++
++ find_package(Qt5Xml ${QT_MIN_VERSION} CONFIG REQUIRED)
++
+ if (${OPENCONNECT_VERSION} VERSION_LESS "3.99")
+ # macro_optional_find_package(OpenSSL)
+ # macro_log_feature(OpenSSL_FOUND "OpenSSL headers" "Encryption suite" "http://www.openssl.org" FALSE "" "Needed for OpenConnect support in Network Management")
+@@ -49,6 +52,7 @@ if (OPENCONNECT_FOUND)
KF5::IconThemes
KF5::KIOWidgets
KF5::CoreAddons
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-nm/files/
@ 2019-06-12 9:07 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2019-06-12 9:07 UTC (permalink / raw
To: gentoo-commits
commit: db08b32b8ec9168514f975f906c9354e796d734d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 12 09:06:46 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jun 12 09:06:46 2019 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=db08b32b
kde-plasma/plasma-nm: Drop unused patch
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/plasma-nm-5.15.90-includes.patch | 51 ----------------------
1 file changed, 51 deletions(-)
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
deleted file mode 100644
index a8a9db5528..0000000000
--- a/kde-plasma/plasma-nm/files/plasma-nm-5.15.90-includes.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-nm/files/
@ 2023-02-25 8:20 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2023-02-25 8:20 UTC (permalink / raw
To: gentoo-commits
commit: ead12e4cb52a6d17aa5698758c72c1767a4d8ebb
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 25 08:20:06 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 25 08:20:35 2023 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ead12e4c
kde-plasma/plasma-nm: Drop obsolete patch
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/plasma-nm-5.26.0-unused-dep.patch | 62 ----------------------
1 file changed, 62 deletions(-)
diff --git a/kde-plasma/plasma-nm/files/plasma-nm-5.26.0-unused-dep.patch b/kde-plasma/plasma-nm/files/plasma-nm-5.26.0-unused-dep.patch
deleted file mode 100644
index 400a3fcdfc..0000000000
--- a/kde-plasma/plasma-nm/files/plasma-nm-5.26.0-unused-dep.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 6f6958586e5a89ad5ff597550894a5770b5fb7cf Mon Sep 17 00:00:00 2001
-From: Volker Krause <vkrause@kde.org>
-Date: Wed, 5 Oct 2022 16:38:37 +0200
-Subject: [PATCH] Remove deprecated KDeclarative use
-
-The icon image engine seems not required here.
----
- CMakeLists.txt | 1 -
- kcm/CMakeLists.txt | 1 -
- kcm/kcm.cpp | 5 -----
- 3 files changed, 7 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6495c735..c245f60e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -40,7 +40,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
- ConfigWidgets
- Completion
- CoreAddons
-- Declarative
- DBusAddons
- KIO
- I18n
-diff --git a/kcm/CMakeLists.txt b/kcm/CMakeLists.txt
-index cbd7ad32..8f3e60d3 100755
---- a/kcm/CMakeLists.txt
-+++ b/kcm/CMakeLists.txt
-@@ -16,7 +16,6 @@ target_link_libraries(kcm_networkmanagement
- plasmanm_internal
- plasmanm_editor
- KF5::ConfigWidgets
-- KF5::Declarative
- KF5::I18n
- KF5::Service
- Qt::Quick
-diff --git a/kcm/kcm.cpp b/kcm/kcm.cpp
-index 11663fe9..e350be54 100644
---- a/kcm/kcm.cpp
-+++ b/kcm/kcm.cpp
-@@ -20,7 +20,6 @@
- #include <KPluginFactory>
- #include <KPluginMetaData>
- #include <KSharedConfig>
--#include <kdeclarative/kdeclarative.h>
-
- #include <NetworkManagerQt/ActiveConnection>
- #include <NetworkManagerQt/Connection>
-@@ -58,10 +57,6 @@ KCMNetworkmanagement::KCMNetworkmanagement(QWidget *parent, const QVariantList &
- auto mainWidget = new QWidget(this);
- m_ui->setupUi(mainWidget);
-
-- KDeclarative::KDeclarative kdeclarative;
-- kdeclarative.setDeclarativeEngine(m_ui->connectionView->engine());
-- kdeclarative.setupEngine(m_ui->connectionView->engine());
--
- KLocalizedContext *l10nContext = new KLocalizedContext(m_ui->connectionView->engine());
- l10nContext->setTranslationDomain(QStringLiteral(TRANSLATION_DOMAIN));
- m_ui->connectionView->engine()->rootContext()->setContextObject(l10nContext);
---
-2.38.0
-
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-nm/files/
@ 2023-12-23 15:46 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2023-12-23 15:46 UTC (permalink / raw
To: gentoo-commits
commit: cd2f8a1feead56791c194edacd6860da2c2ec382
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Dec 23 09:09:41 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 23 15:46:17 2023 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=cd2f8a1f
kde-plasma/plasma-nm: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../plasma-nm-5.27.80-openconnect-optional.patch | 77 ----------------------
1 file changed, 77 deletions(-)
diff --git a/kde-plasma/plasma-nm/files/plasma-nm-5.27.80-openconnect-optional.patch b/kde-plasma/plasma-nm/files/plasma-nm-5.27.80-openconnect-optional.patch
deleted file mode 100644
index fc2b5a9c72..0000000000
--- a/kde-plasma/plasma-nm/files/plasma-nm-5.27.80-openconnect-optional.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 50ace5c0641e0f2e7b8cdaf8f57afda147df7f96 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Thu, 23 Feb 2023 22:00:41 +0100
-Subject: [PATCH] Introduce BUILD_OPENCONNECT option (default ON)
-
-QtWebEngine is a huge dependency, considerably increasing the entry barrier
-to build and contribute to plasma-nm. It is easily possible to make it
-optional in this case so it should be done.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 19 +++++++++++++++----
- vpn/CMakeLists.txt | 2 +-
- 2 files changed, 16 insertions(+), 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3acdb4b7..f03f6e3a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -17,6 +17,8 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
- find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
-
-+option(BUILD_OPENCONNECT "Build OpenConnect VPN plugin" ON)
-+
- include(KDEInstallDirs)
- include(KDECMakeSettings)
- include(KDECompilerSettings NO_POLICY_SCOPE)
-@@ -34,11 +36,22 @@ find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
- Network
- Quick
- QuickWidgets
-- WebEngineCore
-- WebEngineWidgets
- Widgets
- )
-
-+find_package(PkgConfig REQUIRED)
-+
-+if (BUILD_OPENCONNECT)
-+ pkg_check_modules(OPENCONNECT IMPORTED_TARGET openconnect>=3.99)
-+ if (NOT TARGET PkgConfig::OPENCONNECT)
-+ set(BUILD_OPENCONNECT OFF)
-+ endif()
-+endif()
-+
-+if (BUILD_OPENCONNECT)
-+ find_package(Qt${QT_MAJOR_VERSION}WebEngineWidgets ${QT_MIN_VERSION} CONFIG REQUIRED)
-+endif()
-+
- find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
- ConfigWidgets
- Completion
-@@ -80,8 +93,6 @@ set_package_properties(KF5Prison PROPERTIES DESCRIPTION "Prison library"
- PURPOSE "Needed to create mobile barcodes for WiFi networks"
- )
-
--find_package(PkgConfig REQUIRED)
--pkg_check_modules(OPENCONNECT IMPORTED_TARGET openconnect>=3.99)
- pkg_check_modules(NETWORKMANAGER IMPORTED_TARGET libnm>1.4.0 REQUIRED)
- pkg_check_modules(MOBILEBROADBANDPROVIDERINFO mobile-broadband-provider-info)
- pkg_get_variable(BROADBANDPROVIDER_DATABASE mobile-broadband-provider-info database)
-diff --git a/vpn/CMakeLists.txt b/vpn/CMakeLists.txt
-index 2bf0086a..25baa308 100644
---- a/vpn/CMakeLists.txt
-+++ b/vpn/CMakeLists.txt
-@@ -9,6 +9,6 @@ add_subdirectory(sstp)
- add_subdirectory(strongswan)
- add_subdirectory(vpnc)
-
--if(TARGET PkgConfig::OPENCONNECT)
-+if (BUILD_OPENCONNECT)
- add_subdirectory(openconnect)
- endif()
---
-2.39.2
-
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-12-23 15:46 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-02-25 8:20 [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-nm/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2023-12-23 15:46 Andreas Sturmlechner
2019-06-12 9:07 Andreas Sturmlechner
2018-10-09 14:30 Andreas Sturmlechner
2018-01-05 8:48 Johannes Huber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox