diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2023-05-04 16:13:20 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2023-05-09 16:23:27 +0200 |
commit | 4063382d7b7a326e11e41216abd97b977b4adc04 (patch) | |
tree | 9c026a75fef371b461fae64207bb1b5102a1c3ad | |
parent | kde-plasma/plasma-meta: drop 5.26.5 (diff) | |
download | gentoo-4063382d7b7a326e11e41216abd97b977b4adc04.tar.gz gentoo-4063382d7b7a326e11e41216abd97b977b4adc04.tar.bz2 gentoo-4063382d7b7a326e11e41216abd97b977b4adc04.zip |
kde-plasma/plasma-nm: drop 5.26.5
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r-- | kde-plasma/plasma-nm/Manifest | 1 | ||||
-rw-r--r-- | kde-plasma/plasma-nm/files/plasma-nm-5.26.0-unused-dep.patch | 62 | ||||
-rw-r--r-- | kde-plasma/plasma-nm/metadata.xml | 1 | ||||
-rw-r--r-- | kde-plasma/plasma-nm/plasma-nm-5.26.5.ebuild | 96 |
4 files changed, 0 insertions, 160 deletions
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest index a4d36d544d23..db77c36a9e89 100644 --- a/kde-plasma/plasma-nm/Manifest +++ b/kde-plasma/plasma-nm/Manifest @@ -1,2 +1 @@ -DIST plasma-nm-5.26.5.tar.xz 972940 BLAKE2B 4f10049a0a946b67fd0638913c365558a8e95b80d1d896323f4030738f8dd4d07cc77c4aaf212c52d8ba89635d932369d2f69e134722d24a5eed41841b15409a SHA512 bb17b06de15cc5b36d1eedd4fc8551eff240f8e61a4a036450b2365c99eb5885adc9541c29aa95b311d79d57b62ab95f41b746402cb6de7ecee6c6c4e87ac9a3 DIST plasma-nm-5.27.4.tar.xz 1151372 BLAKE2B b6a2c30c17b7fe5e19bba032ad0d4822c5f4ff931530cc4718d17c976317f782a3a318c1c2204ef84c2d247bb828cf7638e26283ecbb5246515c4648ce6592d2 SHA512 4077c63af9da002a8c6fc18a6fa1ccbadd84c9786a7e922209756b4ce4fc8a6780a092b5a412d79caf38872831035a3659c84fb73857d58ab0088dc73fc64c36 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 400a3fcdfc59..000000000000 --- a/kde-plasma/plasma-nm/files/plasma-nm-5.26.0-unused-dep.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 6f6958586e5a89ad5ff597550894a5770b5fb7cf Mon Sep 17 00:00:00 2001 -From: Volker Krause <vkrause@kde.org> -Date: Wed, 5 Oct 2022 16:38:37 +0200 -Subject: [PATCH] Remove deprecated KDeclarative use - -The icon image engine seems not required here. ---- - CMakeLists.txt | 1 - - kcm/CMakeLists.txt | 1 - - kcm/kcm.cpp | 5 ----- - 3 files changed, 7 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6495c735..c245f60e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -40,7 +40,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED - ConfigWidgets - Completion - CoreAddons -- Declarative - DBusAddons - KIO - I18n -diff --git a/kcm/CMakeLists.txt b/kcm/CMakeLists.txt -index cbd7ad32..8f3e60d3 100755 ---- a/kcm/CMakeLists.txt -+++ b/kcm/CMakeLists.txt -@@ -16,7 +16,6 @@ target_link_libraries(kcm_networkmanagement - plasmanm_internal - plasmanm_editor - KF5::ConfigWidgets -- KF5::Declarative - KF5::I18n - KF5::Service - Qt::Quick -diff --git a/kcm/kcm.cpp b/kcm/kcm.cpp -index 11663fe9..e350be54 100644 ---- a/kcm/kcm.cpp -+++ b/kcm/kcm.cpp -@@ -20,7 +20,6 @@ - #include <KPluginFactory> - #include <KPluginMetaData> - #include <KSharedConfig> --#include <kdeclarative/kdeclarative.h> - - #include <NetworkManagerQt/ActiveConnection> - #include <NetworkManagerQt/Connection> -@@ -58,10 +57,6 @@ KCMNetworkmanagement::KCMNetworkmanagement(QWidget *parent, const QVariantList & - auto mainWidget = new QWidget(this); - m_ui->setupUi(mainWidget); - -- KDeclarative::KDeclarative kdeclarative; -- kdeclarative.setDeclarativeEngine(m_ui->connectionView->engine()); -- kdeclarative.setupEngine(m_ui->connectionView->engine()); -- - KLocalizedContext *l10nContext = new KLocalizedContext(m_ui->connectionView->engine()); - l10nContext->setTranslationDomain(QStringLiteral(TRANSLATION_DOMAIN)); - m_ui->connectionView->engine()->rootContext()->setContextObject(l10nContext); --- -2.38.0 - diff --git a/kde-plasma/plasma-nm/metadata.xml b/kde-plasma/plasma-nm/metadata.xml index 4cc596c40725..357da291c490 100644 --- a/kde-plasma/plasma-nm/metadata.xml +++ b/kde-plasma/plasma-nm/metadata.xml @@ -9,7 +9,6 @@ <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.26.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.26.5.ebuild deleted file mode 100644 index 953f09375e80..000000000000 --- a/kde-plasma/plasma-nm/plasma-nm-5.26.5.ebuild +++ /dev/null @@ -1,96 +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.99.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.5 -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="modemmanager 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/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/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}/${PN}-5.26.0-unused-dep.patch" ) - -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 -} - -src_configure() { - local mycmakeargs=( - -DDISABLE_MODEMMANAGER_SUPPORT=$(usex !modemmanager) - $(cmake_use_find_package modemmanager KF5ModemManagerQt) - ) - - 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 -} |