From c650f7cf611feaa59620fd8626e78108fa3b5e51 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 11 Oct 2022 19:38:57 +0100 Subject: gentoo auto-resync : 11:10:2022 - 19:38:57 --- kde-plasma/plasma-nm/Manifest | 3 + .../files/plasma-nm-5.26.0-unused-dep.patch | 62 ++++++++++++++ kde-plasma/plasma-nm/plasma-nm-5.26.0.ebuild | 96 ++++++++++++++++++++++ 3 files changed, 161 insertions(+) create mode 100644 kde-plasma/plasma-nm/files/plasma-nm-5.26.0-unused-dep.patch create mode 100644 kde-plasma/plasma-nm/plasma-nm-5.26.0.ebuild (limited to 'kde-plasma/plasma-nm') diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest index 7e07eed7e741..80b1f499a473 100644 --- a/kde-plasma/plasma-nm/Manifest +++ b/kde-plasma/plasma-nm/Manifest @@ -1,3 +1,6 @@ +AUX plasma-nm-5.26.0-unused-dep.patch 1943 BLAKE2B 1f6fa231a18152c3720ee82be40c08a40e5344cb6b982fa8b62a72dfd0883d87f626d193557abdc851115ab31d99e33a72613126d5258614c75d26e67f9b59a1 SHA512 c7182240e8ae86d994e6e36ba73f42ecdea78c84077397a774a4501607b6906fdc2cd98e354bf92e9ee2cbfdfe2a23d3a30d9566b3c37a3d866b1c138114a618 DIST plasma-nm-5.25.5.tar.xz 950520 BLAKE2B 4dfd8bcff7bb6c176c5ead81f5e667df3411e89b15aff5f5e2615b0ad58084748b70585be81c82510c704bdd04269ef3348760bd69c6e5830bc1480837e158e8 SHA512 5aa1fc85e8f6b373419d188145d5501764f9aa8d246c2de7f7463483565216c6c0069d9a413993a861a083d55a504c01ea967888d9ac1ea2a7fae26b7bee06f4 +DIST plasma-nm-5.26.0.tar.xz 970672 BLAKE2B 6ca1f2a399848cecf24281922155d2a0adf2c1c948126403811dfbf19baea3a24238e4955ceb2238962fcb9e87fa2f1ab282de5c66178fe4f426991522164e6e SHA512 015a189816a058dd9af7b3abbf4fef6eb9f32bd6897f40749683c5609fd29082c2b646b3fb40d517ff38c001d1649a55f9537ea1487e4890d566c73abcd9e300 EBUILD plasma-nm-5.25.5.ebuild 2465 BLAKE2B de689191a4776f38afc768aa25dfd17bd19c2c1e4093e4db4af6947b522b07f4226e1e3082c77a1c32feb8461256f958c3a40d602fc07f0841f00b3314af1c12 SHA512 6cbac74ee54e3b06cfd882f96b2e158694079bbc34228fa6dca63873caafbd0a1e24e7eac08295c691f83abe582606bef1170bfbf48f4101e693f97461fadc2b +EBUILD plasma-nm-5.26.0.ebuild 2562 BLAKE2B 83ab187a6a9ab97995f572d7e126ed03765ba701e18a718cb1d25cd3e25acbc5ee279ca37ebeffece22da3dd1587db3b9a22bb792be3031e6682396651f2f9c3 SHA512 8349569230c9266c0c0fd3987ec89ff0aa0ea446a98e7584858fb99f3eebffec68830567c272e6520b54f12bc85b310cbaa8fd886195f74a61e9a851f451db11 MISC metadata.xml 548 BLAKE2B 72ae60901cd45e2b312418553d64dbed59ed4b9d3fd8b71f0e6eaa1782dd997d08f28fd7fb2668303a6dfa290eee1cbde6397580091730b3c5f65c85c111435a SHA512 f4cd7aa6532a5816a111cc088db3a712462bce395aa792c0ba6869981d70bec7f56040038e3dce6a7b0496f423a5be8f0e0081ab45ee51451a384f3cd8c4ade5 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 000000000000..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 new file mode 100644 index 000000000000..5b2a2bbb7629 --- /dev/null +++ b/kde-plasma/plasma-nm/plasma-nm-5.26.0.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2022 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" +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/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}/${P}-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 +} -- cgit v1.2.3