1 |
commit: 795b02e8a26392a42ea72519e7176a1148d8f59a |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Mar 3 21:47:01 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Mar 3 21:49:42 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=795b02e8 |
7 |
|
8 |
net-libs/libmediawiki: 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/libmediawiki-5.37.0-fix-warnings.patch | 192 +++++++++++++++++++++ |
14 |
...ch => libmediawiki-5.37.0-tests-optional.patch} | 0 |
15 |
...5.37.0.ebuild => libmediawiki-5.37.0-r1.ebuild} | 11 +- |
16 |
3 files changed, 198 insertions(+), 5 deletions(-) |
17 |
|
18 |
diff --git a/net-libs/libmediawiki/files/libmediawiki-5.37.0-fix-warnings.patch b/net-libs/libmediawiki/files/libmediawiki-5.37.0-fix-warnings.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..c57041dca7c |
21 |
--- /dev/null |
22 |
+++ b/net-libs/libmediawiki/files/libmediawiki-5.37.0-fix-warnings.patch |
23 |
@@ -0,0 +1,192 @@ |
24 |
+From 8c11aeabf34985421cd229240a6fad3db8023156 Mon Sep 17 00:00:00 2001 |
25 |
+From: Pino Toscano <pino@×××.org> |
26 |
+Date: Sat, 9 Sep 2017 15:33:24 +0200 |
27 |
+Subject: use Q_DECL_OVERRIDE |
28 |
+ |
29 |
+--- |
30 |
+ src/edit.h | 2 +- |
31 |
+ src/job.h | 2 +- |
32 |
+ src/login.h | 2 +- |
33 |
+ src/logout.h | 2 +- |
34 |
+ src/parse.h | 2 +- |
35 |
+ src/queryimageinfo.h | 2 +- |
36 |
+ src/queryimages.h | 2 +- |
37 |
+ src/queryinfo.h | 2 +- |
38 |
+ src/queryrevision.h | 2 +- |
39 |
+ src/querysiteinfogeneral.h | 2 +- |
40 |
+ src/querysiteinfousergroups.h | 2 +- |
41 |
+ src/upload.h | 2 +- |
42 |
+ tests/libmediawikitest/fakeserver.h | 2 +- |
43 |
+ 13 files changed, 13 insertions(+), 13 deletions(-) |
44 |
+ |
45 |
+diff --git a/src/edit.h b/src/edit.h |
46 |
+index 85bd590..a3944c8 100644 |
47 |
+--- a/src/edit.h |
48 |
++++ b/src/edit.h |
49 |
+@@ -178,7 +178,7 @@ public: |
50 |
+ /** |
51 |
+ * @brief Starts the job asynchronously. |
52 |
+ */ |
53 |
+- virtual void start(); |
54 |
++ void start() Q_DECL_OVERRIDE; |
55 |
+ |
56 |
+ /** |
57 |
+ * @brief Specify how the watchlist is affected by this edit. |
58 |
+diff --git a/src/job.h b/src/job.h |
59 |
+index 180822b..feda262 100644 |
60 |
+--- a/src/job.h |
61 |
++++ b/src/job.h |
62 |
+@@ -73,7 +73,7 @@ public: |
63 |
+ /** |
64 |
+ * @brief Aborts this job quietly. |
65 |
+ */ |
66 |
+- virtual bool doKill(); |
67 |
++ bool doKill() Q_DECL_OVERRIDE; |
68 |
+ |
69 |
+ protected: |
70 |
+ |
71 |
+diff --git a/src/login.h b/src/login.h |
72 |
+index 196710a..4ea71f1 100644 |
73 |
+--- a/src/login.h |
74 |
++++ b/src/login.h |
75 |
+@@ -130,7 +130,7 @@ public: |
76 |
+ /** |
77 |
+ * @brief Starts the job asynchronously. |
78 |
+ */ |
79 |
+- virtual void start(); |
80 |
++ void start() Q_DECL_OVERRIDE; |
81 |
+ |
82 |
+ private Q_SLOTS: |
83 |
+ |
84 |
+diff --git a/src/logout.h b/src/logout.h |
85 |
+index 03fb1f7..1b05323 100644 |
86 |
+--- a/src/logout.h |
87 |
++++ b/src/logout.h |
88 |
+@@ -65,7 +65,7 @@ public: |
89 |
+ /** |
90 |
+ * @brief Starts the job asynchronously. |
91 |
+ */ |
92 |
+- virtual void start(); |
93 |
++ void start() Q_DECL_OVERRIDE; |
94 |
+ |
95 |
+ private Q_SLOTS: |
96 |
+ |
97 |
+diff --git a/src/parse.h b/src/parse.h |
98 |
+index 5732f69..e72f59f 100644 |
99 |
+--- a/src/parse.h |
100 |
++++ b/src/parse.h |
101 |
+@@ -85,7 +85,7 @@ public: |
102 |
+ |
103 |
+ void setUseLang(const QString& param); |
104 |
+ |
105 |
+- virtual void start(); |
106 |
++ void start() Q_DECL_OVERRIDE; |
107 |
+ |
108 |
+ Q_SIGNALS: |
109 |
+ |
110 |
+diff --git a/src/queryimageinfo.h b/src/queryimageinfo.h |
111 |
+index f8c21a6..039c4a5 100644 |
112 |
+--- a/src/queryimageinfo.h |
113 |
++++ b/src/queryimageinfo.h |
114 |
+@@ -148,7 +148,7 @@ public: |
115 |
+ /** |
116 |
+ * @brief Starts the job asynchronously. |
117 |
+ */ |
118 |
+- virtual void start(); |
119 |
++ void start() Q_DECL_OVERRIDE; |
120 |
+ |
121 |
+ Q_SIGNALS: |
122 |
+ |
123 |
+diff --git a/src/queryimages.h b/src/queryimages.h |
124 |
+index 3211880..c8de5a0 100644 |
125 |
+--- a/src/queryimages.h |
126 |
++++ b/src/queryimages.h |
127 |
+@@ -103,7 +103,7 @@ public: |
128 |
+ /** |
129 |
+ * @brief Starts the job asynchronously. |
130 |
+ */ |
131 |
+- virtual void start(); |
132 |
++ void start() Q_DECL_OVERRIDE; |
133 |
+ |
134 |
+ Q_SIGNALS: |
135 |
+ |
136 |
+diff --git a/src/queryinfo.h b/src/queryinfo.h |
137 |
+index e2ff3e6..e23f50e 100644 |
138 |
+--- a/src/queryinfo.h |
139 |
++++ b/src/queryinfo.h |
140 |
+@@ -75,7 +75,7 @@ public: |
141 |
+ /** |
142 |
+ * @brief Starts the job asynchronously. |
143 |
+ */ |
144 |
+- virtual void start(); |
145 |
++ void start() Q_DECL_OVERRIDE; |
146 |
+ |
147 |
+ /** |
148 |
+ * @brief Set the page name. |
149 |
+diff --git a/src/queryrevision.h b/src/queryrevision.h |
150 |
+index b1decfb..190d026 100644 |
151 |
+--- a/src/queryrevision.h |
152 |
++++ b/src/queryrevision.h |
153 |
+@@ -150,7 +150,7 @@ public: |
154 |
+ /** |
155 |
+ * @brief Starts the job asynchronously. |
156 |
+ */ |
157 |
+- virtual void start(); |
158 |
++ void start() Q_DECL_OVERRIDE; |
159 |
+ |
160 |
+ /** |
161 |
+ * @brief Set the page id. |
162 |
+diff --git a/src/querysiteinfogeneral.h b/src/querysiteinfogeneral.h |
163 |
+index 516f7ed..1b31f15 100644 |
164 |
+--- a/src/querysiteinfogeneral.h |
165 |
++++ b/src/querysiteinfogeneral.h |
166 |
+@@ -81,7 +81,7 @@ public: |
167 |
+ /** |
168 |
+ * @brief Starts the job asynchronously. |
169 |
+ */ |
170 |
+- virtual void start(); |
171 |
++ void start() Q_DECL_OVERRIDE; |
172 |
+ |
173 |
+ Q_SIGNALS: |
174 |
+ |
175 |
+diff --git a/src/querysiteinfousergroups.h b/src/querysiteinfousergroups.h |
176 |
+index 74bc653..d6fb089 100644 |
177 |
+--- a/src/querysiteinfousergroups.h |
178 |
++++ b/src/querysiteinfousergroups.h |
179 |
+@@ -73,7 +73,7 @@ public: |
180 |
+ /** |
181 |
+ * @brief Starts the job asynchronously. |
182 |
+ */ |
183 |
+- virtual void start(); |
184 |
++ void start() Q_DECL_OVERRIDE; |
185 |
+ |
186 |
+ Q_SIGNALS: |
187 |
+ |
188 |
+diff --git a/src/upload.h b/src/upload.h |
189 |
+index 817eb5b..7f745f4 100644 |
190 |
+--- a/src/upload.h |
191 |
++++ b/src/upload.h |
192 |
+@@ -143,7 +143,7 @@ public: |
193 |
+ /** |
194 |
+ * @brief Starts the job asynchronously. |
195 |
+ */ |
196 |
+- virtual void start(); |
197 |
++ void start() Q_DECL_OVERRIDE; |
198 |
+ |
199 |
+ /** |
200 |
+ * @brief Set the target filename. |
201 |
+diff --git a/tests/libmediawikitest/fakeserver.h b/tests/libmediawikitest/fakeserver.h |
202 |
+index e847ac6..c6bb78c 100644 |
203 |
+--- a/tests/libmediawikitest/fakeserver.h |
204 |
++++ b/tests/libmediawikitest/fakeserver.h |
205 |
+@@ -61,7 +61,7 @@ public: |
206 |
+ ~FakeServer(); |
207 |
+ |
208 |
+ void startAndWait(); |
209 |
+- virtual void run(); |
210 |
++ void run() Q_DECL_OVERRIDE; |
211 |
+ |
212 |
+ void setScenario( const QString& scenario, const QString& cookie = QStringLiteral("empty")); |
213 |
+ void addScenario( const QString& scenario, const QString& cookie = QStringLiteral("empty")); |
214 |
+-- |
215 |
+cgit v1.1 |
216 |
|
217 |
diff --git a/net-libs/libmediawiki/files/libmediawiki-5.0.0_pre20170128-tests-optional.patch b/net-libs/libmediawiki/files/libmediawiki-5.37.0-tests-optional.patch |
218 |
similarity index 100% |
219 |
rename from net-libs/libmediawiki/files/libmediawiki-5.0.0_pre20170128-tests-optional.patch |
220 |
rename to net-libs/libmediawiki/files/libmediawiki-5.37.0-tests-optional.patch |
221 |
|
222 |
diff --git a/net-libs/libmediawiki/libmediawiki-5.37.0.ebuild b/net-libs/libmediawiki/libmediawiki-5.37.0-r1.ebuild |
223 |
similarity index 84% |
224 |
rename from net-libs/libmediawiki/libmediawiki-5.37.0.ebuild |
225 |
rename to net-libs/libmediawiki/libmediawiki-5.37.0-r1.ebuild |
226 |
index d1f6aed6c25..421ab0d9640 100644 |
227 |
--- a/net-libs/libmediawiki/libmediawiki-5.37.0.ebuild |
228 |
+++ b/net-libs/libmediawiki/libmediawiki-5.37.0-r1.ebuild |
229 |
@@ -1,7 +1,7 @@ |
230 |
# Copyright 1999-2019 Gentoo Authors |
231 |
# Distributed under the terms of the GNU General Public License v2 |
232 |
|
233 |
-EAPI=6 |
234 |
+EAPI=7 |
235 |
|
236 |
inherit kde5 |
237 |
|
238 |
@@ -17,11 +17,12 @@ DEPEND=" |
239 |
$(add_frameworks_dep kcoreaddons) |
240 |
$(add_qt_dep qtnetwork) |
241 |
" |
242 |
-RDEPEND="${DEPEND} |
243 |
- !net-libs/libmediawiki:4 |
244 |
-" |
245 |
+RDEPEND="${DEPEND}" |
246 |
|
247 |
-PATCHES=( "${FILESDIR}/${PN}-5.0.0_pre20170128-tests-optional.patch" ) |
248 |
+PATCHES=( |
249 |
+ "${FILESDIR}/${P}-tests-optional.patch" |
250 |
+ "${FILESDIR}/${P}-fix-warnings.patch" |
251 |
+) |
252 |
|
253 |
src_test() { |
254 |
# bug 646808, 662592 |