1 |
commit: bba666cf172545cf750e6915fe3a76ad6aa21fd8 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue May 4 16:45:27 2021 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue May 4 20:17:49 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=bba666cf |
7 |
|
8 |
kde-plasma/plasma-nm: 5.21.5 version bump |
9 |
|
10 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
11 |
|
12 |
.../files/plasma-nm-5.21.5-missing-include.patch | 30 ++++++++ |
13 |
kde-plasma/plasma-nm/plasma-nm-5.21.5.ebuild | 83 ++++++++++++++++++++++ |
14 |
2 files changed, 113 insertions(+) |
15 |
|
16 |
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 |
17 |
new file mode 100644 |
18 |
index 0000000000..db8f98b072 |
19 |
--- /dev/null |
20 |
+++ b/kde-plasma/plasma-nm/files/plasma-nm-5.21.5-missing-include.patch |
21 |
@@ -0,0 +1,30 @@ |
22 |
+From 8d1720ac924c8453f80ac560470d9d92bdd94b07 Mon Sep 17 00:00:00 2001 |
23 |
+From: Heiko Becker <heiko.becker@×××.org> |
24 |
+Date: Tue, 4 May 2021 20:49:29 +0200 |
25 |
+Subject: [PATCH] Add missing QQueue include |
26 |
+ |
27 |
+Used since 64dc6234b6980172bb53084c16a0e4e693d6011a. I suppose it's |
28 |
+implicitly pulled in some cases, but for me the build fails with |
29 |
+"networkmodel.h:126:56: error: field 'm_updateQueue' has incomplete |
30 |
+type 'QQueue<QPair<NetworkModel::ModelChangeType, NetworkModelItem*> >'". |
31 |
+ |
32 |
+(cherry picked from commit 2bccd7c3bc3aa12ddd1886b14041f1448c634a69) |
33 |
+--- |
34 |
+ libs/models/networkmodel.h | 1 + |
35 |
+ 1 file changed, 1 insertion(+) |
36 |
+ |
37 |
+diff --git a/libs/models/networkmodel.h b/libs/models/networkmodel.h |
38 |
+index ebe6db52..749cb919 100644 |
39 |
+--- a/libs/models/networkmodel.h |
40 |
++++ b/libs/models/networkmodel.h |
41 |
+@@ -22,6 +22,7 @@ |
42 |
+ #define PLASMA_NM_NETWORK_MODEL_H |
43 |
+ |
44 |
+ #include <QAbstractListModel> |
45 |
++#include <QQueue> |
46 |
+ |
47 |
+ #include "networkitemslist.h" |
48 |
+ |
49 |
+-- |
50 |
+GitLab |
51 |
+ |
52 |
|
53 |
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.21.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.21.5.ebuild |
54 |
new file mode 100644 |
55 |
index 0000000000..a24d6cab27 |
56 |
--- /dev/null |
57 |
+++ b/kde-plasma/plasma-nm/plasma-nm-5.21.5.ebuild |
58 |
@@ -0,0 +1,83 @@ |
59 |
+# Copyright 1999-2021 Gentoo Authors |
60 |
+# Distributed under the terms of the GNU General Public License v2 |
61 |
+ |
62 |
+EAPI=7 |
63 |
+ |
64 |
+ECM_TEST="true" |
65 |
+KFMIN=5.82.0 |
66 |
+PVCUT=$(ver_cut 1-3) |
67 |
+QTMIN=5.15.2 |
68 |
+inherit ecm kde.org |
69 |
+ |
70 |
+DESCRIPTION="KDE Plasma applet for NetworkManager" |
71 |
+ |
72 |
+LICENSE="GPL-2 LGPL-2.1" |
73 |
+SLOT="5" |
74 |
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" |
75 |
+IUSE="modemmanager openconnect teamd" |
76 |
+ |
77 |
+DEPEND=" |
78 |
+ >=app-crypt/qca-2.3.0:2 |
79 |
+ >=dev-qt/qtdbus-${QTMIN}:5 |
80 |
+ >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] |
81 |
+ >=dev-qt/qtgui-${QTMIN}:5 |
82 |
+ >=dev-qt/qtnetwork-${QTMIN}:5 |
83 |
+ >=dev-qt/qtwidgets-${QTMIN}:5 |
84 |
+ >=kde-frameworks/kcompletion-${KFMIN}:5 |
85 |
+ >=kde-frameworks/kconfig-${KFMIN}:5 |
86 |
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5 |
87 |
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5 |
88 |
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5 |
89 |
+ >=kde-frameworks/kdeclarative-${KFMIN}:5 |
90 |
+ >=kde-frameworks/ki18n-${KFMIN}:5 |
91 |
+ >=kde-frameworks/kio-${KFMIN}:5 |
92 |
+ >=kde-frameworks/kitemviews-${KFMIN}:5 |
93 |
+ >=kde-frameworks/knotifications-${KFMIN}:5 |
94 |
+ >=kde-frameworks/kservice-${KFMIN}:5 |
95 |
+ >=kde-frameworks/kwallet-${KFMIN}:5 |
96 |
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 |
97 |
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5 |
98 |
+ >=kde-frameworks/kxmlgui-${KFMIN}:5 |
99 |
+ >=kde-frameworks/networkmanager-qt-${KFMIN}:5[teamd=] |
100 |
+ >=kde-frameworks/plasma-${KFMIN}:5 |
101 |
+ >=kde-frameworks/solid-${KFMIN}:5 |
102 |
+ net-misc/networkmanager[teamd=] |
103 |
+ modemmanager? ( |
104 |
+ >=dev-qt/qtxml-${QTMIN}:5 |
105 |
+ >=kde-frameworks/modemmanager-qt-${KFMIN}:5 |
106 |
+ net-misc/mobile-broadband-provider-info |
107 |
+ ) |
108 |
+ openconnect? ( |
109 |
+ >=dev-qt/qtxml-${QTMIN}:5 |
110 |
+ net-vpn/networkmanager-openconnect |
111 |
+ net-vpn/openconnect:= |
112 |
+ ) |
113 |
+" |
114 |
+RDEPEND="${DEPEND} |
115 |
+ >=dev-qt/qtquickcontrols-${QTMIN}:5 |
116 |
+ >=dev-qt/qtquickcontrols2-${QTMIN}:5 |
117 |
+ >=kde-frameworks/kirigami-${KFMIN}:5 |
118 |
+ >=kde-plasma/kde-cli-tools-${PVCUT}:5 |
119 |
+" |
120 |
+ |
121 |
+PATCHES=( "${FILESDIR}/${P}-missing-include.patch" ) |
122 |
+ |
123 |
+src_configure() { |
124 |
+ local mycmakeargs=( |
125 |
+ -DDISABLE_MODEMMANAGER_SUPPORT=$(usex !modemmanager) |
126 |
+ $(cmake_use_find_package modemmanager KF5ModemManagerQt) |
127 |
+ $(cmake_use_find_package openconnect OpenConnect) |
128 |
+ ) |
129 |
+ |
130 |
+ ecm_src_configure |
131 |
+} |
132 |
+ |
133 |
+pkg_postinst() { |
134 |
+ ecm_pkg_postinst |
135 |
+ |
136 |
+ if ! has_version "kde-plasma/plasma-workspace:5"; then |
137 |
+ elog "${PN} is not terribly useful without kde-plasma/plasma-workspace:5." |
138 |
+ elog "However, the networkmanagement KCM can be called from either systemsettings" |
139 |
+ elog "or manually: $ kcmshell5 kcm_networkmanagement" |
140 |
+ fi |
141 |
+} |