Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/, kde-frameworks/plasma/files/
Date: Wed, 13 Mar 2019 11:05:08
Message-Id: 1552475003.a16899591d3ef4c626c0c98a2564d6b6cb0830f9.asturm@gentoo
1 commit: a16899591d3ef4c626c0c98a2564d6b6cb0830f9
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Mar 13 11:03:23 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 13 11:03:23 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1689959
7
8 kde-frameworks/plasma: Drop 5.56.0, 5.56.0-r1
9
10 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
11 Package-Manager: Portage-2.3.62, Repoman-2.3.11
12
13 kde-frameworks/plasma/Manifest | 1 -
14 .../plasma/files/plasma-5.56.0-crashfix.patch | 40 ------------
15 kde-frameworks/plasma/plasma-5.56.0-r1.ebuild | 73 ----------------------
16 kde-frameworks/plasma/plasma-5.56.0.ebuild | 71 ---------------------
17 4 files changed, 185 deletions(-)
18
19 diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
20 index 77e8505d233..92c96f3893b 100644
21 --- a/kde-frameworks/plasma/Manifest
22 +++ b/kde-frameworks/plasma/Manifest
23 @@ -1,3 +1,2 @@
24 DIST plasma-framework-5.54.0.tar.xz 4631204 BLAKE2B c7c68f96524be0bc359b0f4b36c79c2d581a8659a53ab432ad64bbeec00b4004630170d2354a887e0ae6d2c15c50d9895fbb5f27def6d8574fd051e5f1612551 SHA512 618f2beb3b8a25cacf7c11339ba15cae10db461c61e278a5ba845e9afac7e9edb48fde16bd78b4bb7d16c07001f8d9fbdbf5bfd58593488a544fa183b3df8c15
25 -DIST plasma-framework-5.56.0.tar.xz 4636296 BLAKE2B 77f94585d7129917d0b3a1689a07242a4a593ac7dd45e92c417e1dcef994be9c5b3d949bccbd50158c3471ad30b2a773d67e892b4e58968fea5a98c2604d4260 SHA512 7dee5e0fc9345f81a166c1c381ebc6e660eb38ae34eea169977740151ad67bd93d07fc1933ea4d3f2ec0236ca9d40dbd2c160b379b85e28faf184f15a80b9bcc
26 DIST plasma-framework-5.56.1.tar.xz 4636412 BLAKE2B 516c50e9540f5e82c97dd9ea767b9fb79647ad74f54da767930119292f3a3dea69bbea0df2b00ef0a0300a558663cdc14f97883bf8c19346a53272e1c7d083b3 SHA512 4cf9387016b25fa060e9b1859a2d3894d48e0e698130886b2fab94a92023c438566bc509b2066c58d1273214e91a63705b05f4f8cad9121d8e84ebed4a7d11af
27
28 diff --git a/kde-frameworks/plasma/files/plasma-5.56.0-crashfix.patch b/kde-frameworks/plasma/files/plasma-5.56.0-crashfix.patch
29 deleted file mode 100644
30 index 844ddf6a234..00000000000
31 --- a/kde-frameworks/plasma/files/plasma-5.56.0-crashfix.patch
32 +++ /dev/null
33 @@ -1,40 +0,0 @@
34 -From ebae2d63033647950cf0f9d97410723a8c7db1f3 Mon Sep 17 00:00:00 2001
35 -From: Laurent Montel <montel@×××.org>
36 -Date: Tue, 12 Mar 2019 07:03:10 +0100
37 -Subject: Remove crash in plasmashell
38 -
39 -Summary: remove bug in plasmashell Bug 405341
40 -
41 -Test Plan: can't reproduce bug
42 -
43 -Reviewers: dfaure, #frameworks, #plasma, broulik
44 -
45 -Reviewed By: #plasma, broulik
46 -
47 -Subscribers: broulik, kde-frameworks-devel
48 -
49 -Tags: #frameworks
50 -
51 -Differential Revision: https://phabricator.kde.org/D19698
52 ----
53 - src/declarativeimports/core/datamodel.cpp | 5 ++++-
54 - 1 file changed, 4 insertions(+), 1 deletion(-)
55 -
56 -diff --git a/src/declarativeimports/core/datamodel.cpp b/src/declarativeimports/core/datamodel.cpp
57 -index 50dc6c5..03bea20 100644
58 ---- a/src/declarativeimports/core/datamodel.cpp
59 -+++ b/src/declarativeimports/core/datamodel.cpp
60 -@@ -64,7 +64,10 @@ void SortFilterModel::syncRoleNames()
61 -
62 - QHash<int,QByteArray> SortFilterModel::roleNames() const
63 - {
64 -- return sourceModel()->roleNames();
65 -+ if (sourceModel()) {
66 -+ return sourceModel()->roleNames();
67 -+ }
68 -+ return {};
69 - }
70 -
71 - int SortFilterModel::roleNameToId(const QString &name) const
72 ---
73 -cgit v1.1
74
75 diff --git a/kde-frameworks/plasma/plasma-5.56.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.56.0-r1.ebuild
76 deleted file mode 100644
77 index fce285228be..00000000000
78 --- a/kde-frameworks/plasma/plasma-5.56.0-r1.ebuild
79 +++ /dev/null
80 @@ -1,73 +0,0 @@
81 -# Copyright 1999-2019 Gentoo Authors
82 -# Distributed under the terms of the GNU General Public License v2
83 -
84 -EAPI=7
85 -
86 -KMNAME="${PN}-framework"
87 -VIRTUALX_REQUIRED="test"
88 -inherit kde5
89 -
90 -DESCRIPTION="Plasma framework"
91 -LICENSE="LGPL-2+"
92 -KEYWORDS="~amd64 ~arm ~arm64 ~x86"
93 -IUSE="gles2 wayland X"
94 -
95 -BDEPEND="
96 - $(add_frameworks_dep kdoctools)
97 -"
98 -RDEPEND="
99 - $(add_frameworks_dep kactivities)
100 - $(add_frameworks_dep karchive)
101 - $(add_frameworks_dep kconfig)
102 - $(add_frameworks_dep kconfigwidgets)
103 - $(add_frameworks_dep kcoreaddons)
104 - $(add_frameworks_dep kdeclarative)
105 - $(add_frameworks_dep kglobalaccel)
106 - $(add_frameworks_dep kguiaddons)
107 - $(add_frameworks_dep ki18n)
108 - $(add_frameworks_dep kiconthemes)
109 - $(add_frameworks_dep kio)
110 - $(add_frameworks_dep kirigami)
111 - $(add_frameworks_dep knotifications)
112 - $(add_frameworks_dep kpackage)
113 - $(add_frameworks_dep kservice)
114 - $(add_frameworks_dep kwidgetsaddons)
115 - $(add_frameworks_dep kwindowsystem)
116 - $(add_frameworks_dep kxmlgui)
117 - $(add_qt_dep qtdbus)
118 - $(add_qt_dep qtdeclarative)
119 - $(add_qt_dep qtgui 'gles2=')
120 - $(add_qt_dep qtquickcontrols)
121 - $(add_qt_dep qtsql)
122 - $(add_qt_dep qtsvg)
123 - $(add_qt_dep qtwidgets)
124 - !gles2? ( virtual/opengl )
125 - wayland? (
126 - $(add_frameworks_dep kwayland)
127 - media-libs/mesa[egl]
128 - )
129 - X? (
130 - $(add_qt_dep qtx11extras)
131 - x11-libs/libX11
132 - x11-libs/libxcb
133 - )
134 -"
135 -DEPEND="${RDEPEND}
136 - X? ( x11-base/xorg-proto )
137 -"
138 -
139 -RESTRICT+=" test"
140 -
141 -PATCHES=( "${FILESDIR}/${P}-crashfix.patch" )
142 -
143 -src_configure() {
144 - local mycmakeargs=(
145 - $(cmake-utils_use_find_package !gles2 OpenGL)
146 - $(cmake-utils_use_find_package wayland EGL)
147 - $(cmake-utils_use_find_package wayland KF5Wayland)
148 - $(cmake-utils_use_find_package X X11)
149 - $(cmake-utils_use_find_package X XCB)
150 - )
151 -
152 - kde5_src_configure
153 -}
154
155 diff --git a/kde-frameworks/plasma/plasma-5.56.0.ebuild b/kde-frameworks/plasma/plasma-5.56.0.ebuild
156 deleted file mode 100644
157 index 8da657de064..00000000000
158 --- a/kde-frameworks/plasma/plasma-5.56.0.ebuild
159 +++ /dev/null
160 @@ -1,71 +0,0 @@
161 -# Copyright 1999-2019 Gentoo Authors
162 -# Distributed under the terms of the GNU General Public License v2
163 -
164 -EAPI=7
165 -
166 -KMNAME="${PN}-framework"
167 -VIRTUALX_REQUIRED="test"
168 -inherit kde5
169 -
170 -DESCRIPTION="Plasma framework"
171 -LICENSE="LGPL-2+"
172 -KEYWORDS="~amd64 ~arm ~arm64 ~x86"
173 -IUSE="gles2 wayland X"
174 -
175 -BDEPEND="
176 - $(add_frameworks_dep kdoctools)
177 -"
178 -RDEPEND="
179 - $(add_frameworks_dep kactivities)
180 - $(add_frameworks_dep karchive)
181 - $(add_frameworks_dep kconfig)
182 - $(add_frameworks_dep kconfigwidgets)
183 - $(add_frameworks_dep kcoreaddons)
184 - $(add_frameworks_dep kdeclarative)
185 - $(add_frameworks_dep kglobalaccel)
186 - $(add_frameworks_dep kguiaddons)
187 - $(add_frameworks_dep ki18n)
188 - $(add_frameworks_dep kiconthemes)
189 - $(add_frameworks_dep kio)
190 - $(add_frameworks_dep kirigami)
191 - $(add_frameworks_dep knotifications)
192 - $(add_frameworks_dep kpackage)
193 - $(add_frameworks_dep kservice)
194 - $(add_frameworks_dep kwidgetsaddons)
195 - $(add_frameworks_dep kwindowsystem)
196 - $(add_frameworks_dep kxmlgui)
197 - $(add_qt_dep qtdbus)
198 - $(add_qt_dep qtdeclarative)
199 - $(add_qt_dep qtgui 'gles2=')
200 - $(add_qt_dep qtquickcontrols)
201 - $(add_qt_dep qtsql)
202 - $(add_qt_dep qtsvg)
203 - $(add_qt_dep qtwidgets)
204 - !gles2? ( virtual/opengl )
205 - wayland? (
206 - $(add_frameworks_dep kwayland)
207 - media-libs/mesa[egl]
208 - )
209 - X? (
210 - $(add_qt_dep qtx11extras)
211 - x11-libs/libX11
212 - x11-libs/libxcb
213 - )
214 -"
215 -DEPEND="${RDEPEND}
216 - X? ( x11-base/xorg-proto )
217 -"
218 -
219 -RESTRICT+=" test"
220 -
221 -src_configure() {
222 - local mycmakeargs=(
223 - $(cmake-utils_use_find_package !gles2 OpenGL)
224 - $(cmake-utils_use_find_package wayland EGL)
225 - $(cmake-utils_use_find_package wayland KF5Wayland)
226 - $(cmake-utils_use_find_package X X11)
227 - $(cmake-utils_use_find_package X XCB)
228 - )
229 -
230 - kde5_src_configure
231 -}