[gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-nm/files/, kde-plasma/plasma-nm/
commit: ad93402d46ac6b9dec7315a7acf44aa6229355be Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon May 22 08:44:37 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon May 22 12:53:47 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad93402d kde-plasma/plasma-nm: drop 5.27.4-r1 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-plasma/plasma-nm/Manifest | 1 - ...m-5.27.4-persist-imported-vpn-connections.patch | 31 kde-plasma/plasma-nm/plasma-nm-5.27.4-r1.ebuild| 85 -- 3 files changed, 117 deletions(-) diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest index 138876f7e789..be1b90a57ea2 100644 --- a/kde-plasma/plasma-nm/Manifest +++ b/kde-plasma/plasma-nm/Manifest @@ -1,2 +1 @@ -DIST plasma-nm-5.27.4.tar.xz 1151372 BLAKE2B b6a2c30c17b7fe5e19bba032ad0d4822c5f4ff931530cc4718d17c976317f782a3a318c1c2204ef84c2d247bb828cf7638e26283ecbb5246515c4648ce6592d2 SHA512 4077c63af9da002a8c6fc18a6fa1ccbadd84c9786a7e922209756b4ce4fc8a6780a092b5a412d79caf38872831035a3659c84fb73857d58ab0088dc73fc64c36 DIST plasma-nm-5.27.5.tar.xz 1155948 BLAKE2B e74da009a035b6bd46823c94fd5f798c7dfc794cf5e80af2e2a655ee9939269dd6fa222412e1c4fa1d249f657010206b1871c9ae0f6998ecf7d9f46ed549e7d4 SHA512 a7b66bb44cecf489a83c62aee29ebd5fa697ebccabd0c384adbbf0e5facc209b6d202b85ce0a490be26f0830d4b936c3442d6077200d4f08a1faeef42d7266bc diff --git a/kde-plasma/plasma-nm/files/plasma-nm-5.27.4-persist-imported-vpn-connections.patch b/kde-plasma/plasma-nm/files/plasma-nm-5.27.4-persist-imported-vpn-connections.patch deleted file mode 100644 index 8d7fc814c35f.. --- a/kde-plasma/plasma-nm/files/plasma-nm-5.27.4-persist-imported-vpn-connections.patch +++ /dev/null @@ -1,31 +0,0 @@ -From d795e92bd12705d0ce506c4ac900b0ccb7bdc69b Mon Sep 17 00:00:00 2001 -From: Nicolas Fella -Date: Tue, 18 Apr 2023 23:54:02 +0200 -Subject: [PATCH] Persist imported VPN connections on disk - -Otherwise they disappear after a reboot - -BUG: 468666 - - -(cherry picked from commit 024035190982ac5957310ef78fbc34b9c51766c2) - libs/handler.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libs/handler.cpp b/libs/handler.cpp -index 625cbabd7..57fb9f2e3 100644 a/libs/handler.cpp -+++ b/libs/handler.cpp -@@ -378,7 +378,7 @@ void Handler::addConnection(NMConnection *connection) - - nm_client_add_connection2(client, - nm_connection_to_dbus(connection, NM_CONNECTION_SERIALIZE_ALL), -- NM_SETTINGS_ADD_CONNECTION2_FLAG_IN_MEMORY, -+ NM_SETTINGS_ADD_CONNECTION2_FLAG_TO_DISK, - nullptr, - true, - nullptr, --- -GitLab - diff --git a/kde-plasma/plasma-nm/plasma-nm-5.27.4-r1.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.27.4-r1.ebuild deleted file mode 100644 index b022eb8f0551.. --- a/kde-plasma/plasma-nm/plasma-nm-5.27.4-r1.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="true" -KFMIN=5.102.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.7 -inherit ecm plasma.kde.org - -DESCRIPTION="KDE Plasma applet for NetworkManager" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -IUSE="openconnect teamd" - -DEPEND=" - >=app-crypt/qca-2.3.0:2[qt5(+)] - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kitemviews-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwallet-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/modemmanager-qt-${KFMIN}:5 - >=kde-frameworks/networkmanager-qt-${KFMIN}:5[teamd=] - >=kde-frameworks/plasma-${KFMIN}:5 - >=kde-frameworks/solid-${KFMIN}:5 - net-misc/networkmanager[teamd=] - >=dev-qt/qtxml-${QTMIN}:5 - net-misc/mobile-broadband-provider-info - openconnect? ( - >=dev-qt/qtxml-${QTMIN}:5 - net-vpn/networkmanager-openconnect - net-vpn/openconnect:= - ) -" -RDEPEND="${DEPEND} - >=dev-qt/qtquickcontrols-${QTMIN}:5 -
[gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-nm/files/, kde-plasma/plasma-nm/
commit: 6bb12775c7c8fe97a5ed8effd7fedeb555fe227d Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Apr 19 18:40:00 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Apr 19 18:40:00 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bb12775 kde-plasma/plasma-nm: Persist imported VPN connections on disk KDE-bug: https://bugs.kde.org/show_bug.cgi?id=468666 Bug: https://bugs.gentoo.org/899706 Signed-off-by: Andreas Sturmlechner gentoo.org> ...m-5.27.4-persist-imported-vpn-connections.patch | 31 kde-plasma/plasma-nm/plasma-nm-5.27.4-r1.ebuild| 85 ++ 2 files changed, 116 insertions(+) diff --git a/kde-plasma/plasma-nm/files/plasma-nm-5.27.4-persist-imported-vpn-connections.patch b/kde-plasma/plasma-nm/files/plasma-nm-5.27.4-persist-imported-vpn-connections.patch new file mode 100644 index ..8d7fc814c35f --- /dev/null +++ b/kde-plasma/plasma-nm/files/plasma-nm-5.27.4-persist-imported-vpn-connections.patch @@ -0,0 +1,31 @@ +From d795e92bd12705d0ce506c4ac900b0ccb7bdc69b Mon Sep 17 00:00:00 2001 +From: Nicolas Fella +Date: Tue, 18 Apr 2023 23:54:02 +0200 +Subject: [PATCH] Persist imported VPN connections on disk + +Otherwise they disappear after a reboot + +BUG: 468666 + + +(cherry picked from commit 024035190982ac5957310ef78fbc34b9c51766c2) +--- + libs/handler.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libs/handler.cpp b/libs/handler.cpp +index 625cbabd7..57fb9f2e3 100644 +--- a/libs/handler.cpp b/libs/handler.cpp +@@ -378,7 +378,7 @@ void Handler::addConnection(NMConnection *connection) + + nm_client_add_connection2(client, + nm_connection_to_dbus(connection, NM_CONNECTION_SERIALIZE_ALL), +- NM_SETTINGS_ADD_CONNECTION2_FLAG_IN_MEMORY, ++ NM_SETTINGS_ADD_CONNECTION2_FLAG_TO_DISK, + nullptr, + true, + nullptr, +-- +GitLab + diff --git a/kde-plasma/plasma-nm/plasma-nm-5.27.4-r1.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.27.4-r1.ebuild new file mode 100644 index ..9a6797eed250 --- /dev/null +++ b/kde-plasma/plasma-nm/plasma-nm-5.27.4-r1.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="true" +KFMIN=5.102.0 +PVCUT=$(ver_cut 1-3) +QTMIN=5.15.7 +inherit ecm plasma.kde.org + +DESCRIPTION="KDE Plasma applet for NetworkManager" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="5" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +IUSE="openconnect teamd" + +DEPEND=" + >=app-crypt/qca-2.3.0:2[qt5(+)] + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kdbusaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kitemviews-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/kwallet-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=kde-frameworks/modemmanager-qt-${KFMIN}:5 + >=kde-frameworks/networkmanager-qt-${KFMIN}:5[teamd=] + >=kde-frameworks/plasma-${KFMIN}:5 + >=kde-frameworks/solid-${KFMIN}:5 + net-misc/networkmanager[teamd=] + >=dev-qt/qtxml-${QTMIN}:5 + net-misc/mobile-broadband-provider-info + openconnect? ( + >=dev-qt/qtxml-${QTMIN}:5 + net-vpn/networkmanager-openconnect + net-vpn/openconnect:= + ) +" +RDEPEND="${DEPEND} + >=dev-qt/qtquickcontrols-${QTMIN}:5 + >=dev-qt/qtquickcontrols2-${QTMIN}:5 + >=kde-frameworks/kdeclarative-${KFMIN}:5 + >=kde-frameworks/kirigami-${KFMIN}:5 + >=kde-frameworks/kquickcharts-${KFMIN}:5 + >=kde-plasma/kde-cli-tools-${PVCUT}:5 +" +BDEPEND=" + >=kde-frameworks/kcmutils-${KFMIN}:5 + virtual/pkgconfig +" + +PATCHES=( "${FILESDIR}/${P}-persist-imported-vpn-connections.patch" ) # KDE-bug 468666 + +src_prepare() { + ecm_src_prepare + + # TODO: try to get a build switch upstreamed + if ! use openconnect; then + sed -e "s/^pkg_check_modules.*openconnect/#&/" -i CMakeLists.txt || die + fi +} + +pkg_postinst() { + ecm_pkg_postinst + + if ! has_version "kde-plasma/plasma-workspace:5"; then + elog "${PN} is not terribly useful
[gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-nm/files/, kde-plasma/plasma-nm/
commit: 0333cc1f5e5ac8c0153bbe3824d578316cc189a7 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Oct 10 13:01:58 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Oct 11 12:40:22 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0333cc1f kde-plasma/plasma-nm: Make kde-frameworks/kdeclarative RDEPEND-only Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/plasma-nm-5.26.0-unused-dep.patch| 62 ++ kde-plasma/plasma-nm/plasma-nm-5.26.0.ebuild | 4 +- 2 files changed, 65 insertions(+), 1 deletion(-) 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 new file mode 100644 index ..400a3fcdfc59 --- /dev/null +++ b/kde-plasma/plasma-nm/files/plasma-nm-5.26.0-unused-dep.patch @@ -0,0 +1,62 @@ +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 + diff --git a/kde-plasma/plasma-nm/plasma-nm-5.26.0.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.26.0.ebuild index 7324db7382cb..5b2a2bbb7629 100644 --- a/kde-plasma/plasma-nm/plasma-nm-5.26.0.ebuild +++ b/kde-plasma/plasma-nm/plasma-nm-5.26.0.ebuild @@ -28,7 +28,6 @@ DEPEND=" >=kde-frameworks/kconfigwidgets-${KFMIN}:5 >=kde-frameworks/kcoreaddons-${KFMIN}:5 >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 >=kde-frameworks/ki18n-${KFMIN}:5 >=kde-frameworks/kio-${KFMIN}:5 >=kde-frameworks/kitemviews-${KFMIN}:5 @@ -56,6 +55,7 @@ DEPEND=" RDEPEND="${DEPEND} >=dev-qt/qtquickcontrols-${QTMIN}:5 >=dev-qt/qtquickcontrols2-${QTMIN}:5 + >=kde-frameworks/kdeclarative-${KFMIN}:5 >=kde-frameworks/kirigami-${KFMIN}:5 >=kde-frameworks/kquickcharts-${KFMIN}:5 >=kde-plasma/kde-cli-tools-${PVCUT}:5 @@ -65,6 +65,8 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( "${FILESDIR}/${P}-unused-dep.patch" ) + src_prepare() { ecm_src_prepare
[gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-nm/files/, kde-plasma/plasma-nm/
commit: 6db77b063d965507941a2b4d694117bde877d7c5 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Sep 15 11:59:35 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Sep 16 11:09:42 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6db77b06 kde-plasma/plasma-nm: drop 5.21.5* Signed-off-by: Andreas Sturmlechner gentoo.org> kde-plasma/plasma-nm/Manifest | 1 - .../files/plasma-nm-5.21.5-missing-include.patch | 30 kde-plasma/plasma-nm/plasma-nm-5.21.5.ebuild | 83 -- 3 files changed, 114 deletions(-) diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest index ab254454ccc..5f15f28ce70 100644 --- a/kde-plasma/plasma-nm/Manifest +++ b/kde-plasma/plasma-nm/Manifest @@ -1,2 +1 @@ -DIST plasma-nm-5.21.5.tar.xz 902104 BLAKE2B 8b881f39e01b7de0107b897c81fffb7bfa429a0bd7d8eb58026328ac42c411d5dd8e154e843767098731174a492e64b6c8a28c8af474584862f58081d9a5e751 SHA512 ac074e50d5ee3be99bab515b02522e391b14936c1c8152ca067c7513af7a8e8b81cb55ab9b412ca703554f3e35fc9392368159c9872d8c372017089a4a65e3fa DIST plasma-nm-5.22.5.tar.xz 898960 BLAKE2B 0285425f4ed474c38e3a72b8b6654ba17e957921db0372bc24a9ce4fe226186cb687e5ec91836f7bbb1cb2fb9f4da1287efca41cd7b11673e2086477024f4578 SHA512 802b908c61214e77162f09289d9e9c1d3c9d39b77799d71b3c4802245f2920c29065b793a83a483a9e9df004e113bcb06fa864c456b6950ba3a4d8eaf4ec4b94 diff --git a/kde-plasma/plasma-nm/files/plasma-nm-5.21.5-missing-include.patch b/kde-plasma/plasma-nm/files/plasma-nm-5.21.5-missing-include.patch deleted file mode 100644 index db8f98b072b..000 --- a/kde-plasma/plasma-nm/files/plasma-nm-5.21.5-missing-include.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 8d1720ac924c8453f80ac560470d9d92bdd94b07 Mon Sep 17 00:00:00 2001 -From: Heiko Becker -Date: Tue, 4 May 2021 20:49:29 +0200 -Subject: [PATCH] Add missing QQueue include - -Used since 64dc6234b6980172bb53084c16a0e4e693d6011a. I suppose it's -implicitly pulled in some cases, but for me the build fails with -"networkmodel.h:126:56: error: field 'm_updateQueue' has incomplete -type 'QQueue >'". - -(cherry picked from commit 2bccd7c3bc3aa12ddd1886b14041f1448c634a69) - libs/models/networkmodel.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libs/models/networkmodel.h b/libs/models/networkmodel.h -index ebe6db52..749cb919 100644 a/libs/models/networkmodel.h -+++ b/libs/models/networkmodel.h -@@ -22,6 +22,7 @@ - #define PLASMA_NM_NETWORK_MODEL_H - - #include -+#include - - #include "networkitemslist.h" - --- -GitLab - diff --git a/kde-plasma/plasma-nm/plasma-nm-5.21.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.21.5.ebuild deleted file mode 100644 index 8e934494dfe..000 --- a/kde-plasma/plasma-nm/plasma-nm-5.21.5.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_TEST="true" -KFMIN=5.82.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org - -DESCRIPTION="KDE Plasma applet for NetworkManager" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" -IUSE="modemmanager openconnect teamd" - -DEPEND=" - >=app-crypt/qca-2.3.0:2 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kitemviews-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwallet-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/networkmanager-qt-${KFMIN}:5[teamd=] - >=kde-frameworks/plasma-${KFMIN}:5 - >=kde-frameworks/solid-${KFMIN}:5 - net-misc/networkmanager[teamd=] - modemmanager? ( - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/modemmanager-qt-${KFMIN}:5 - net-misc/mobile-broadband-provider-info - ) - openconnect? ( - >=dev-qt/qtxml-${QTMIN}:5 - net-vpn/networkmanager-openconnect - net-vpn/openconnect:= - ) -" -RDEPEND="${DEPEND} - >=dev-qt/qtquickcontrols-${QTMIN}:5 - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-plasma/kde-cli-tools-${PVCUT}:5 -" - -PATCHES=( "${FILESDIR}/${P}-missing-include.patch" ) -
[gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-nm/files/, kde-plasma/plasma-nm/
commit: b3f212ae1ecbf931e6f99d1e1371de4e49af27fa Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Jan 7 11:48:11 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jan 24 19:42:51 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3f212ae kde-plasma/plasma-nm: drop 5.19.5* Signed-off-by: Andreas Sturmlechner gentoo.org> kde-plasma/plasma-nm/Manifest | 1 - ...lasma-nm-5.19.2-fix-inline-password-field.patch | 30 kde-plasma/plasma-nm/plasma-nm-5.19.5.ebuild | 86 -- 3 files changed, 117 deletions(-) diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest index e1ff6df8e9e..7c6ab681de5 100644 --- a/kde-plasma/plasma-nm/Manifest +++ b/kde-plasma/plasma-nm/Manifest @@ -1,2 +1 @@ -DIST plasma-nm-5.19.5.tar.xz 855504 BLAKE2B a2437794d9de5a0fda6328dd0e352fad956710cef06f9bc2d6590dbde7f2eb469d051db6fc4ce647fe59bf95e48e6e6c9ff68e512a2992abe183ab309112f94d SHA512 2fdd42e7c9bba0b069e0ca39f8ef996b36a807a4065172a816023c32d5d24869bf92c577c9cc5a08bb9e8b13c628b7cbd8346d17dc1e6814c931f7f7ec9439a7 DIST plasma-nm-5.20.5.tar.xz 865364 BLAKE2B 3a316674e9c9bbe7df09c34610f117bbacfa60515e93077103a7956aa1999cc8bef7e4e5add53d3ccb847557c7fadf17ab23d82e392e1b2822cecb9dc33598bb SHA512 6413dcbc6b8723384ecc6897331947343f399bedba6aff9148bc34485b54c5fd6a91b77d63390b0c398c8bcad8151de3f1746c71f3cfae9476632e2386ab6ff7 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 deleted file mode 100644 index 170e20ea225..000 --- a/kde-plasma/plasma-nm/files/plasma-nm-5.19.2-fix-inline-password-field.patch +++ /dev/null @@ -1,30 +0,0 @@ -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.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.19.5.ebuild deleted file mode 100644 index 69089da378c..000 --- a/kde-plasma/plasma-nm/plasma-nm-5.19.5.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_TEST="true" -KFMIN=5.71.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.14.2 -inherit ecm kde.org - -DESCRIPTION="KDE Plasma applet for NetworkManager" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" -IUSE="modemmanager openconnect teamd" - -DEPEND=" - >=app-crypt/qca-2.3.0:2 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kitemviews-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwallet-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/networkmanager-qt-${KFMIN}:5[teamd=] - >=kde-frameworks/plasma-${KFMIN}:5 -
[gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-nm/files/, kde-plasma/plasma-nm/
commit: b8dcf727646a2ce79e07d2d0490f80ebf58cc616 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jun 21 20:59:33 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jun 23 13:48:43 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8dcf727 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.2.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 000..170e20ea225 --- /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.2.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.19.2.ebuild index 7ae4e64126b..4d75d3c41a7 100644 --- a/kde-plasma/plasma-nm/plasma-nm-5.19.2.ebuild +++ b/kde-plasma/plasma-nm/plasma-nm-5.19.2.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] repo/gentoo:master commit in: kde-plasma/plasma-nm/files/, kde-plasma/plasma-nm/
commit: e0e020e6cccd19a9c14277ef7fd0a159c227f3fd Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat May 16 20:29:55 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat May 16 22:38:08 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0e020e6 kde-plasma/plasma-nm: WireGuard systray icon missing on startup KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=420983 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> .../plasma-nm-5.18.5-missing-wireguard-icon.patch | 50 + kde-plasma/plasma-nm/plasma-nm-5.18.5-r1.ebuild| 83 ++ 2 files changed, 133 insertions(+) diff --git a/kde-plasma/plasma-nm/files/plasma-nm-5.18.5-missing-wireguard-icon.patch b/kde-plasma/plasma-nm/files/plasma-nm-5.18.5-missing-wireguard-icon.patch new file mode 100644 index 000..85902e50409 --- /dev/null +++ b/kde-plasma/plasma-nm/files/plasma-nm-5.18.5-missing-wireguard-icon.patch @@ -0,0 +1,50 @@ +From da52d01788f5f07aa60ed7a6f21d7943a2e0c8d3 Mon Sep 17 00:00:00 2001 +From: Bruce Anderson +Date: Wed, 6 May 2020 08:03:11 +0200 +Subject: Icon in system tray missing when WireGuard connection active on + startup + +Summary: +If a WireGuard connection is made prior to start of the +plasma-nm applet, no icon is displayed in the system tray. + +BUG: 420983 + +Test Plan: +1. Setup a Wired connection to autostart +2. Setup a WireGuard connection which uses the Wired + connection and set to autostart +3. Logout and login to start a new Plasma session +4. Verify that the standard Wired connection icon with a + padlock symbol on it is shown in the system tray + +Reviewers: jgrulich + +Reviewed By: jgrulich + +Subscribers: plasma-devel + +Tags: #plasma + +Differential Revision: https://phabricator.kde.org/D29469 +--- + libs/declarative/connectionicon.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/libs/declarative/connectionicon.cpp b/libs/declarative/connectionicon.cpp +index cefe6df..58c0cce 100644 +--- a/libs/declarative/connectionicon.cpp b/libs/declarative/connectionicon.cpp +@@ -317,7 +317,9 @@ void ConnectionIcon::setIcons() + + // Set icon based on the current primary connection if the activating connection is virtual + // since we're not setting icons for virtual connections +-if (!connection || (connection && UiUtils::isConnectionTypeVirtual(connection->type( { ++if (!connection ++|| (connection && UiUtils::isConnectionTypeVirtual(connection->type())) ++|| connection->type() == NetworkManager::ConnectionSettings::WireGuard) { + connection = NetworkManager::primaryConnection(); + } + +-- +cgit v1.1 diff --git a/kde-plasma/plasma-nm/plasma-nm-5.18.5-r1.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.18.5-r1.ebuild new file mode 100644 index 000..1920bf9e1b7 --- /dev/null +++ b/kde-plasma/plasma-nm/plasma-nm-5.18.5-r1.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_TEST="true" +KFMIN=5.66.0 +PVCUT=$(ver_cut 1-3) +QTMIN=5.12.3 +inherit ecm kde.org + +DESCRIPTION="KDE Plasma applet for NetworkManager" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="5" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="modemmanager openconnect teamd" + +DEPEND=" + >=app-crypt/qca-2.1.1:2[qt5(+)] + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kdbusaddons-${KFMIN}:5 + >=kde-frameworks/kdeclarative-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kitemviews-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/kwallet-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=kde-frameworks/networkmanager-qt-${KFMIN}:5[teamd=] + >=kde-frameworks/plasma-${KFMIN}:5 + >=kde-frameworks/solid-${KFMIN}:5 + net-misc/networkmanager[teamd=] + modemmanager? ( + >=kde-frameworks/modemmanager-qt-${KFMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + net-misc/mobile-broadband-provider-info + ) + openconnect? ( + >=dev-qt/qtxml-${QTMIN}:5 + net-vpn/networkmanager-openconnect + net-vpn/openconnect:= + ) +" +RDEPEND="${DEPEND} +
[gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-nm/files/, kde-plasma/plasma-nm/
commit: c458d1fc49610955d0ec4d82ecbbdf3fd79df418 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Sep 15 15:23:51 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Sep 15 15:24:58 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c458d1fc kde-plasma/plasma-nm: Fix missing headers with Frameworks 5.62 Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/plasma-nm-5.16.5-missing-headers.patch | 62 ++ kde-plasma/plasma-nm/plasma-nm-5.16.5.ebuild | 2 + 2 files changed, 64 insertions(+) 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 new file mode 100644 index 000..676087e89ac --- /dev/null +++ b/kde-plasma/plasma-nm/files/plasma-nm-5.16.5-missing-headers.patch @@ -0,0 +1,62 @@ +From a7eb3cb599fbb1d66c6980d53550822cbbfd1520 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +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 ++#include + + #include + #include +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 ++#include + #include + #include + +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 ++#include + + #include + #include +-- +cgit v1.1 + + diff --git a/kde-plasma/plasma-nm/plasma-nm-5.16.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.16.5.ebuild index 995f4b6b6b8..0a6f38e56d3 100644 --- a/kde-plasma/plasma-nm/plasma-nm-5.16.5.ebuild +++ b/kde-plasma/plasma-nm/plasma-nm-5.16.5.ebuild @@ -53,6 +53,8 @@ RDEPEND="${DEPEND} $(add_plasma_dep kde-cli-tools) " +PATCHES=( "${FILESDIR}/${P}-missing-headers.patch" ) + src_configure() { local mycmakeargs=( -DDISABLE_MODEMMANAGER_SUPPORT=$(usex !modemmanager)
[gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-nm/files/, kde-plasma/plasma-nm/
commit: de37802d627aec126279a9be8154dbdef321a762 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Sep 13 12:18:58 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Sep 13 12:19:59 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de37802d kde-plasma/plasma-nm: Change icon on NM connectivity change Package-Manager: Portage-2.3.48, Repoman-2.3.10 .../files/plasma-nm-5.13.5-iconchange.patch| 33 ++ kde-plasma/plasma-nm/plasma-nm-5.13.5-r1.ebuild| 77 ++ 2 files changed, 110 insertions(+) diff --git a/kde-plasma/plasma-nm/files/plasma-nm-5.13.5-iconchange.patch b/kde-plasma/plasma-nm/files/plasma-nm-5.13.5-iconchange.patch new file mode 100644 index 000..f44bbc34be9 --- /dev/null +++ b/kde-plasma/plasma-nm/files/plasma-nm-5.13.5-iconchange.patch @@ -0,0 +1,33 @@ +From a71ca963f798ca405878305b5433550e6c267d87 Mon Sep 17 00:00:00 2001 +From: Jan Grulich +Date: Thu, 13 Sep 2018 13:24:51 +0200 +Subject: Make sure we change icon on NM connectivity change + +--- + libs/declarative/connectionicon.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libs/declarative/connectionicon.cpp b/libs/declarative/connectionicon.cpp +index b792f92..d4ff30a 100644 +--- a/libs/declarative/connectionicon.cpp b/libs/declarative/connectionicon.cpp +@@ -82,6 +82,7 @@ ConnectionIcon::ConnectionIcon(QObject* parent) + setStates(); + + connectivityChanged(); ++setIcons(); + } + + ConnectionIcon::~ConnectionIcon() +@@ -174,8 +175,7 @@ void ConnectionIcon::carrierChanged(bool carrier) + void ConnectionIcon::connectivityChanged() + { + NetworkManager::Connectivity conn = NetworkManager::connectivity(); +-m_limited = (conn == NetworkManager::Portal || conn == NetworkManager::Limited); +-setIcons(); ++setLimited(conn == NetworkManager::Portal || conn == NetworkManager::Limited); + } + + void ConnectionIcon::deviceAdded(const QString& device) +-- +cgit v0.11.2 diff --git a/kde-plasma/plasma-nm/plasma-nm-5.13.5-r1.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.13.5-r1.ebuild new file mode 100644 index 000..1413d19dc51 --- /dev/null +++ b/kde-plasma/plasma-nm/plasma-nm-5.13.5-r1.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit kde5 + +DESCRIPTION="KDE Plasma applet for NetworkManager" +LICENSE="GPL-2 LGPL-2.1" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="modemmanager openconnect teamd" + +DEPEND=" + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kdbusaddons) + $(add_frameworks_dep kdeclarative) + $(add_frameworks_dep kdelibs4support) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kio) + $(add_frameworks_dep kitemviews) + $(add_frameworks_dep knotifications) + $(add_frameworks_dep kservice) + $(add_frameworks_dep kwallet) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kwindowsystem) + $(add_frameworks_dep kxmlgui) + $(add_frameworks_dep networkmanager-qt 'teamd=') + $(add_frameworks_dep plasma) + $(add_frameworks_dep solid) + $(add_qt_dep qtdbus) + $(add_qt_dep qtdeclarative) + $(add_qt_dep qtgui) + $(add_qt_dep qtnetwork) + $(add_qt_dep qtwidgets) + >=app-crypt/qca-2.1.1:2[qt5(+)] + net-misc/networkmanager[teamd=] + modemmanager? ( + $(add_frameworks_dep modemmanager-qt) + $(add_qt_dep qtxml) + net-misc/mobile-broadband-provider-info + ) + openconnect? ( + $(add_qt_dep qtxml) + net-misc/networkmanager-openconnect + net-vpn/openconnect:= + ) +" +RDEPEND="${DEPEND} + $(add_plasma_dep kde-cli-tools) + !kde-plasma/plasma-nm:4 +" + +PATCHES=( "${FILESDIR}/${P}-iconchange.patch" ) + +src_configure() { + local mycmakeargs=( + -DDISABLE_MODEMMANAGER_SUPPORT=$(usex !modemmanager) + $(cmake-utils_use_find_package modemmanager KF5ModemManagerQt) + $(cmake-utils_use_find_package openconnect OpenConnect) + ) + + kde5_src_configure +} + +pkg_postinst() { + kde5_pkg_postinst + + if ! has_version "kde-plasma/plasma-workspace:5"; then + elog "${PN} is not terribly useful without kde-plasma/plasma-workspace:5." + elog "However, the networkmanagement KCM can be called from either systemsettings" + elog "or manually: $ kcmshell5 kcm_networkmanagement" + fi +}
[gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-nm/files/, kde-plasma/plasma-nm/
commit: c1bf84e15d16a7260f31b47234a329705d162eda Author: Nils Freydank posteo de> AuthorDate: Sat Dec 16 12:21:00 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Sat Dec 16 13:04:08 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1bf84e1 kde-plasma/plasma-nm: Add EAP-PWD support. Wrt upstream bug https://bugs.kde.org/show_bug.cgi?id=387685. Closes: https://github.com/gentoo/gentoo/pull/6565 Package-Manager: Portage-2.3.18, Repoman-2.3.6 .../plasma-nm/files/plasma-nm-add_EAP-PWD.patch| 201 + kde-plasma/plasma-nm/plasma-nm-5.11.4-r1.ebuild| 67 +++ 2 files changed, 268 insertions(+) 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 000..896a8144d52 --- /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
[gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-nm/files/, kde-plasma/plasma-nm/, kde-apps/solid-runtime/, ...
commit: 9b65b90b2942ce7673855a6b9ba738892d47e9a0 Author: Johannes Huber gentoo org> AuthorDate: Sat Oct 29 11:53:28 2016 + Commit: Johannes Huber gentoo org> CommitDate: Sat Oct 29 11:54:27 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b65b90b kde-misc/plasma-nm -> kde-plasma/plasma-nm kde-apps/solid-runtime/solid-runtime-16.04.3.ebuild | 2 +- kde-misc/networkmanagement/networkmanagement-0.9.0.12.ebuild | 4 ++-- kde-misc/plasma-nm/Manifest | 1 - kde-misc/plasma-nm/metadata.xml | 12 kde-plasma/plasma-nm/Manifest| 1 + .../files/plasma-nm-0.9.3.6-networkmanager-1.0.6.patch | 0 {kde-misc => kde-plasma}/plasma-nm/plasma-nm-0.9.3.6.ebuild | 0 kde-plasma/plasma-nm/plasma-nm-5.7.5.ebuild | 2 +- kde-plasma/plasma-nm/plasma-nm-5.8.2.ebuild | 2 +- profiles/updates/4Q-2016 | 1 + 10 files changed, 7 insertions(+), 18 deletions(-) diff --git a/kde-apps/solid-runtime/solid-runtime-16.04.3.ebuild b/kde-apps/solid-runtime/solid-runtime-16.04.3.ebuild index 44bbb05..93411a7 100644 --- a/kde-apps/solid-runtime/solid-runtime-16.04.3.ebuild +++ b/kde-apps/solid-runtime/solid-runtime-16.04.3.ebuild @@ -24,7 +24,7 @@ KMEXTRA=" DEPEND="" RDEPEND="${DEPEND} bluetooth? ( || ( net-wireless/bluedevil kde-plasma/bluedevil ) ) - networkmanager? ( || ( kde-misc/plasma-nm kde-misc/networkmanagement kde-plasma/plasma-nm ) ) + networkmanager? ( || ( kde-plasma/plasma-nm:* kde-misc/networkmanagement ) ) " PATCHES=( "${FILESDIR}/${PN}-4.14.3-networkmanager-1.0.6.patch" ) diff --git a/kde-misc/networkmanagement/networkmanagement-0.9.0.12.ebuild b/kde-misc/networkmanagement/networkmanagement-0.9.0.12.ebuild index a217402..8acef26 100644 --- a/kde-misc/networkmanagement/networkmanagement-0.9.0.12.ebuild +++ b/kde-misc/networkmanagement/networkmanagement-0.9.0.12.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -30,7 +30,7 @@ DEPEND=" " RDEPEND="${DEPEND} !kde-base/solid - !kde-misc/plasma-nm + !kde-plasma/plasma-nm:4 " src_configure() { diff --git a/kde-misc/plasma-nm/Manifest b/kde-misc/plasma-nm/Manifest deleted file mode 100644 index 3e1a6bb.. --- a/kde-misc/plasma-nm/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST plasma-nm-0.9.3.6.tar.xz 551320 SHA256 56b5c8221761fac30808117c7f8fa11a9e3cdb4b2d16a733d33996bc7136b64b SHA512 50f3e5020f4437d710709a301b981f98c293a71dff3aee809255207a0f97caf5d3811b453da2338df93238ef33a79e85cb3598ee38d8a41255d8a572e256 WHIRLPOOL 2486304f8c5c169105e2ea0527e7fb291cc9c9f9fee36a2cdc9d5aff7f5a72cb8bdda692ac54f621c63a84b2e48ba2c429e20a4bbe7efa91ecb48a393286dc7c diff --git a/kde-misc/plasma-nm/metadata.xml b/kde-misc/plasma-nm/metadata.xml deleted file mode 100644 index b346d4a.. --- a/kde-misc/plasma-nm/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - -http://www.gentoo.org/dtd/metadata.dtd;> - - - k...@gentoo.org - Gentoo KDE Project - - - Enable support for mobile broadband devices - Build support for the OpenConnect VPN client - - diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest index fe71429..7bf 100644 --- a/kde-plasma/plasma-nm/Manifest +++ b/kde-plasma/plasma-nm/Manifest @@ -1,2 +1,3 @@ +DIST plasma-nm-0.9.3.6.tar.xz 551320 SHA256 56b5c8221761fac30808117c7f8fa11a9e3cdb4b2d16a733d33996bc7136b64b SHA512 50f3e5020f4437d710709a301b981f98c293a71dff3aee809255207a0f97caf5d3811b453da2338df93238ef33a79e85cb3598ee38d8a41255d8a572e256 WHIRLPOOL 2486304f8c5c169105e2ea0527e7fb291cc9c9f9fee36a2cdc9d5aff7f5a72cb8bdda692ac54f621c63a84b2e48ba2c429e20a4bbe7efa91ecb48a393286dc7c DIST plasma-nm-5.7.5.tar.xz 638176 SHA256 eb74256c962703097bb6f20b10c8ef2f1646e92256772db4ec81ff4df71aedee SHA512 f806ee6b764fe7022ad82f55fb2ba28d4157a655722e02bc1b344d5e6c97ee1137938134a25ab842968174a03d72dffa20e7ab6eea4bcb5d44c5a609fa41817a WHIRLPOOL 36bbe87dfb6a783dba6d240c0f8a6361a1c4211c7f3892338288e479fd82fc22d79a018d400383e2b0085d7797a45adcecb55f5c3f54be959578e20127b96268 DIST plasma-nm-5.8.2.tar.xz 643944 SHA256 4260fbcd437b899eb17001f58a0a3973131faab2dc0702dab8ef9cf49186b60c SHA512 59186ad1f82de7914365d5c716ba0dd9c5199dba7ad9255584eaf51b4c7e71724acf9a3863141ef87223b616ae16210a78898c662e2ad7c51c16acfa7799e048 WHIRLPOOL d46cd03de7b6867591913007c0e8e8cb143d7213f80d1f361cdb183ff6bfd1035a808b7343c4729ca2d6986a2c4885a28d3f85ce087c58f431dc5c2b6b1729fc diff --git a/kde-misc/plasma-nm/files/plasma-nm-0.9.3.6-networkmanager-1.0.6.patch b/kde-plasma/plasma-nm/files/plasma-nm-0.9.3.6-networkmanager-1.0.6.patch similarity index 100% rename from