diff options
Diffstat (limited to 'kde-plasma/plasma-nm')
| -rw-r--r-- | kde-plasma/plasma-nm/Manifest | 7 | ||||
| -rw-r--r-- | kde-plasma/plasma-nm/files/plasma-nm-5.18.5-missing-wireguard-icon.patch | 50 | ||||
| -rw-r--r-- | kde-plasma/plasma-nm/plasma-nm-5.19.5.ebuild | 2 | ||||
| -rw-r--r-- | kde-plasma/plasma-nm/plasma-nm-5.20.3.ebuild (renamed from kde-plasma/plasma-nm/plasma-nm-5.18.5-r1.ebuild) | 13 |
4 files changed, 10 insertions, 62 deletions
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest index 21fec3eb90bd..d6397351d2f8 100644 --- a/kde-plasma/plasma-nm/Manifest +++ b/kde-plasma/plasma-nm/Manifest @@ -1,7 +1,6 @@ -AUX plasma-nm-5.18.5-missing-wireguard-icon.patch 1698 BLAKE2B 37bb63676905746999df50b87e5575d4ec1207dec37848e18216123760d84b577327c20346ede1dba263975253db6bcccfbf4b91167f59aa173b08baffb7e542 SHA512 485e56c592da9f30e5acc94f9f2e8af66989e70aa74ae0b4756dd4e7008729fa1eb1d43dd329983565366937eb7a057a74741b8b456db462cf7f7af00ed1b841 AUX plasma-nm-5.19.2-fix-inline-password-field.patch 1458 BLAKE2B b169f54b842e38fb077a793778c9a923e2a5df906abd0c29edee7d5279cd81555617b0b70d50953724737d0aa068618bbff9eb341eb3d9fc542cbdcd982db3a5 SHA512 90be93b2a95cd2a69e7d8083d33b7c0ea11a4b09e4396e853f6147b304dc60635274a21ec91e23637c6045813586b6ef52b670d273c1bf29b5abe3a48ed65b39 -DIST plasma-nm-5.18.5.tar.xz 828008 BLAKE2B 557a31d5a0e7886be90e62be3f5328baf4a8bbfeb3e9decf1f2f106f33bef7e64fb886b94691faab57119f231b6bbcff58514d795df75f858ca9c8ea8c1af9a7 SHA512 8f785f257f274fb9384bf2afbe4231a057c46706483e26dd2270a93a6fc97e6198916ff119d258a67d4f8bb73facb0ff67412f43e5fa66812962edb64331db4a DIST plasma-nm-5.19.5.tar.xz 855504 BLAKE2B a2437794d9de5a0fda6328dd0e352fad956710cef06f9bc2d6590dbde7f2eb469d051db6fc4ce647fe59bf95e48e6e6c9ff68e512a2992abe183ab309112f94d SHA512 2fdd42e7c9bba0b069e0ca39f8ef996b36a807a4065172a816023c32d5d24869bf92c577c9cc5a08bb9e8b13c628b7cbd8346d17dc1e6814c931f7f7ec9439a7 -EBUILD plasma-nm-5.18.5-r1.ebuild 2368 BLAKE2B 6bb2e5feb6f4182e620ae1f410639b9794ba2e175bf053dc74d5efde0db63cfcf13e5b4595c387acacb68c4675c296e74c8de2d9c28c078bb7e263cd33fa4861 SHA512 1825154c7bd0d60f70cc4fe02ef3b1f5b82a9533c56f9bd19ae53d31b2a1c3576e098fffe83b5d8a778765c27b19065643327ba71823e129285d2eb40d6ec078 -EBUILD plasma-nm-5.19.5.ebuild 2414 BLAKE2B e887240665a330f987c214e6745cd0a52abbc1145743c668e47c335f003c644ea44f6495936afcf533d3ea5efcbbbdd7b730397ab31e527ed43017e4a314b218 SHA512 4ae74be9e55e095beb24d99ec45d398dc7984329f3ab9b536e75ce9387d5cf9a1187593311417abe924b7f2dbf5b82d152ed597ef11847213ca95c9a5c1d9abf +DIST plasma-nm-5.20.3.tar.xz 859028 BLAKE2B 3a53572b5049c0e5cacb48a577cc6492d2b7098b7a903fee5f670943f95047871dfbb45ee25f6246cc155249abd5732cc047608e6440b3ebec05f5f6db801343 SHA512 9f98aba2897d7f2fbae155b4460a870476995df5ba7f4599f53e223681847613fa9eb2ef848ebc421612262a82277d4406372a68b064bcd98a6ebf7962b598b8 +EBUILD plasma-nm-5.19.5.ebuild 2411 BLAKE2B face78008487cde60f4c07d53389a3fd99e83e4bfe79ae04bb1c2bffb76c4ae22cbbb08fde8738d1b758551477e325604025515640c01b260b4351c0321c3e81 SHA512 2a79e85fa7901df76e16761bbc63bb9f4183df4940a765196a4e7ba793d3e1f8c43de960ba3061e470f13fefc7817de2139a1ade6b7834344f3885fb3d3b9364 +EBUILD plasma-nm-5.20.3.ebuild 2323 BLAKE2B d9879dffd379f5cc6e49008b86a58d91763bcaffde9d72fa2ccfbb2f0b45576fd0842b906c825a60e957d406f049e852ba865746ae06b4f924f28a4b9dfe1c5b SHA512 1839dafb727e6d322c558a40e08ec2657d7184adf68120c81dd83de811f576dfc237c677b8aa0c5ff4b60b3eb30718a8df44e67f8cca2d85cf1f3799b6816962 MISC metadata.xml 479 BLAKE2B 501f2ff581390f3119e9474e1aeafb45f2e13f3cf25650482f39ab38c7fb0e70ac006f269693ef546ef324730f302c454d27d79f0346e43b6f37583ccad1ca93 SHA512 69a8ce09c5a437814562c315dc7ac3142ac6c71906f37a6ea98e7b76fdd332362cfa76e823d0ee1ec920e92c8f7dda2a557071c758e9937886d7df78943b5689 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 deleted file mode 100644 index 85902e504096..000000000000 --- a/kde-plasma/plasma-nm/files/plasma-nm-5.18.5-missing-wireguard-icon.patch +++ /dev/null @@ -1,50 +0,0 @@ -From da52d01788f5f07aa60ed7a6f21d7943a2e0c8d3 Mon Sep 17 00:00:00 2001 -From: Bruce Anderson <banderson19com@san.rr.com> -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.19.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.19.5.ebuild index 703e7f5bf82f..69089da378c5 100644 --- a/kde-plasma/plasma-nm/plasma-nm-5.19.5.ebuild +++ b/kde-plasma/plasma-nm/plasma-nm-5.19.5.ebuild @@ -13,7 +13,7 @@ DESCRIPTION="KDE Plasma applet for NetworkManager" LICENSE="GPL-2 LGPL-2.1" SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" IUSE="modemmanager openconnect teamd" DEPEND=" diff --git a/kde-plasma/plasma-nm/plasma-nm-5.18.5-r1.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.20.3.ebuild index fd1c44fe031f..dec9064ff778 100644 --- a/kde-plasma/plasma-nm/plasma-nm-5.18.5-r1.ebuild +++ b/kde-plasma/plasma-nm/plasma-nm-5.20.3.ebuild @@ -4,20 +4,20 @@ EAPI=7 ECM_TEST="true" -KFMIN=5.66.0 +KFMIN=5.74.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.12.3 +QTMIN=5.15.1 inherit ecm kde.org DESCRIPTION="KDE Plasma applet for NetworkManager" LICENSE="GPL-2 LGPL-2.1" SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" IUSE="modemmanager openconnect teamd" DEPEND=" - >=app-crypt/qca-2.1.1:2[qt5(+)] + >=app-crypt/qca-2.3.0:2 >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] >=dev-qt/qtgui-${QTMIN}:5 @@ -44,8 +44,8 @@ DEPEND=" >=kde-frameworks/solid-${KFMIN}:5 net-misc/networkmanager[teamd=] modemmanager? ( - >=kde-frameworks/modemmanager-qt-${KFMIN}:5 >=dev-qt/qtxml-${QTMIN}:5 + >=kde-frameworks/modemmanager-qt-${KFMIN}:5 net-misc/mobile-broadband-provider-info ) openconnect? ( @@ -57,11 +57,10 @@ DEPEND=" 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-wireguard-icon.patch" ) # in Plasma/5.18 - src_configure() { local mycmakeargs=( -DDISABLE_MODEMMANAGER_SUPPORT=$(usex !modemmanager) |