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