[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-nm/files/
commit: cd2f8a1feead56791c194edacd6860da2c2ec382 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Sat Dec 23 09:09:41 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Dec 23 15:46:17 2023 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=cd2f8a1f kde-plasma/plasma-nm: remove unused patch Signed-off-by: Michael Mair-Keimberger levelnine.at> Signed-off-by: Andreas Sturmlechner 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..00 --- 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 -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 - 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 -
[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-nm/files/
commit: ead12e4cb52a6d17aa5698758c72c1767a4d8ebb Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Feb 25 08:20:06 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Feb 25 08:20:35 2023 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ead12e4c kde-plasma/plasma-nm: Drop obsolete patch Signed-off-by: Andreas Sturmlechner 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..00 --- 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 -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 - #include - #include --#include - - #include - #include -@@ -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 -
[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-nm/files/, kde-plasma/plasma-vault/files/, ...
commit: 65f310c7af19d6dcea8faef2a18af137f533653a Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Sep 3 12:52:31 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Sep 3 12:52:31 2020 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=65f310c7 kde-plasma: Cleanup obsolete patches and metadata Package-Manager: Portage-3.0.5, Repoman-3.0.1 Signed-off-by: Andreas Sturmlechner gentoo.org> 19.2-use-PlasmaExtras.PlaceholderMessage.patch | 57 --- .../files/libksysguard-5.18.90-unused-dep.patch| 92 - .../files/libkworkspace-5.18.80-standalone.patch | 113 - ...lasma-nm-5.19.2-fix-inline-password-field.patch | 30 -- 19.2-use-PlasmaExtras.PlaceholderMessage.patch | 57 --- 19.2-use-PlasmaExtras.PlaceholderMessage.patch | 44 kde-plasma/plasma-workspace/metadata.xml | 1 - .../files/powerdevil-5.19.4-ddcutil-0.9.9.patch| 24 - kde-plasma/xdg-desktop-portal-kde/metadata.xml | 3 - 9 files changed, 421 deletions(-) diff --git a/kde-plasma/bluedevil/files/bluedevil-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch b/kde-plasma/bluedevil/files/bluedevil-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch deleted file mode 100644 index 3c41eb2c69..00 --- a/kde-plasma/bluedevil/files/bluedevil-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 161c1b92bced7996e92026ff9ae503593f6590f6 Mon Sep 17 00:00:00 2001 -From: Nate Graham -Date: Sun, 14 Jun 2020 09:10:38 -0600 -Subject: [PATCH] Port applet to use PlasmaExtras.PlaceholderMessage - -The Kirigami version uses QQC2 elements which don't respect the plasma -theme and color scheme, leading to thing slooking out of place -especially when using a dark color theme or scheme. - -Depends on https://invent.kde.org/frameworks/plasma-framework/-/merge_requests/13 - CMakeLists.txt| 6 -- - src/applet/package/contents/ui/FullRepresentation.qml | 4 +--- - 2 files changed, 1 insertion(+), 9 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d9067851..5ddce978 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -33,12 +33,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS - find_package(KDED ${KF5_MIN_VERSION} REQUIRED) - find_package(SharedMimeInfo REQUIRED) - --find_package(KF5Kirigami2 ${KF5_MIN_VERSION} CONFIG) --set_package_properties(KF5Kirigami2 PROPERTIES --DESCRIPTION "A QtQuick based components set" --TYPE RUNTIME --) -- - include(KDEInstallDirs) - include(KDECMakeSettings) - include(KDECompilerSettings NO_POLICY_SCOPE) -diff --git a/src/applet/package/contents/ui/FullRepresentation.qml b/src/applet/package/contents/ui/FullRepresentation.qml -index 5bd32f15..e77bf295 100644 a/src/applet/package/contents/ui/FullRepresentation.qml -+++ b/src/applet/package/contents/ui/FullRepresentation.qml -@@ -27,8 +27,6 @@ import org.kde.plasma.components 2.0 as PlasmaComponents - import org.kde.plasma.components 3.0 as PlasmaComponents3 - import org.kde.plasma.private.bluetooth 1.0 as PlasmaBt - --import org.kde.kirigami 2.12 as Kirigami -- - PlasmaComponents3.Page { - - Action { -@@ -99,7 +97,7 @@ PlasmaComponents3.Page { - // Not inside the ListView because we want the listview to be hidden - // when Bluetooth is disabled, yet still show an "Enable Bluetooth" - // message --Kirigami.PlaceholderMessage { -+PlasmaExtras.PlaceholderMessage { - anchors.centerIn: parent - anchors.left: parent.left - anchors.right: parent.right --- -2.27.0 - diff --git a/kde-plasma/libksysguard/files/libksysguard-5.18.90-unused-dep.patch b/kde-plasma/libksysguard/files/libksysguard-5.18.90-unused-dep.patch deleted file mode 100644 index 903b7b8bcf..00 --- a/kde-plasma/libksysguard/files/libksysguard-5.18.90-unused-dep.patch +++ /dev/null @@ -1,92 +0,0 @@ -From fa06754147850ba06659f21e57cd7a724ecf8c49 Mon Sep 17 00:00:00 2001 -From: "Martin T. H. Sandsmark" -Date: Sat, 23 May 2020 18:26:12 +0200 -Subject: [PATCH] remove unnecessary dependency - - CMakeLists.txt | 13 + - signalplotter/CMakeLists.txt | 1 - - signalplotter/ksignalplotter.cpp | 2 +- - signalplotter/ksignalplotter_p.h | 2 ++ - 4 files changed, 4 insertions(+), 14 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b12ead7..063cb05 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -46,14 +46,6 @@ set_package_properties(Qt5WebChannel PROPERTIES - - find_package(KF5 REQUIRED COMPONENTS CoreAddons Config I18n JobWidgets WindowSystem Completion Auth WidgetsAddons IconThemes ConfigWidgets Service GlobalAccel KIO Package Declarative NewStuff) - --find_package(KF5 OPTIONAL_COMPONENTS Plasma) --set_package_properties(KF5Plasma PROPERTIES -- URL
[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-nm/files/, kde-plasma/plasma-nm/
commit: 60ca0fd5793903e1ec78076b43ee4de79508b7f3 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jun 21 20:59:33 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jun 21 21:41:41 2020 + 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 gentoo.org> ...lasma-nm-5.19.2-fix-inline-password-field.patch | 30 ++ kde-plasma/plasma-nm/plasma-nm-5.19.49..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 00..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 +Date: Thu, 18 Jun 2020 15:34:40 + +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..ebuild b/kde-plasma/plasma-nm/plasma-nm-5.19.49..ebuild index 055bcf9133..c93d0347c1 100644 --- a/kde-plasma/plasma-nm/plasma-nm-5.19.49..ebuild +++ b/kde-plasma/plasma-nm/plasma-nm-5.19.49..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)
[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-nm/files/
commit: db08b32b8ec9168514f975f906c9354e796d734d Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jun 12 09:06:46 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Jun 12 09:06:46 2019 + 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 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..00 --- 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 -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 -+#include -+#include - #include - - #include -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 -+#include - - #include - #include --- -cgit v1.1
[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-nm/files/, kde-plasma/plasma-nm/
commit: dcd95a5f03a7d4d42bb088e59440fab1e899e7b8 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun May 19 20:28:03 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun May 19 20:28:03 2019 + 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 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 00..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 +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 ++#include ++#include + #include + + #include +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 ++#include + + #include + #include +-- +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)
[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-nm/files/
commit: b506bb7a7461c55bfa78745c2917bc97ae4d6c5b Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Oct 9 14:29:35 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Oct 9 14:29:35 2018 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b506bb7a kde-plasma/plasma-nm: Improve patch Signed-off-by: Andreas Sturmlechner 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 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
[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-nm/files/, kde-plasma/plasma-nm/
commit: d46715889205ac9915ad9661bf4dcade478f226d Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Oct 9 14:14:11 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Oct 9 14:14:11 2018 + 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 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 00..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 +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)
[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-nm/files/
commit: 5343549ab73d2ae2bb32d91fbc01e197ee6e66ca Author: Johannes Huber gentoo org> AuthorDate: Fri Jan 5 08:48:07 2018 + Commit: Johannes Huber gentoo org> CommitDate: Fri Jan 5 08:48:07 2018 + 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..00 --- 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-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 , 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 , 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 , bool w - connect(m_ui->leapPassword, ::passwordOptionChanged, this, ::slotWidgetChanged); - connect(m_ui->fastAllowPacProvisioning, ::stateChanged, this, ::slotWidgetChanged); - connect(m_ui->pacFile, ::textChanged, this, ::slotWidgetChanged); -+connect(m_ui->pwdUsername, ::textChanged, this, ::slotWidgetChanged); -+connect(m_ui->pwdPassword, ::textChanged, this, ::slotWidgetChanged); - connect(m_ui->fastUsername, ::textChanged, this, ::slotWidgetChanged); - connect(m_ui->fastPassword, ::textChanged, this, ::slotWidgetChanged); - connect(m_ui->fastPassword, ::passwordOptionChanged, this, ::slotWidgetChanged); -@@ -175,6 +180,18 @@ void Security8021x::loadConfig(const NetworkManager::Setting::Ptr ) - } 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)); -+
[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-nm/files/, kde-plasma/plasma-nm/
commit: 897bcef18a8a0d41aebb4fbcc07b2d3811d7543b Author: Nils Freydank posteo de> AuthorDate: Sat Dec 16 13:16:37 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Sat Dec 16 13:17:00 2017 + 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..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 00..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+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 , 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 , 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 , bool w + connect(m_ui->leapPassword, ::passwordOptionChanged, this, ::slotWidgetChanged); + connect(m_ui->fastAllowPacProvisioning, ::stateChanged, this, ::slotWidgetChanged); + connect(m_ui->pacFile, ::textChanged, this, ::slotWidgetChanged); ++connect(m_ui->pwdUsername, ::textChanged, this, ::slotWidgetChanged); ++connect(m_ui->pwdPassword, ::textChanged, this, ::slotWidgetChanged); + connect(m_ui->fastUsername, ::textChanged, this, ::slotWidgetChanged); + connect(m_ui->fastPassword, ::textChanged, this, ::slotWidgetChanged); + connect(m_ui->fastPassword, ::passwordOptionChanged, this, ::slotWidgetChanged); +@@ -175,6 +180,18 @@ void Security8021x::loadConfig(const NetworkManager::Setting::Ptr ) + } else { + m_ui->leapPassword->setPasswordOption(PasswordField::AlwaysAsk); + } ++ ++} else if