diff options
Diffstat (limited to 'kde-plasma/plasma-nm')
| -rw-r--r-- | kde-plasma/plasma-nm/Manifest | 4 | ||||
| -rw-r--r-- | kde-plasma/plasma-nm/files/plasma-nm-5.21.5-missing-include.patch | 30 | ||||
| -rw-r--r-- | kde-plasma/plasma-nm/files/plasma-nm-5.22.0-qt-5.15.2ff-missing-include.patch | 30 | ||||
| -rw-r--r-- | kde-plasma/plasma-nm/metadata.xml | 6 | ||||
| -rw-r--r-- | kde-plasma/plasma-nm/plasma-nm-5.21.5.ebuild | 83 | ||||
| -rw-r--r-- | kde-plasma/plasma-nm/plasma-nm-5.27.11.ebuild (renamed from kde-plasma/plasma-nm/plasma-nm-5.22.1.ebuild) | 49 | ||||
| -rw-r--r-- | kde-plasma/plasma-nm/plasma-nm-6.0.4.ebuild | 78 |
7 files changed, 109 insertions, 171 deletions
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest index 2871a87ccd3f..376530f6f73d 100644 --- a/kde-plasma/plasma-nm/Manifest +++ b/kde-plasma/plasma-nm/Manifest @@ -1,2 +1,2 @@ -DIST plasma-nm-5.21.5.tar.xz 902104 BLAKE2B 8b881f39e01b7de0107b897c81fffb7bfa429a0bd7d8eb58026328ac42c411d5dd8e154e843767098731174a492e64b6c8a28c8af474584862f58081d9a5e751 SHA512 ac074e50d5ee3be99bab515b02522e391b14936c1c8152ca067c7513af7a8e8b81cb55ab9b412ca703554f3e35fc9392368159c9872d8c372017089a4a65e3fa -DIST plasma-nm-5.22.1.tar.xz 899884 BLAKE2B 8bd2ab27c397c9b758d85a16c13d619ba9da07db5c10a255a3f6f92f2264bc38472fa71bab073315ff9995b42b192c5cce2bc57daf523383ecb8aa270310ed65 SHA512 653d3b22c829fb7f8003d5c377b058d1d6def77ceb89b8dec0ffe71a684343a9ef06334d11c6327ab96a306ebd59e0354ff97e922167ec03d85ff0291df36b03 +DIST plasma-nm-5.27.11.tar.xz 1150816 BLAKE2B 9c48416a45caf9ac4836f793bd082906b2f3548dc1000c013c9403d609e3d0eee6036da4c6bb9b24be31a278487f777bd6fc3b258ce75adec35759c94ee35994 SHA512 79148728ab0e365c686ad4f24e8304f4be37112794c6356495b6108629ba68348588cf56f2fee60d2392ebaa5f4ab33cc43c30bdbae053ead5c5783cc1ced8ad +DIST plasma-nm-6.0.4.tar.xz 1170808 BLAKE2B 77fac645493cb462fdd5742d513e544d1ee41c4895fbee49dfefe57a2c980bb68ea864fb2ec67863c22f3805f718effc43ed00364c98a06f671be7b88a1de485 SHA512 df2fdb51f3e78ca123ac9c206c2a99ef3e52e7b05a8d8b2d638da675dacefcfb6b13b71ca9f951ab9e4dabea301eb1a1ab7019dbedd1dde4fec0f64bc6558c35 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 db8f98b072b7..000000000000 --- 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 <heiko.becker@kde.org> -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<QPair<NetworkModel::ModelChangeType, NetworkModelItem*> >'". - -(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 <QAbstractListModel> -+#include <QQueue> - - #include "networkitemslist.h" - --- -GitLab - diff --git a/kde-plasma/plasma-nm/files/plasma-nm-5.22.0-qt-5.15.2ff-missing-include.patch b/kde-plasma/plasma-nm/files/plasma-nm-5.22.0-qt-5.15.2ff-missing-include.patch deleted file mode 100644 index 133b3e225c54..000000000000 --- a/kde-plasma/plasma-nm/files/plasma-nm-5.22.0-qt-5.15.2ff-missing-include.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 55ab9bfd83fb74d14e26cc1a3d8f257bc47c45ea Mon Sep 17 00:00:00 2001 -From: Heiko Becker <heiko.becker@kde.org> -Date: Sun, 6 Jun 2021 19:34:16 +0200 -Subject: [PATCH] Add missing QFile include - -Used since 40d056195bc400bc4e249cd152993000011687c2. I suppose it's -implicitly pulled in some cases, but for me the build fails against -Qt from KDE's patch collection with "libs/handler.cpp:704:5: error: -'QFile' was not declared in this scope;". - -(cherry picked from commit 6cac88b61da1277dcb9a801e47f2d69829c68086) ---- - libs/handler.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libs/handler.cpp b/libs/handler.cpp -index 470b0fc1..7c8302be 100644 ---- a/libs/handler.cpp -+++ b/libs/handler.cpp -@@ -45,6 +45,7 @@ - #include <QDBusError> - #include <QDBusMetaType> - #include <QDBusPendingReply> -+#include <QFile> - #include <QIcon> - - #include <KNotification> --- -GitLab - diff --git a/kde-plasma/plasma-nm/metadata.xml b/kde-plasma/plasma-nm/metadata.xml index 89ac1236a4a2..357da291c490 100644 --- a/kde-plasma/plasma-nm/metadata.xml +++ b/kde-plasma/plasma-nm/metadata.xml @@ -1,12 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>kde@gentoo.org</email> <name>Gentoo KDE Project</name> </maintainer> + <upstream> + <bugs-to>https://bugs.kde.org/</bugs-to> + </upstream> <use> - <flag name="modemmanager">Enable support for mobile broadband devices</flag> <flag name="openconnect">Build support for the OpenConnect VPN client</flag> <flag name="teamd">Enable Teamd control support</flag> </use> 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 8e934494dfe4..000000000000 --- 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" ) - -src_configure() { - local mycmakeargs=( - -DDISABLE_MODEMMANAGER_SUPPORT=$(usex !modemmanager) - $(cmake_use_find_package modemmanager KF5ModemManagerQt) - $(cmake_use_find_package openconnect OpenConnect) - ) - - ecm_src_configure -} - -pkg_postinst() { - ecm_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 -} diff --git a/kde-plasma/plasma-nm/plasma-nm-5.22.1.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.27.11.ebuild index efbeb893a417..1c2ec2adf0cb 100644 --- a/kde-plasma/plasma-nm/plasma-nm-5.22.1.ebuild +++ b/kde-plasma/plasma-nm/plasma-nm-5.27.11.ebuild @@ -1,34 +1,34 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 ECM_TEST="true" -KFMIN=5.82.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm plasma.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" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +IUSE="openconnect teamd" DEPEND=" - >=app-crypt/qca-2.3.0:2 + >=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 + >=dev-qt/qtxml-${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 @@ -38,17 +38,13 @@ DEPEND=" >=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 + >=kde-plasma/libplasma-${KFMIN}:5 + net-misc/mobile-broadband-provider-info 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:= ) @@ -56,18 +52,23 @@ DEPEND=" RDEPEND="${DEPEND} >=dev-qt/qtquickcontrols-${QTMIN}:5 >=dev-qt/qtquickcontrols2-${QTMIN}:5 + >=kde-frameworks/kdeclarative-${KFMIN}:5 >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-plasma/kde-cli-tools-${PVCUT}:5 + >=kde-frameworks/kquickcharts-${KFMIN}:5 + >=kde-plasma/kde-cli-tools-${PVCUT}:* +" +BDEPEND=" + >=kde-frameworks/kcmutils-${KFMIN}:5 + virtual/pkgconfig " -src_configure() { - local mycmakeargs=( - -DDISABLE_MODEMMANAGER_SUPPORT=$(usex !modemmanager) - $(cmake_use_find_package modemmanager KF5ModemManagerQt) - $(cmake_use_find_package openconnect OpenConnect) - ) +src_prepare() { + ecm_src_prepare - ecm_src_configure + # 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() { diff --git a/kde-plasma/plasma-nm/plasma-nm-6.0.4.ebuild b/kde-plasma/plasma-nm/plasma-nm-6.0.4.ebuild new file mode 100644 index 000000000000..ebef5ede78f0 --- /dev/null +++ b/kde-plasma/plasma-nm/plasma-nm-6.0.4.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="true" +KFMIN=6.0 +PVCUT=$(ver_cut 1-3) +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="KDE Plasma applet for NetworkManager" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="6" +KEYWORDS="~amd64" +IUSE="openconnect teamd" + +DEPEND=" + >=app-crypt/qca-2.3.7:2[qt6] + dev-libs/qcoro[dbus] + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml] + >=dev-qt/qtdeclarative-${QTMIN}:6[widgets] + >=kde-frameworks/kcompletion-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kitemviews-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/ksvg-${KFMIN}:6 + >=kde-frameworks/kwallet-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6 + >=kde-frameworks/kxmlgui-${KFMIN}:6 + >=kde-frameworks/modemmanager-qt-${KFMIN}:6 + >=kde-frameworks/networkmanager-qt-${KFMIN}:6[teamd=] + >=kde-frameworks/solid-${KFMIN}:6 + >=kde-plasma/libplasma-${PVCUT}:6 + net-misc/mobile-broadband-provider-info + net-misc/networkmanager[teamd=] + openconnect? ( + >=dev-qt/qtwebengine-${QTMIN}:6 + net-vpn/networkmanager-openconnect + net-vpn/openconnect:= + ) +" +RDEPEND="${DEPEND} + >=kde-frameworks/kdeclarative-${KFMIN}:6 + >=kde-frameworks/kirigami-${KFMIN}:6 + >=kde-frameworks/kquickcharts-${KFMIN}:6 + >=kde-plasma/kde-cli-tools-${PVCUT}:* +" +BDEPEND=" + >=kde-frameworks/kcmutils-${KFMIN}:6 + virtual/pkgconfig +" + +src_configure() { + local mycmakeargs=( + -DBUILD_OPENCONNECT=$(usex openconnect) + ) + + ecm_src_configure +} + +pkg_postinst() { + ecm_pkg_postinst + + if ! has_version "kde-frameworks/kcmutils:6"; then + elog "${PN} is not terribly useful without kde-frameworks/kcmutils:6." + elog "However, the networkmanagement KCM can be called from either systemsettings" + elog "or manually: $ kcmshell6 kcm_networkmanagement" + fi +} |