diff options
Diffstat (limited to 'kde-plasma/plasma-nm')
| -rw-r--r-- | kde-plasma/plasma-nm/Manifest | 5 | ||||
| -rw-r--r-- | kde-plasma/plasma-nm/files/plasma-nm-5.16.5-missing-headers.patch | 62 | ||||
| -rw-r--r-- | kde-plasma/plasma-nm/plasma-nm-5.15.5.ebuild | 74 | ||||
| -rw-r--r-- | kde-plasma/plasma-nm/plasma-nm-5.16.5.ebuild | 4 |
4 files changed, 67 insertions, 78 deletions
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest index 675373cacb2a..55efe89a0e38 100644 --- a/kde-plasma/plasma-nm/Manifest +++ b/kde-plasma/plasma-nm/Manifest @@ -1,5 +1,4 @@ -DIST plasma-nm-5.15.5.tar.xz 777140 BLAKE2B d75ad6c04587f5bc115268f2bef50e0f6dd2b8b86957ab1f43e284988039fb7d9530cb03d86f5c49bdf6747bbb6ad123c7bc527643fe7461ed91efc93c63e563 SHA512 f3f78f40b754de5afbd63c5713e684fe3d37ae25af5a9e6ba808647e0d7d4f23456ed4b94aa8138e1fab99e7f7d7e0dffb697e0e46c99bd312bad5e2a7b9833f +AUX plasma-nm-5.16.5-missing-headers.patch 1515 BLAKE2B 96f424e990d6fb294693ddbf61c097ccfe6d94f96d59a1df2507b253b7a05547760bf83ea885fc101c1da484499e78a360758389fa897d5a2380bcef2a5e2281 SHA512 180cdc4eee90d2162bb651b5838fd212a33d8b9bb7d500647aa0fd0bc8f75f085939cc7eeadf1077a2bd43fd9cd44923b41c736b996ad440d8e3647b488ccb6d DIST plasma-nm-5.16.5.tar.xz 787892 BLAKE2B 030840885c35ad9a2d370fddb4cad6b593512b68a958d4f94677c42506ed5c6c184d8b391bd0a47a8bb9cc6ede246163035099abe0629e437b4906cbc5de08d1 SHA512 cc52ed0b1933d0c8c86bd3188ee77d155adc2392dadbc311daf222c4e0c4c4a484b6748e1f5d52b643cc7fc55db947aff0f0a4c5ef14742d4211969e65b85d3f -EBUILD plasma-nm-5.15.5.ebuild 1982 BLAKE2B 56527f9910d7ed2ef8d8e3cc13564d4d99cdd5dfa8813f6e22e8ac309adff498a142c2cc7b00ea1e7efd696bc16a2d1a67e1ccbd0ca93e3a0ad0e3585ac8ff65 SHA512 97d12474943bfb5aabed75d3f385a11cf1c4b4d9c6f94fbb3e7c457e0a51cf3bb74f7ef2991199ab1ce026338c00cc57d403ac2576b20924d251cb14c8ef3146 -EBUILD plasma-nm-5.16.5.ebuild 1985 BLAKE2B 37662da4de5f18e91d296b4bb22beb634405104a6dc2b6f092a9ee7fffcc362d8d1005e10028b4e428077078e83fd8d86cfc0fccd4f00c8172a789e7429ac394 SHA512 c79a67b74db0314be108d5e1eefdc8e8fcac66f6dc3d9b396b3d717ace8d1a30e79fb72365eae5c0b42d906106f5e70c6795bf842d56b35a4f8172bbe1302210 +EBUILD plasma-nm-5.16.5.ebuild 2036 BLAKE2B 91a06b9fb2c589b874924c27254c81087ccf599e4f262b9933cd8298b6343aff33f9bce75b2e7d80dc788b80d7ba407b24914f43b823f8e5fb225b1a787170ff SHA512 b28fe576a529df8e26a428bea146c176d1588f46df51d17d6c30f8bef0cd343cb00ec582c41526caa9e18ec60a86c095c193189e72456de80aca877dbafd9fe3 MISC metadata.xml 479 BLAKE2B 501f2ff581390f3119e9474e1aeafb45f2e13f3cf25650482f39ab38c7fb0e70ac006f269693ef546ef324730f302c454d27d79f0346e43b6f37583ccad1ca93 SHA512 69a8ce09c5a437814562c315dc7ac3142ac6c71906f37a6ea98e7b76fdd332362cfa76e823d0ee1ec920e92c8f7dda2a557071c758e9937886d7df78943b5689 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 000000000000..676087e89ac6 --- /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 <asturm@gentoo.org> +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 <QDBusConnection> ++#include <QDBusConnectionInterface> + + #include <NetworkManagerQt/ActiveConnection> + #include <NetworkManagerQt/Connection> +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 <QDBusError> ++#include <QDBusMetaType> + #include <QDBusPendingReply> + #include <QIcon> + +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 <QDBusInterface> ++#include <QTimer> + + #include <NetworkManagerQt/Connection> + #include <NetworkManagerQt/Settings> +-- +cgit v1.1 + + diff --git a/kde-plasma/plasma-nm/plasma-nm-5.15.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.15.5.ebuild deleted file mode 100644 index d9eb050ff840..000000000000 --- a/kde-plasma/plasma-nm/plasma-nm-5.15.5.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KDE_TEST="true" -inherit kde5 - -DESCRIPTION="KDE Plasma applet for NetworkManager" -LICENSE="GPL-2 LGPL-2.1" -KEYWORDS="amd64 ~arm arm64 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 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-vpn/networkmanager-openconnect - net-vpn/openconnect:= - ) -" -RDEPEND="${DEPEND} - $(add_plasma_dep kde-cli-tools) -" - -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 -} 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 995f4b6b6b89..145f930727bc 100644 --- a/kde-plasma/plasma-nm/plasma-nm-5.16.5.ebuild +++ b/kde-plasma/plasma-nm/plasma-nm-5.16.5.ebuild @@ -8,7 +8,7 @@ inherit kde5 DESCRIPTION="KDE Plasma applet for NetworkManager" LICENSE="GPL-2 LGPL-2.1" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm arm64 x86" IUSE="modemmanager openconnect teamd" DEPEND=" @@ -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) |