1 |
commit: 45688935be11f162d37b150bd5d366633559f67a |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Mar 3 20:40:17 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Mar 3 21:49:40 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45688935 |
7 |
|
8 |
net-libs/libkvkontakte: Fix warnings, EAPI-7 bump |
9 |
|
10 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
.../files/libkvkontakte-5.0.0-fix-warnings.patch | 386 +++++++++++++++++++++ |
14 |
.../libkvkontakte/libkvkontakte-5.0.0-r1.ebuild | 33 ++ |
15 |
2 files changed, 419 insertions(+) |
16 |
|
17 |
diff --git a/net-libs/libkvkontakte/files/libkvkontakte-5.0.0-fix-warnings.patch b/net-libs/libkvkontakte/files/libkvkontakte-5.0.0-fix-warnings.patch |
18 |
new file mode 100644 |
19 |
index 00000000000..36e107001d1 |
20 |
--- /dev/null |
21 |
+++ b/net-libs/libkvkontakte/files/libkvkontakte-5.0.0-fix-warnings.patch |
22 |
@@ -0,0 +1,386 @@ |
23 |
+From ba1f7e7f7424df2bf96513c14f10d3cff47f48a4 Mon Sep 17 00:00:00 2001 |
24 |
+From: Pino Toscano <pino@×××.org> |
25 |
+Date: Sat, 9 Sep 2017 15:20:05 +0200 |
26 |
+Subject: use Q_DECL_OVERRIDE |
27 |
+ |
28 |
+--- |
29 |
+ src/albumlistjob.h | 2 +- |
30 |
+ src/allmessageslistjob.h | 2 +- |
31 |
+ src/allnoteslistjob.h | 2 +- |
32 |
+ src/cidsnamesjob.h | 2 +- |
33 |
+ src/createalbumjob.h | 2 +- |
34 |
+ src/deletealbumjob.h | 2 +- |
35 |
+ src/discussionslistjob.h | 2 +- |
36 |
+ src/editalbumjob.h | 2 +- |
37 |
+ src/friendlistjob.h | 2 +- |
38 |
+ src/getapplicationpermissionsjob.h | 2 +- |
39 |
+ src/getinfojob.h | 2 +- |
40 |
+ src/getphotouploadserverjob.h | 4 ++-- |
41 |
+ src/getvariablejob.h | 2 +- |
42 |
+ src/grouplistjob.h | 2 +- |
43 |
+ src/messageslistjob.h | 2 +- |
44 |
+ src/noteaddjob.h | 2 +- |
45 |
+ src/notejob.h | 2 +- |
46 |
+ src/noteslistjob.h | 2 +- |
47 |
+ src/photojob.h | 2 +- |
48 |
+ src/photolistjob.h | 2 +- |
49 |
+ src/photopostjob.h | 2 +- |
50 |
+ src/savephotojob.h | 2 +- |
51 |
+ src/uploadphotosjob.h | 2 +- |
52 |
+ src/userinfojob.h | 4 ++-- |
53 |
+ src/vkontaktejobs.h | 6 +++--- |
54 |
+ 25 files changed, 29 insertions(+), 29 deletions(-) |
55 |
+ |
56 |
+diff --git a/src/albumlistjob.h b/src/albumlistjob.h |
57 |
+index 0e91af0..70dc29e 100644 |
58 |
+--- a/src/albumlistjob.h |
59 |
++++ b/src/albumlistjob.h |
60 |
+@@ -38,7 +38,7 @@ public: |
61 |
+ QList<AlbumInfo> list() const; |
62 |
+ |
63 |
+ protected: |
64 |
+- virtual void handleData(const QJsonValue &data); |
65 |
++ void handleData(const QJsonValue &data) Q_DECL_OVERRIDE; |
66 |
+ |
67 |
+ void handleItem(const QVariant &data); |
68 |
+ |
69 |
+diff --git a/src/allmessageslistjob.h b/src/allmessageslistjob.h |
70 |
+index e714526..4bf067c 100644 |
71 |
+--- a/src/allmessageslistjob.h |
72 |
++++ b/src/allmessageslistjob.h |
73 |
+@@ -44,7 +44,7 @@ public: |
74 |
+ int filters = 0, int timeOffset = 0); |
75 |
+ ~AllMessagesListJob(); |
76 |
+ |
77 |
+- virtual void start(); |
78 |
++ void start() Q_DECL_OVERRIDE; |
79 |
+ |
80 |
+ QList<MessageInfoPtr> list() const; |
81 |
+ int count() const; |
82 |
+diff --git a/src/allnoteslistjob.h b/src/allnoteslistjob.h |
83 |
+index 1228bb8..661107a 100644 |
84 |
+--- a/src/allnoteslistjob.h |
85 |
++++ b/src/allnoteslistjob.h |
86 |
+@@ -33,7 +33,7 @@ public: |
87 |
+ AllNotesListJob(const QString &accessToken, int uid); |
88 |
+ ~AllNotesListJob(); |
89 |
+ |
90 |
+- virtual void start(); |
91 |
++ void start() Q_DECL_OVERRIDE; |
92 |
+ |
93 |
+ QList<NoteInfoPtr> list() const; |
94 |
+ int count() const; |
95 |
+diff --git a/src/cidsnamesjob.h b/src/cidsnamesjob.h |
96 |
+index 9bd142c..c6878a1 100644 |
97 |
+--- a/src/cidsnamesjob.h |
98 |
++++ b/src/cidsnamesjob.h |
99 |
+@@ -40,7 +40,7 @@ public: |
100 |
+ QMap<int, QString> names() const; |
101 |
+ |
102 |
+ protected: |
103 |
+- virtual void handleData(const QVariant &data); |
104 |
++ void handleData(const QVariant &data) Q_DECL_OVERRIDE; |
105 |
+ |
106 |
+ private: |
107 |
+ class Private; |
108 |
+diff --git a/src/createalbumjob.h b/src/createalbumjob.h |
109 |
+index 8d7ec17..09c68e9 100644 |
110 |
+--- a/src/createalbumjob.h |
111 |
++++ b/src/createalbumjob.h |
112 |
+@@ -40,7 +40,7 @@ public: |
113 |
+ AlbumInfo album() const; |
114 |
+ |
115 |
+ protected: |
116 |
+- virtual void handleData(const QJsonValue &data); |
117 |
++ void handleData(const QJsonValue &data) Q_DECL_OVERRIDE; |
118 |
+ |
119 |
+ private: |
120 |
+ class Private; |
121 |
+diff --git a/src/deletealbumjob.h b/src/deletealbumjob.h |
122 |
+index ef1f001..84fcfb5 100644 |
123 |
+--- a/src/deletealbumjob.h |
124 |
++++ b/src/deletealbumjob.h |
125 |
+@@ -33,7 +33,7 @@ public: |
126 |
+ DeleteAlbumJob(const QString &accessToken, int aid); |
127 |
+ |
128 |
+ protected: |
129 |
+- virtual void handleData(const QJsonValue &data); |
130 |
++ void handleData(const QJsonValue &data) Q_DECL_OVERRIDE; |
131 |
+ |
132 |
+ private: |
133 |
+ class Private; |
134 |
+diff --git a/src/discussionslistjob.h b/src/discussionslistjob.h |
135 |
+index 79e801a..63cd825 100644 |
136 |
+--- a/src/discussionslistjob.h |
137 |
++++ b/src/discussionslistjob.h |
138 |
+@@ -46,7 +46,7 @@ public: |
139 |
+ int totalCount() const; |
140 |
+ |
141 |
+ protected: |
142 |
+- virtual void handleData(const QVariant &data); |
143 |
++ void handleData(const QVariant &data) Q_DECL_OVERRIDE; |
144 |
+ |
145 |
+ void handleItem(const QVariant &data); |
146 |
+ |
147 |
+diff --git a/src/editalbumjob.h b/src/editalbumjob.h |
148 |
+index d9d76b6..eb52fe4 100644 |
149 |
+--- a/src/editalbumjob.h |
150 |
++++ b/src/editalbumjob.h |
151 |
+@@ -36,7 +36,7 @@ public: |
152 |
+ int comment_privacy = AlbumInfo::PRIVACY_UNKNOWN); |
153 |
+ |
154 |
+ protected: |
155 |
+- virtual void handleData(const QJsonValue &data); |
156 |
++ void handleData(const QJsonValue &data) Q_DECL_OVERRIDE; |
157 |
+ |
158 |
+ private: |
159 |
+ class Private; |
160 |
+diff --git a/src/friendlistjob.h b/src/friendlistjob.h |
161 |
+index 6a7de49..465a109 100644 |
162 |
+--- a/src/friendlistjob.h |
163 |
++++ b/src/friendlistjob.h |
164 |
+@@ -39,7 +39,7 @@ public: |
165 |
+ QList<UserInfoPtr> list() const; |
166 |
+ |
167 |
+ protected: |
168 |
+- virtual void handleData(const QVariant &data); |
169 |
++ void handleData(const QVariant &data) Q_DECL_OVERRIDE; |
170 |
+ |
171 |
+ private: |
172 |
+ class Private; |
173 |
+diff --git a/src/getapplicationpermissionsjob.h b/src/getapplicationpermissionsjob.h |
174 |
+index 72b6759..4165a1b 100644 |
175 |
+--- a/src/getapplicationpermissionsjob.h |
176 |
++++ b/src/getapplicationpermissionsjob.h |
177 |
+@@ -35,7 +35,7 @@ public: |
178 |
+ int permissions() const; |
179 |
+ |
180 |
+ protected: |
181 |
+- virtual void handleData(const QJsonValue &data); |
182 |
++ void handleData(const QJsonValue &data) Q_DECL_OVERRIDE; |
183 |
+ |
184 |
+ private: |
185 |
+ class Private; |
186 |
+diff --git a/src/getinfojob.h b/src/getinfojob.h |
187 |
+index 98df0db..19b8f31 100644 |
188 |
+--- a/src/getinfojob.h |
189 |
++++ b/src/getinfojob.h |
190 |
+@@ -38,7 +38,7 @@ public: |
191 |
+ QVariantMap info(); |
192 |
+ |
193 |
+ protected: |
194 |
+- virtual void handleData(const QVariant &data); |
195 |
++ void handleData(const QVariant &data) Q_DECL_OVERRIDE; |
196 |
+ |
197 |
+ private: |
198 |
+ class Private; |
199 |
+diff --git a/src/getphotouploadserverjob.h b/src/getphotouploadserverjob.h |
200 |
+index af65921..3a3e9b0 100644 |
201 |
+--- a/src/getphotouploadserverjob.h |
202 |
++++ b/src/getphotouploadserverjob.h |
203 |
+@@ -41,8 +41,8 @@ public: |
204 |
+ |
205 |
+ protected: |
206 |
+ static QString getMethod(enum UploadPhotosJob::Dest dest); |
207 |
+- virtual void prepareQueryItems(); |
208 |
+- virtual void handleData(const QJsonValue &data); |
209 |
++ void prepareQueryItems() Q_DECL_OVERRIDE; |
210 |
++ void handleData(const QJsonValue &data) Q_DECL_OVERRIDE; |
211 |
+ |
212 |
+ private: |
213 |
+ UploadPhotosJob::Dest m_dest; |
214 |
+diff --git a/src/getvariablejob.h b/src/getvariablejob.h |
215 |
+index f80ceb7..5250c6e 100644 |
216 |
+--- a/src/getvariablejob.h |
217 |
++++ b/src/getvariablejob.h |
218 |
+@@ -41,7 +41,7 @@ public: |
219 |
+ QVariant variable() const; |
220 |
+ |
221 |
+ protected: |
222 |
+- virtual void handleData(const QVariant &data); |
223 |
++ void handleData(const QVariant &data) Q_DECL_OVERRIDE; |
224 |
+ |
225 |
+ private: |
226 |
+ class Private; |
227 |
+diff --git a/src/grouplistjob.h b/src/grouplistjob.h |
228 |
+index 29628f3..d41e1dc 100644 |
229 |
+--- a/src/grouplistjob.h |
230 |
++++ b/src/grouplistjob.h |
231 |
+@@ -42,7 +42,7 @@ public: |
232 |
+ |
233 |
+ protected: |
234 |
+ GroupInfoPtr handleSingleData(const QVariant &data); |
235 |
+- virtual void handleData(const QVariant &data); |
236 |
++ void handleData(const QVariant &data) Q_DECL_OVERRIDE; |
237 |
+ |
238 |
+ private: |
239 |
+ class Private; |
240 |
+diff --git a/src/messageslistjob.h b/src/messageslistjob.h |
241 |
+index 0f67360..091ef60 100644 |
242 |
+--- a/src/messageslistjob.h |
243 |
++++ b/src/messageslistjob.h |
244 |
+@@ -57,7 +57,7 @@ public: |
245 |
+ int out() const; |
246 |
+ |
247 |
+ protected: |
248 |
+- virtual void handleData(const QVariant &data); |
249 |
++ void handleData(const QVariant &data) Q_DECL_OVERRIDE; |
250 |
+ |
251 |
+ void handleItem(const QVariant &data); |
252 |
+ |
253 |
+diff --git a/src/noteaddjob.h b/src/noteaddjob.h |
254 |
+index 84cc63f..6c37efb 100644 |
255 |
+--- a/src/noteaddjob.h |
256 |
++++ b/src/noteaddjob.h |
257 |
+@@ -41,7 +41,7 @@ public: |
258 |
+ int nid() const; |
259 |
+ |
260 |
+ protected: |
261 |
+- virtual void handleData(const QVariant &data); |
262 |
++ void handleData(const QVariant &data) Q_DECL_OVERRIDE; |
263 |
+ |
264 |
+ private: |
265 |
+ class Private; |
266 |
+diff --git a/src/notejob.h b/src/notejob.h |
267 |
+index dfeefc2..340eaef 100644 |
268 |
+--- a/src/notejob.h |
269 |
++++ b/src/notejob.h |
270 |
+@@ -37,7 +37,7 @@ public: |
271 |
+ NoteInfoPtr noteInfo(); |
272 |
+ |
273 |
+ protected: |
274 |
+- virtual void handleData(const QVariant &data); |
275 |
++ void handleData(const QVariant &data) Q_DECL_OVERRIDE; |
276 |
+ |
277 |
+ private: |
278 |
+ class Private; |
279 |
+diff --git a/src/noteslistjob.h b/src/noteslistjob.h |
280 |
+index 3ea51a7..d36e0bf 100644 |
281 |
+--- a/src/noteslistjob.h |
282 |
++++ b/src/noteslistjob.h |
283 |
+@@ -49,7 +49,7 @@ protected: |
284 |
+ * @brief Handles the data returned by the VkontakteGetJob |
285 |
+ * @param data A JSON string containing the data. |
286 |
+ */ |
287 |
+- virtual void handleData(const QVariant &data); |
288 |
++ void handleData(const QVariant &data) Q_DECL_OVERRIDE; |
289 |
+ |
290 |
+ void handleItem(const QVariant &data); |
291 |
+ |
292 |
+diff --git a/src/photojob.h b/src/photojob.h |
293 |
+index b8af5b3..b230c29 100644 |
294 |
+--- a/src/photojob.h |
295 |
++++ b/src/photojob.h |
296 |
+@@ -35,7 +35,7 @@ public: |
297 |
+ PhotoJob(const QUrl &urlString); |
298 |
+ ~PhotoJob(); |
299 |
+ |
300 |
+- virtual void start(); |
301 |
++ void start() Q_DECL_OVERRIDE; |
302 |
+ QImage photo() const; |
303 |
+ |
304 |
+ private Q_SLOTS: |
305 |
+diff --git a/src/photolistjob.h b/src/photolistjob.h |
306 |
+index 4b38a12..a0c868f 100644 |
307 |
+--- a/src/photolistjob.h |
308 |
++++ b/src/photolistjob.h |
309 |
+@@ -42,7 +42,7 @@ protected: |
310 |
+ * @brief Handles the data returned by VkontakteJob |
311 |
+ * @param data JSON value containing an array of photos. |
312 |
+ */ |
313 |
+- virtual void handleData(const QJsonValue &data); |
314 |
++ void handleData(const QJsonValue &data) Q_DECL_OVERRIDE; |
315 |
+ |
316 |
+ private: |
317 |
+ class Private; |
318 |
+diff --git a/src/photopostjob.h b/src/photopostjob.h |
319 |
+index 712906d..1f7b2ec 100644 |
320 |
+--- a/src/photopostjob.h |
321 |
++++ b/src/photopostjob.h |
322 |
+@@ -43,7 +43,7 @@ public: |
323 |
+ // files.size <= 5 |
324 |
+ PhotoPostJob(Vkontakte::UploadPhotosJob::Dest dest, const QUrl &url, const QStringList &files); |
325 |
+ |
326 |
+- virtual void start(); |
327 |
++ void start() Q_DECL_OVERRIDE; |
328 |
+ QVariantMap response() const; |
329 |
+ |
330 |
+ protected: |
331 |
+diff --git a/src/savephotojob.h b/src/savephotojob.h |
332 |
+index af2a795..cd4ab85 100644 |
333 |
+--- a/src/savephotojob.h |
334 |
++++ b/src/savephotojob.h |
335 |
+@@ -46,7 +46,7 @@ public: |
336 |
+ protected: |
337 |
+ QString getMethod(Vkontakte::UploadPhotosJob::Dest dest); |
338 |
+ void handleItem(const QJsonValue &item); |
339 |
+- virtual void handleData(const QJsonValue &data); |
340 |
++ void handleData(const QJsonValue &data) Q_DECL_OVERRIDE; |
341 |
+ |
342 |
+ private: |
343 |
+ UploadPhotosJob::Dest m_dest; |
344 |
+diff --git a/src/uploadphotosjob.h b/src/uploadphotosjob.h |
345 |
+index 461f62a..d9290c4 100644 |
346 |
+--- a/src/uploadphotosjob.h |
347 |
++++ b/src/uploadphotosjob.h |
348 |
+@@ -43,7 +43,7 @@ public: |
349 |
+ const QStringList &files, bool saveBig, int aid, int gid = -1); |
350 |
+ ~UploadPhotosJob(); |
351 |
+ |
352 |
+- virtual void start(); |
353 |
++ void start() Q_DECL_OVERRIDE; |
354 |
+ |
355 |
+ QList<PhotoInfo> list() const; |
356 |
+ |
357 |
+diff --git a/src/userinfojob.h b/src/userinfojob.h |
358 |
+index 85e6b86..5090ab3 100644 |
359 |
+--- a/src/userinfojob.h |
360 |
++++ b/src/userinfojob.h |
361 |
+@@ -71,12 +71,12 @@ protected: |
362 |
+ * @brief Handles the data returned by the VkontakteGetJob |
363 |
+ * @param data A JSON string containing the data. |
364 |
+ */ |
365 |
+- virtual void handleData(const QJsonValue &data); |
366 |
++ void handleData(const QJsonValue &data) Q_DECL_OVERRIDE; |
367 |
+ |
368 |
+ /** |
369 |
+ * @brief Prepares m_queryItems by several addQueryItem calls |
370 |
+ **/ |
371 |
+- virtual void prepareQueryItems(); |
372 |
++ void prepareQueryItems() Q_DECL_OVERRIDE; |
373 |
+ |
374 |
+ private: |
375 |
+ class Private; |
376 |
+diff --git a/src/vkontaktejobs.h b/src/vkontaktejobs.h |
377 |
+index 9429da8..af04aa9 100644 |
378 |
+--- a/src/vkontaktejobs.h |
379 |
++++ b/src/vkontaktejobs.h |
380 |
+@@ -38,7 +38,7 @@ class LIBKVKONTAKTE_EXPORT KJobWithSubjob : public KJob |
381 |
+ { |
382 |
+ protected: |
383 |
+ /** Kill the currentjobs and its subjobs */ |
384 |
+- virtual bool doKill(); |
385 |
++ bool doKill() Q_DECL_OVERRIDE; |
386 |
+ |
387 |
+ QPointer<KJob> m_job; /** Pointer to the running job */ |
388 |
+ }; |
389 |
+@@ -47,7 +47,7 @@ class LIBKVKONTAKTE_EXPORT KJobWithSubjobs : public KJob |
390 |
+ { |
391 |
+ protected: |
392 |
+ /** Kill the currentjobs and its subjobs */ |
393 |
+- virtual bool doKill(); |
394 |
++ bool doKill() Q_DECL_OVERRIDE; |
395 |
+ |
396 |
+ QList<KJob *> m_jobs; /** Pointers to running jobs */ |
397 |
+ }; |
398 |
+@@ -68,7 +68,7 @@ public: |
399 |
+ * */ |
400 |
+ VkontakteJob(const QString &accessToken, const QString &method, bool httpPost = false); |
401 |
+ |
402 |
+- virtual void start(); |
403 |
++ void start() Q_DECL_OVERRIDE; |
404 |
+ |
405 |
+ enum JobErrorType { AuthenticationProblem = KJob::UserDefinedError + 42 }; |
406 |
+ |
407 |
+-- |
408 |
+cgit v1.1 |
409 |
|
410 |
diff --git a/net-libs/libkvkontakte/libkvkontakte-5.0.0-r1.ebuild b/net-libs/libkvkontakte/libkvkontakte-5.0.0-r1.ebuild |
411 |
new file mode 100644 |
412 |
index 00000000000..db21496fe47 |
413 |
--- /dev/null |
414 |
+++ b/net-libs/libkvkontakte/libkvkontakte-5.0.0-r1.ebuild |
415 |
@@ -0,0 +1,33 @@ |
416 |
+# Copyright 1999-2019 Gentoo Authors |
417 |
+# Distributed under the terms of the GNU General Public License v2 |
418 |
+ |
419 |
+EAPI=7 |
420 |
+ |
421 |
+KDE_TEST="true" |
422 |
+inherit kde5 |
423 |
+ |
424 |
+DESCRIPTION="Library for accessing the features of social networking site vkontakte.ru" |
425 |
+HOMEPAGE="https://www.digikam.org/" |
426 |
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz" |
427 |
+ |
428 |
+LICENSE="GPL-2+ || ( LGPL-2.1 LGPL-3 )" |
429 |
+KEYWORDS="~amd64 ~arm64 ~x86" |
430 |
+IUSE="" |
431 |
+ |
432 |
+DEPEND=" |
433 |
+ $(add_frameworks_dep kcoreaddons) |
434 |
+ $(add_frameworks_dep kdewebkit) |
435 |
+ $(add_frameworks_dep ki18n) |
436 |
+ $(add_frameworks_dep kio) |
437 |
+ $(add_frameworks_dep kwidgetsaddons) |
438 |
+ $(add_qt_dep qtgui) |
439 |
+ $(add_qt_dep qtnetwork) |
440 |
+ $(add_qt_dep qtwidgets) |
441 |
+ >=dev-qt/qtwebkit-5.212.0_pre20180120:5 |
442 |
+" |
443 |
+RDEPEND="${DEPEND}" |
444 |
+ |
445 |
+# accessing network |
446 |
+RESTRICT+=" test" |
447 |
+ |
448 |
+PATCHES=( "${FILESDIR}/${P}-fix-warnings.patch" ) |