1 |
commit: 0d851350c4ca5942bde00d8089a6353ca3f5a226 |
2 |
Author: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Oct 4 14:41:13 2015 +0000 |
4 |
Commit: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Oct 4 14:41:24 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d851350 |
7 |
|
8 |
kde-base/kleopatra: fix build |
9 |
|
10 |
Added patch to fix bug #561320 |
11 |
Thanks to Justin Lecher for reporting. |
12 |
|
13 |
Package-Manager: portage-2.2.22 |
14 |
|
15 |
.../kleopatra-4.14.10-newer-boost-buildfix.patch | 1803 ++++++++++++++++++++ |
16 |
kde-base/kleopatra/kleopatra-4.14.10.ebuild | 5 +- |
17 |
2 files changed, 1807 insertions(+), 1 deletion(-) |
18 |
|
19 |
diff --git a/kde-base/kleopatra/files/kleopatra-4.14.10-newer-boost-buildfix.patch b/kde-base/kleopatra/files/kleopatra-4.14.10-newer-boost-buildfix.patch |
20 |
new file mode 100644 |
21 |
index 0000000..ae4f7a7 |
22 |
--- /dev/null |
23 |
+++ b/kde-base/kleopatra/files/kleopatra-4.14.10-newer-boost-buildfix.patch |
24 |
@@ -0,0 +1,1803 @@ |
25 |
+From: Michael Pyne <mpyne@×××.org> |
26 |
+Date: Fri, 04 Sep 2015 01:59:01 +0000 |
27 |
+Subject: Build with recent Boost. |
28 |
+X-Git-Url: http://quickgit.kde.org/?p=kdepim.git&a=commitdiff&h=3c72e211dc4ee1420bf744312036dc2141238912 |
29 |
+--- |
30 |
+Build with recent Boost. |
31 |
+ |
32 |
+The issue is that recent versions of Boost have widespread usage of a |
33 |
+technique involving the generation of namespace names using a special |
34 |
+macro, BOOST_JOIN. This macro breaks moc with Qt 4, leading to |
35 |
+compilation failures unless Boost is downgraded. |
36 |
+ |
37 |
+moc is fixed for Qt 5 but the change is too invasive to backport. |
38 |
+Instead, we use the technique recommended by the Qt devs and tell moc to |
39 |
+avoid scanning Boost headers wherever we use them. Some headers already |
40 |
+had this fix applied; this patch completes the work. |
41 |
+ |
42 |
+See also QTBUG-22829. |
43 |
+ |
44 |
+REVIEW:124926 |
45 |
+--- |
46 |
+ |
47 |
+ |
48 |
+--- a/kleopatra/commands/certifycertificatecommand.cpp |
49 |
++++ b/kleopatra/commands/certifycertificatecommand.cpp |
50 |
+@@ -52,7 +52,9 @@ |
51 |
+ #include <KLocalizedString> |
52 |
+ #include <kdebug.h> |
53 |
+ |
54 |
++#ifndef Q_MOC_RUN |
55 |
+ #include <boost/bind.hpp> |
56 |
++#endif |
57 |
+ |
58 |
+ #include <cassert> |
59 |
+ |
60 |
+ |
61 |
+--- a/kleopatra/commands/deletecertificatescommand.cpp |
62 |
++++ b/kleopatra/commands/deletecertificatescommand.cpp |
63 |
+@@ -54,7 +54,9 @@ |
64 |
+ #include <QPointer> |
65 |
+ #include <QAbstractItemView> |
66 |
+ |
67 |
++#ifndef Q_MOC_RUN |
68 |
+ #include <boost/bind.hpp> |
69 |
++#endif |
70 |
+ |
71 |
+ #include <algorithm> |
72 |
+ #include <vector> |
73 |
+ |
74 |
+--- a/kleopatra/commands/exportcertificatecommand.cpp |
75 |
++++ b/kleopatra/commands/exportcertificatecommand.cpp |
76 |
+@@ -53,7 +53,9 @@ |
77 |
+ #include <QMap> |
78 |
+ #include <QPointer> |
79 |
+ |
80 |
++#ifndef Q_MOC_RUN |
81 |
+ #include <boost/bind.hpp> |
82 |
++#endif |
83 |
+ #include <algorithm> |
84 |
+ #include <vector> |
85 |
+ #include <cassert> |
86 |
+ |
87 |
+--- a/kleopatra/commands/importcertificatescommand.cpp |
88 |
++++ b/kleopatra/commands/importcertificatescommand.cpp |
89 |
+@@ -59,8 +59,10 @@ |
90 |
+ #include <QTreeView> |
91 |
+ #include <QTextDocument> // for Qt::escape |
92 |
+ |
93 |
++#ifndef Q_MOC_RUN |
94 |
+ #include <boost/bind.hpp> |
95 |
+ #include <boost/mem_fn.hpp> |
96 |
++#endif |
97 |
+ |
98 |
+ #include <memory> |
99 |
+ #include <algorithm> |
100 |
+ |
101 |
+--- a/kleopatra/commands/lookupcertificatescommand.cpp |
102 |
++++ b/kleopatra/commands/lookupcertificatescommand.cpp |
103 |
+@@ -59,8 +59,10 @@ |
104 |
+ |
105 |
+ #include <QRegExp> |
106 |
+ |
107 |
++#ifndef Q_MOC_RUN |
108 |
+ #include <boost/bind.hpp> |
109 |
+ #include <boost/shared_ptr.hpp> |
110 |
++#endif |
111 |
+ |
112 |
+ #include <vector> |
113 |
+ #include <map> |
114 |
+ |
115 |
+--- a/kleopatra/commands/reloadkeyscommand.cpp |
116 |
++++ b/kleopatra/commands/reloadkeyscommand.cpp |
117 |
+@@ -41,7 +41,9 @@ |
118 |
+ |
119 |
+ #include <gpgme++/keylistresult.h> |
120 |
+ |
121 |
++#ifndef Q_MOC_RUN |
122 |
+ #include <boost/bind.hpp> |
123 |
++#endif |
124 |
+ |
125 |
+ using namespace Kleo; |
126 |
+ using namespace boost; |
127 |
+ |
128 |
+--- a/kleopatra/commands/selftestcommand.cpp |
129 |
++++ b/kleopatra/commands/selftestcommand.cpp |
130 |
+@@ -57,8 +57,10 @@ |
131 |
+ #include <KSplashScreen> |
132 |
+ #include <KSharedConfig> |
133 |
+ |
134 |
++#ifndef Q_MOC_RUN |
135 |
+ #include <boost/shared_ptr.hpp> |
136 |
+ #include <boost/mem_fn.hpp> |
137 |
++#endif |
138 |
+ |
139 |
+ #include <vector> |
140 |
+ |
141 |
+ |
142 |
+--- a/kleopatra/conf/appearanceconfigwidget.cpp |
143 |
++++ b/kleopatra/conf/appearanceconfigwidget.cpp |
144 |
+@@ -62,8 +62,10 @@ |
145 |
+ #include <QColorDialog> |
146 |
+ #include <QFontDialog> |
147 |
+ |
148 |
++#ifndef Q_MOC_RUN |
149 |
+ #include <boost/range.hpp> |
150 |
+ #include <boost/bind.hpp> |
151 |
++#endif |
152 |
+ |
153 |
+ #include <algorithm> |
154 |
+ #include <cassert> |
155 |
+ |
156 |
+--- a/kleopatra/conf/cryptooperationsconfigwidget.cpp |
157 |
++++ b/kleopatra/conf/cryptooperationsconfigwidget.cpp |
158 |
+@@ -47,7 +47,9 @@ |
159 |
+ |
160 |
+ #include <QLayout> |
161 |
+ |
162 |
++#ifndef Q_MOC_RUN |
163 |
+ #include <boost/shared_ptr.hpp> |
164 |
++#endif |
165 |
+ |
166 |
+ using namespace Kleo; |
167 |
+ using namespace Kleo::Config; |
168 |
+ |
169 |
+--- a/kleopatra/crypto/certificateresolver.cpp |
170 |
++++ b/kleopatra/crypto/certificateresolver.cpp |
171 |
+@@ -45,7 +45,9 @@ |
172 |
+ #include <QHash> |
173 |
+ #include <QSet> |
174 |
+ |
175 |
++#ifndef Q_MOC_RUN |
176 |
+ #include <boost/bind.hpp> |
177 |
++#endif |
178 |
+ |
179 |
+ #include <algorithm> |
180 |
+ #include <iterator> |
181 |
+ |
182 |
+--- a/kleopatra/crypto/controller.h |
183 |
++++ b/kleopatra/crypto/controller.h |
184 |
+@@ -40,7 +40,9 @@ |
185 |
+ #include <utils/pimpl_ptr.h> |
186 |
+ #include <utils/types.h> |
187 |
+ |
188 |
++#ifndef Q_MOC_RUN |
189 |
+ #include <boost/shared_ptr.hpp> |
190 |
++#endif |
191 |
+ |
192 |
+ class QDialog; |
193 |
+ |
194 |
+ |
195 |
+--- a/kleopatra/crypto/createchecksumscontroller.cpp |
196 |
++++ b/kleopatra/crypto/createchecksumscontroller.cpp |
197 |
+@@ -62,8 +62,10 @@ |
198 |
+ #include <QDir> |
199 |
+ #include <QProcess> |
200 |
+ |
201 |
++#ifndef Q_MOC_RUN |
202 |
+ #include <boost/bind.hpp> |
203 |
+ #include <boost/function.hpp> |
204 |
++#endif |
205 |
+ |
206 |
+ #include <gpg-error.h> |
207 |
+ |
208 |
+ |
209 |
+--- a/kleopatra/crypto/createchecksumscontroller.h |
210 |
++++ b/kleopatra/crypto/createchecksumscontroller.h |
211 |
+@@ -40,7 +40,9 @@ |
212 |
+ #include <gpgme++/global.h> |
213 |
+ #include <kmime/kmime_header_parsing.h> |
214 |
+ |
215 |
++#ifndef Q_MOC_RUN |
216 |
+ #include <boost/shared_ptr.hpp> |
217 |
++#endif |
218 |
+ |
219 |
+ #include <vector> |
220 |
+ |
221 |
+ |
222 |
+--- a/kleopatra/crypto/decryptverifyemailcontroller.cpp |
223 |
++++ b/kleopatra/crypto/decryptverifyemailcontroller.cpp |
224 |
+@@ -58,7 +58,9 @@ |
225 |
+ #include <QPointer> |
226 |
+ #include <QTimer> |
227 |
+ |
228 |
++#ifndef Q_MOC_RUN |
229 |
+ #include <boost/shared_ptr.hpp> |
230 |
++#endif |
231 |
+ |
232 |
+ #include <memory> |
233 |
+ #include <vector> |
234 |
+ |
235 |
+--- a/kleopatra/crypto/decryptverifyemailcontroller.h |
236 |
++++ b/kleopatra/crypto/decryptverifyemailcontroller.h |
237 |
+@@ -41,7 +41,9 @@ |
238 |
+ |
239 |
+ #include <QMetaType> |
240 |
+ |
241 |
++#ifndef Q_MOC_RUN |
242 |
+ #include <boost/shared_ptr.hpp> |
243 |
++#endif |
244 |
+ |
245 |
+ #include <vector> |
246 |
+ |
247 |
+ |
248 |
+--- a/kleopatra/crypto/decryptverifyfilescontroller.cpp |
249 |
++++ b/kleopatra/crypto/decryptverifyfilescontroller.cpp |
250 |
+@@ -56,7 +56,9 @@ |
251 |
+ #include <QPointer> |
252 |
+ #include <QTimer> |
253 |
+ |
254 |
++#ifndef Q_MOC_RUN |
255 |
+ #include <boost/shared_ptr.hpp> |
256 |
++#endif |
257 |
+ |
258 |
+ #include <memory> |
259 |
+ #include <vector> |
260 |
+ |
261 |
+--- a/kleopatra/crypto/decryptverifytask.cpp |
262 |
++++ b/kleopatra/crypto/decryptverifytask.cpp |
263 |
+@@ -75,7 +75,9 @@ |
264 |
+ #include <QStringList> |
265 |
+ #include <QTextDocument> // Qt::escape |
266 |
+ |
267 |
++#ifndef Q_MOC_RUN |
268 |
+ #include <boost/bind.hpp> |
269 |
++#endif |
270 |
+ |
271 |
+ #include <algorithm> |
272 |
+ #include <cassert> |
273 |
+ |
274 |
+--- a/kleopatra/crypto/decryptverifytask.h |
275 |
++++ b/kleopatra/crypto/decryptverifytask.h |
276 |
+@@ -39,7 +39,9 @@ |
277 |
+ |
278 |
+ #include <gpgme++/verificationresult.h> |
279 |
+ |
280 |
++#ifndef Q_MOC_RUN |
281 |
+ #include <boost/shared_ptr.hpp> |
282 |
++#endif |
283 |
+ |
284 |
+ |
285 |
+ namespace KMime { |
286 |
+ |
287 |
+--- a/kleopatra/crypto/encryptemailcontroller.cpp |
288 |
++++ b/kleopatra/crypto/encryptemailcontroller.cpp |
289 |
+@@ -58,8 +58,10 @@ |
290 |
+ #include <QPointer> |
291 |
+ #include <QTimer> |
292 |
+ |
293 |
++#ifndef Q_MOC_RUN |
294 |
+ #include <boost/bind.hpp> |
295 |
+ #include <boost/shared_ptr.hpp> |
296 |
++#endif |
297 |
+ |
298 |
+ using namespace Kleo; |
299 |
+ using namespace Kleo::Crypto; |
300 |
+ |
301 |
+--- a/kleopatra/crypto/encryptemailtask.cpp |
302 |
++++ b/kleopatra/crypto/encryptemailtask.cpp |
303 |
+@@ -52,7 +52,9 @@ |
304 |
+ #include <QPointer> |
305 |
+ #include <QTextDocument> // for Qt::escape |
306 |
+ |
307 |
++#ifndef Q_MOC_RUN |
308 |
+ #include <boost/bind.hpp> |
309 |
++#endif |
310 |
+ |
311 |
+ using namespace Kleo; |
312 |
+ using namespace Kleo::Crypto; |
313 |
+ |
314 |
+--- a/kleopatra/crypto/encryptemailtask.h |
315 |
++++ b/kleopatra/crypto/encryptemailtask.h |
316 |
+@@ -39,7 +39,9 @@ |
317 |
+ |
318 |
+ #include <gpgme++/global.h> |
319 |
+ |
320 |
++#ifndef Q_MOC_RUN |
321 |
+ #include <boost/shared_ptr.hpp> |
322 |
++#endif |
323 |
+ |
324 |
+ #include <vector> |
325 |
+ |
326 |
+ |
327 |
+--- a/kleopatra/crypto/gui/decryptverifyfileswizard.cpp |
328 |
++++ b/kleopatra/crypto/gui/decryptverifyfileswizard.cpp |
329 |
+@@ -57,7 +57,9 @@ |
330 |
+ #include <QTimer> |
331 |
+ #include <QTreeView> |
332 |
+ |
333 |
++#ifndef Q_MOC_RUN |
334 |
+ #include <boost/bind.hpp> |
335 |
++#endif |
336 |
+ |
337 |
+ #include <vector> |
338 |
+ #include <cassert> |
339 |
+ |
340 |
+--- a/kleopatra/crypto/gui/decryptverifyfileswizard.h |
341 |
++++ b/kleopatra/crypto/gui/decryptverifyfileswizard.h |
342 |
+@@ -37,7 +37,9 @@ |
343 |
+ |
344 |
+ #include <utils/pimpl_ptr.h> |
345 |
+ |
346 |
++#ifndef Q_MOC_RUN |
347 |
+ #include <boost/shared_ptr.hpp> |
348 |
++#endif |
349 |
+ |
350 |
+ namespace Kleo { |
351 |
+ namespace Crypto { |
352 |
+ |
353 |
+--- a/kleopatra/crypto/gui/decryptverifyoperationwidget.cpp |
354 |
++++ b/kleopatra/crypto/gui/decryptverifyoperationwidget.cpp |
355 |
+@@ -45,7 +45,9 @@ |
356 |
+ #include <QStackedLayout> |
357 |
+ #include <QComboBox> |
358 |
+ |
359 |
++#ifndef Q_MOC_RUN |
360 |
+ #include <boost/shared_ptr.hpp> |
361 |
++#endif |
362 |
+ |
363 |
+ using namespace Kleo; |
364 |
+ using namespace Kleo::Crypto::Gui; |
365 |
+ |
366 |
+--- a/kleopatra/crypto/gui/newresultpage.cpp |
367 |
++++ b/kleopatra/crypto/gui/newresultpage.cpp |
368 |
+@@ -41,7 +41,9 @@ |
369 |
+ |
370 |
+ #include <kleo/stl_util.h> |
371 |
+ |
372 |
++#ifndef Q_MOC_RUN |
373 |
+ #include <boost/mem_fn.hpp> |
374 |
++#endif |
375 |
+ |
376 |
+ #include <KLocalizedString> |
377 |
+ |
378 |
+ |
379 |
+--- a/kleopatra/crypto/gui/newsignencryptfileswizard.cpp |
380 |
++++ b/kleopatra/crypto/gui/newsignencryptfileswizard.cpp |
381 |
+@@ -73,8 +73,10 @@ |
382 |
+ |
383 |
+ #include <gpgme++/key.h> |
384 |
+ |
385 |
++#ifndef Q_MOC_RUN |
386 |
+ #include <boost/shared_ptr.hpp> |
387 |
+ #include <boost/bind.hpp> |
388 |
++#endif |
389 |
+ |
390 |
+ using namespace GpgME; |
391 |
+ using namespace boost; |
392 |
+ |
393 |
+--- a/kleopatra/crypto/gui/resolverecipientspage.cpp |
394 |
++++ b/kleopatra/crypto/gui/resolverecipientspage.cpp |
395 |
+@@ -61,8 +61,10 @@ |
396 |
+ #include <QStringList> |
397 |
+ #include <QVBoxLayout> |
398 |
+ |
399 |
++#ifndef Q_MOC_RUN |
400 |
+ #include <boost/bind.hpp> |
401 |
+ #include <boost/shared_ptr.hpp> |
402 |
++#endif |
403 |
+ |
404 |
+ #include <cassert> |
405 |
+ |
406 |
+ |
407 |
+--- a/kleopatra/crypto/gui/resolverecipientspage.h |
408 |
++++ b/kleopatra/crypto/gui/resolverecipientspage.h |
409 |
+@@ -39,7 +39,9 @@ |
410 |
+ |
411 |
+ #include <gpgme++/global.h> |
412 |
+ |
413 |
++#ifndef Q_MOC_RUN |
414 |
+ #include <boost/shared_ptr.hpp> |
415 |
++#endif |
416 |
+ |
417 |
+ #include <vector> |
418 |
+ |
419 |
+ |
420 |
+--- a/kleopatra/crypto/gui/resultitemwidget.h |
421 |
++++ b/kleopatra/crypto/gui/resultitemwidget.h |
422 |
+@@ -39,7 +39,9 @@ |
423 |
+ |
424 |
+ #include <utils/pimpl_ptr.h> |
425 |
+ |
426 |
++#ifndef Q_MOC_RUN |
427 |
+ #include <boost/shared_ptr.hpp> |
428 |
++#endif |
429 |
+ |
430 |
+ class QString; |
431 |
+ |
432 |
+ |
433 |
+--- a/kleopatra/crypto/gui/resultlistwidget.cpp |
434 |
++++ b/kleopatra/crypto/gui/resultlistwidget.cpp |
435 |
+@@ -50,8 +50,10 @@ |
436 |
+ #include <QLabel> |
437 |
+ #include <QVBoxLayout> |
438 |
+ |
439 |
++#ifndef Q_MOC_RUN |
440 |
+ #include <boost/bind.hpp> |
441 |
+ #include <boost/mem_fn.hpp> |
442 |
++#endif |
443 |
+ |
444 |
+ #include <cassert> |
445 |
+ |
446 |
+ |
447 |
+--- a/kleopatra/crypto/gui/resultlistwidget.h |
448 |
++++ b/kleopatra/crypto/gui/resultlistwidget.h |
449 |
+@@ -39,7 +39,9 @@ |
450 |
+ |
451 |
+ #include <utils/pimpl_ptr.h> |
452 |
+ |
453 |
++#ifndef Q_MOC_RUN |
454 |
+ #include <boost/shared_ptr.hpp> |
455 |
++#endif |
456 |
+ |
457 |
+ class QString; |
458 |
+ |
459 |
+ |
460 |
+--- a/kleopatra/crypto/gui/resultpage.h |
461 |
++++ b/kleopatra/crypto/gui/resultpage.h |
462 |
+@@ -39,7 +39,9 @@ |
463 |
+ #include <utils/pimpl_ptr.h> |
464 |
+ |
465 |
+ |
466 |
++#ifndef Q_MOC_RUN |
467 |
+ #include <boost/shared_ptr.hpp> |
468 |
++#endif |
469 |
+ |
470 |
+ namespace Kleo { |
471 |
+ namespace Crypto { |
472 |
+ |
473 |
+--- a/kleopatra/crypto/gui/signencryptemailconflictdialog.cpp |
474 |
++++ b/kleopatra/crypto/gui/signencryptemailconflictdialog.cpp |
475 |
+@@ -68,8 +68,10 @@ |
476 |
+ #include <QStyle> |
477 |
+ #include <QPointer> |
478 |
+ |
479 |
++#ifndef Q_MOC_RUN |
480 |
+ #include <boost/shared_ptr.hpp> |
481 |
+ #include <boost/bind.hpp> |
482 |
++#endif |
483 |
+ |
484 |
+ #include <iterator> |
485 |
+ |
486 |
+ |
487 |
+--- a/kleopatra/crypto/gui/signencryptwizard.cpp |
488 |
++++ b/kleopatra/crypto/gui/signencryptwizard.cpp |
489 |
+@@ -55,7 +55,9 @@ |
490 |
+ #include <QFileInfo> |
491 |
+ #include <QTimer> |
492 |
+ |
493 |
++#ifndef Q_MOC_RUN |
494 |
+ #include <boost/bind.hpp> |
495 |
++#endif |
496 |
+ |
497 |
+ using namespace Kleo; |
498 |
+ using namespace Kleo::Crypto; |
499 |
+ |
500 |
+--- a/kleopatra/crypto/gui/signencryptwizard.h |
501 |
++++ b/kleopatra/crypto/gui/signencryptwizard.h |
502 |
+@@ -42,7 +42,9 @@ |
503 |
+ #include <gpgme++/global.h> |
504 |
+ #include <kmime/kmime_header_parsing.h> |
505 |
+ |
506 |
++#ifndef Q_MOC_RUN |
507 |
+ #include <boost/shared_ptr.hpp> |
508 |
++#endif |
509 |
+ |
510 |
+ #include <vector> |
511 |
+ |
512 |
+ |
513 |
+--- a/kleopatra/crypto/gui/signerresolvepage.h |
514 |
++++ b/kleopatra/crypto/gui/signerresolvepage.h |
515 |
+@@ -40,7 +40,9 @@ |
516 |
+ #include <gpgme++/global.h> |
517 |
+ #include <kmime/kmime_header_parsing.h> |
518 |
+ |
519 |
++#ifndef Q_MOC_RUN |
520 |
+ #include <boost/shared_ptr.hpp> |
521 |
++#endif |
522 |
+ |
523 |
+ #include <vector> |
524 |
+ |
525 |
+ |
526 |
+--- a/kleopatra/crypto/gui/signingcertificateselectionwidget.cpp |
527 |
++++ b/kleopatra/crypto/gui/signingcertificateselectionwidget.cpp |
528 |
+@@ -45,7 +45,9 @@ |
529 |
+ #include <QByteArray> |
530 |
+ #include <QMap> |
531 |
+ |
532 |
++#ifndef Q_MOC_RUN |
533 |
+ #include <boost/bind.hpp> |
534 |
++#endif |
535 |
+ |
536 |
+ #include <cassert> |
537 |
+ |
538 |
+ |
539 |
+--- a/kleopatra/crypto/gui/verifychecksumsdialog.cpp |
540 |
++++ b/kleopatra/crypto/gui/verifychecksumsdialog.cpp |
541 |
+@@ -53,7 +53,9 @@ |
542 |
+ #include <QPushButton> |
543 |
+ #include <QHeaderView> |
544 |
+ |
545 |
++#ifndef Q_MOC_RUN |
546 |
+ #include <boost/static_assert.hpp> |
547 |
++#endif |
548 |
+ |
549 |
+ #include <cassert> |
550 |
+ |
551 |
+ |
552 |
+--- a/kleopatra/crypto/newsignencryptemailcontroller.cpp |
553 |
++++ b/kleopatra/crypto/newsignencryptemailcontroller.cpp |
554 |
+@@ -63,8 +63,10 @@ |
555 |
+ #include <QPointer> |
556 |
+ #include <QTimer> |
557 |
+ |
558 |
++#ifndef Q_MOC_RUN |
559 |
+ #include <boost/bind.hpp> |
560 |
+ #include <boost/shared_ptr.hpp> |
561 |
++#endif |
562 |
+ |
563 |
+ using namespace Kleo; |
564 |
+ using namespace Kleo::Crypto; |
565 |
+ |
566 |
+--- a/kleopatra/crypto/recipient.h |
567 |
++++ b/kleopatra/crypto/recipient.h |
568 |
+@@ -35,7 +35,9 @@ |
569 |
+ |
570 |
+ #include <gpgme++/global.h> |
571 |
+ |
572 |
++#ifndef Q_MOC_RUN |
573 |
+ #include <boost/shared_ptr.hpp> |
574 |
++#endif |
575 |
+ |
576 |
+ #include <vector> |
577 |
+ |
578 |
+ |
579 |
+--- a/kleopatra/crypto/sender.h |
580 |
++++ b/kleopatra/crypto/sender.h |
581 |
+@@ -35,7 +35,9 @@ |
582 |
+ |
583 |
+ #include <gpgme++/global.h> |
584 |
+ |
585 |
++#ifndef Q_MOC_RUN |
586 |
+ #include <boost/shared_ptr.hpp> |
587 |
++#endif |
588 |
+ |
589 |
+ #include <vector> |
590 |
+ |
591 |
+ |
592 |
+--- a/kleopatra/crypto/signemailcontroller.cpp |
593 |
++++ b/kleopatra/crypto/signemailcontroller.cpp |
594 |
+@@ -55,8 +55,10 @@ |
595 |
+ #include <QPointer> |
596 |
+ #include <QTimer> |
597 |
+ |
598 |
++#ifndef Q_MOC_RUN |
599 |
+ #include <boost/bind.hpp> |
600 |
+ #include <boost/shared_ptr.hpp> |
601 |
++#endif |
602 |
+ |
603 |
+ using namespace Kleo; |
604 |
+ using namespace Kleo::Crypto; |
605 |
+ |
606 |
+--- a/kleopatra/crypto/signemailtask.cpp |
607 |
++++ b/kleopatra/crypto/signemailtask.cpp |
608 |
+@@ -52,8 +52,10 @@ |
609 |
+ #include <QPointer> |
610 |
+ #include <QTextDocument> // for Qt::escape |
611 |
+ |
612 |
++#ifndef Q_MOC_RUN |
613 |
+ #include <boost/bind.hpp> |
614 |
+ #include <boost/mem_fn.hpp> |
615 |
++#endif |
616 |
+ |
617 |
+ using namespace Kleo; |
618 |
+ using namespace Kleo::Crypto; |
619 |
+ |
620 |
+--- a/kleopatra/crypto/signemailtask.h |
621 |
++++ b/kleopatra/crypto/signemailtask.h |
622 |
+@@ -39,7 +39,9 @@ |
623 |
+ |
624 |
+ #include <gpgme++/global.h> |
625 |
+ |
626 |
++#ifndef Q_MOC_RUN |
627 |
+ #include <boost/shared_ptr.hpp> |
628 |
++#endif |
629 |
+ |
630 |
+ #include <vector> |
631 |
+ |
632 |
+ |
633 |
+--- a/kleopatra/crypto/signencryptfilescontroller.cpp |
634 |
++++ b/kleopatra/crypto/signencryptfilescontroller.cpp |
635 |
+@@ -58,7 +58,9 @@ |
636 |
+ #include <QTimer> |
637 |
+ #include <QFileInfo> |
638 |
+ |
639 |
++#ifndef Q_MOC_RUN |
640 |
+ #include <boost/bind.hpp> |
641 |
++#endif |
642 |
+ |
643 |
+ using namespace Kleo; |
644 |
+ using namespace Kleo::Crypto; |
645 |
+ |
646 |
+--- a/kleopatra/crypto/signencryptfilescontroller.h |
647 |
++++ b/kleopatra/crypto/signencryptfilescontroller.h |
648 |
+@@ -40,7 +40,9 @@ |
649 |
+ #include <gpgme++/global.h> |
650 |
+ #include <kmime/kmime_header_parsing.h> |
651 |
+ |
652 |
++#ifndef Q_MOC_RUN |
653 |
+ #include <boost/shared_ptr.hpp> |
654 |
++#endif |
655 |
+ |
656 |
+ #include <vector> |
657 |
+ |
658 |
+ |
659 |
+--- a/kleopatra/crypto/signencryptfilestask.cpp |
660 |
++++ b/kleopatra/crypto/signencryptfilestask.cpp |
661 |
+@@ -60,7 +60,9 @@ |
662 |
+ #include <QPointer> |
663 |
+ #include <QTextDocument> // for Qt::escape |
664 |
+ |
665 |
++#ifndef Q_MOC_RUN |
666 |
+ #include <boost/bind.hpp> |
667 |
++#endif |
668 |
+ |
669 |
+ using namespace Kleo; |
670 |
+ using namespace Kleo::Crypto; |
671 |
+ |
672 |
+--- a/kleopatra/crypto/task.cpp |
673 |
++++ b/kleopatra/crypto/task.cpp |
674 |
+@@ -50,7 +50,9 @@ |
675 |
+ |
676 |
+ #include <QString> |
677 |
+ |
678 |
++#ifndef Q_MOC_RUN |
679 |
+ #include <boost/bind.hpp> |
680 |
++#endif |
681 |
+ |
682 |
+ using namespace Kleo; |
683 |
+ using namespace Kleo::Crypto; |
684 |
+ |
685 |
+--- a/kleopatra/crypto/task.h |
686 |
++++ b/kleopatra/crypto/task.h |
687 |
+@@ -40,7 +40,9 @@ |
688 |
+ |
689 |
+ #include <gpgme++/global.h> |
690 |
+ |
691 |
++#ifndef Q_MOC_RUN |
692 |
+ #include <boost/shared_ptr.hpp> |
693 |
++#endif |
694 |
+ |
695 |
+ class QColor; |
696 |
+ class QIcon; |
697 |
+ |
698 |
+--- a/kleopatra/crypto/taskcollection.cpp |
699 |
++++ b/kleopatra/crypto/taskcollection.cpp |
700 |
+@@ -36,7 +36,9 @@ |
701 |
+ |
702 |
+ #include <crypto/task.h> |
703 |
+ |
704 |
++#ifndef Q_MOC_RUN |
705 |
+ #include <boost/bind.hpp> |
706 |
++#endif |
707 |
+ |
708 |
+ #include <algorithm> |
709 |
+ #include <map> |
710 |
+ |
711 |
+--- a/kleopatra/crypto/taskcollection.h |
712 |
++++ b/kleopatra/crypto/taskcollection.h |
713 |
+@@ -39,7 +39,9 @@ |
714 |
+ |
715 |
+ #include <utils/pimpl_ptr.h> |
716 |
+ |
717 |
++#ifndef Q_MOC_RUN |
718 |
+ #include <boost/shared_ptr.hpp> |
719 |
++#endif |
720 |
+ |
721 |
+ #include <vector> |
722 |
+ |
723 |
+ |
724 |
+--- a/kleopatra/crypto/verifychecksumscontroller.cpp |
725 |
++++ b/kleopatra/crypto/verifychecksumscontroller.cpp |
726 |
+@@ -57,8 +57,10 @@ |
727 |
+ #include <QDir> |
728 |
+ #include <QProcess> |
729 |
+ |
730 |
++#ifndef Q_MOC_RUN |
731 |
+ #include <boost/bind.hpp> |
732 |
+ #include <boost/function.hpp> |
733 |
++#endif |
734 |
+ |
735 |
+ #include <gpg-error.h> |
736 |
+ |
737 |
+ |
738 |
+--- a/kleopatra/crypto/verifychecksumscontroller.h |
739 |
++++ b/kleopatra/crypto/verifychecksumscontroller.h |
740 |
+@@ -42,7 +42,9 @@ |
741 |
+ #include <gpgme++/global.h> |
742 |
+ #include <kmime/kmime_header_parsing.h> |
743 |
+ |
744 |
++#ifndef Q_MOC_RUN |
745 |
+ #include <boost/shared_ptr.hpp> |
746 |
++#endif |
747 |
+ |
748 |
+ #include <vector> |
749 |
+ |
750 |
+ |
751 |
+--- a/kleopatra/dialogs/certificatedetailsdialog.cpp |
752 |
++++ b/kleopatra/dialogs/certificatedetailsdialog.cpp |
753 |
+@@ -66,7 +66,9 @@ |
754 |
+ #include <QPointer> |
755 |
+ #include <QHeaderView> |
756 |
+ |
757 |
++#ifndef Q_MOC_RUN |
758 |
+ #include <boost/mem_fn.hpp> |
759 |
++#endif |
760 |
+ |
761 |
+ #include <algorithm> |
762 |
+ #include <cassert> |
763 |
+ |
764 |
+--- a/kleopatra/dialogs/certificateselectiondialog.cpp |
765 |
++++ b/kleopatra/dialogs/certificateselectiondialog.cpp |
766 |
+@@ -59,7 +59,9 @@ |
767 |
+ #include <QPointer> |
768 |
+ #include <QVBoxLayout> |
769 |
+ |
770 |
++#ifndef Q_MOC_RUN |
771 |
+ #include <boost/bind.hpp> |
772 |
++#endif |
773 |
+ |
774 |
+ #include <algorithm> |
775 |
+ |
776 |
+ |
777 |
+--- a/kleopatra/dialogs/certifycertificatedialog.cpp |
778 |
++++ b/kleopatra/dialogs/certifycertificatedialog.cpp |
779 |
+@@ -54,7 +54,9 @@ |
780 |
+ |
781 |
+ #include <QTextDocument> // Qt::escape |
782 |
+ |
783 |
++#ifndef Q_MOC_RUN |
784 |
+ #include <boost/bind.hpp> |
785 |
++#endif |
786 |
+ |
787 |
+ #include <gpg-error.h> |
788 |
+ |
789 |
+ |
790 |
+--- a/kleopatra/dialogs/deletecertificatesdialog.cpp |
791 |
++++ b/kleopatra/dialogs/deletecertificatesdialog.cpp |
792 |
+@@ -56,7 +56,9 @@ |
793 |
+ |
794 |
+ #include <gpgme++/key.h> |
795 |
+ |
796 |
++#ifndef Q_MOC_RUN |
797 |
+ #include <boost/mem_fn.hpp> |
798 |
++#endif |
799 |
+ |
800 |
+ #include <cassert> |
801 |
+ |
802 |
+ |
803 |
+--- a/kleopatra/dialogs/lookupcertificatesdialog.cpp |
804 |
++++ b/kleopatra/dialogs/lookupcertificatesdialog.cpp |
805 |
+@@ -50,7 +50,9 @@ |
806 |
+ #include <QPushButton> |
807 |
+ #include <QHeaderView> |
808 |
+ |
809 |
++#ifndef Q_MOC_RUN |
810 |
+ #include <boost/bind.hpp> |
811 |
++#endif |
812 |
+ |
813 |
+ #include <cassert> |
814 |
+ |
815 |
+ |
816 |
+--- a/kleopatra/dialogs/selftestdialog.cpp |
817 |
++++ b/kleopatra/dialogs/selftestdialog.cpp |
818 |
+@@ -44,7 +44,9 @@ |
819 |
+ #include <QHeaderView> |
820 |
+ #include <QSortFilterProxyModel> |
821 |
+ |
822 |
++#ifndef Q_MOC_RUN |
823 |
+ #include <boost/shared_ptr.hpp> |
824 |
++#endif |
825 |
+ |
826 |
+ #include <cassert> |
827 |
+ #include <vector> |
828 |
+ |
829 |
+--- a/kleopatra/dialogs/setinitialpindialog.cpp |
830 |
++++ b/kleopatra/dialogs/setinitialpindialog.cpp |
831 |
+@@ -43,7 +43,9 @@ |
832 |
+ |
833 |
+ #include <gpgme++/error.h> |
834 |
+ |
835 |
++#ifndef Q_MOC_RUN |
836 |
+ #include <boost/static_assert.hpp> |
837 |
++#endif |
838 |
+ |
839 |
+ #include <cassert> |
840 |
+ |
841 |
+ |
842 |
+--- a/kleopatra/kleopatraapplication.cpp |
843 |
++++ b/kleopatra/kleopatraapplication.cpp |
844 |
+@@ -69,10 +69,12 @@ |
845 |
+ #include <QDir> |
846 |
+ #include <QPointer> |
847 |
+ |
848 |
++#ifndef Q_MOC_RUN |
849 |
+ #include <boost/shared_ptr.hpp> |
850 |
+ #include <boost/range.hpp> |
851 |
+ #include <boost/bind.hpp> |
852 |
+ #include <boost/mem_fn.hpp> |
853 |
++#endif |
854 |
+ |
855 |
+ #include <memory> |
856 |
+ |
857 |
+ |
858 |
+--- a/kleopatra/libkleopatraclient/core/command.cpp |
859 |
++++ b/kleopatra/libkleopatraclient/core/command.cpp |
860 |
+@@ -44,8 +44,10 @@ |
861 |
+ #include <assuan.h> |
862 |
+ #include <gpg-error.h> |
863 |
+ |
864 |
++#ifndef Q_MOC_RUN |
865 |
+ #include <boost/shared_ptr.hpp> |
866 |
+ #include <boost/type_traits/remove_pointer.hpp> |
867 |
++#endif |
868 |
+ |
869 |
+ #include <algorithm> |
870 |
+ #include <string> |
871 |
+ |
872 |
+--- a/kleopatra/main.cpp |
873 |
++++ b/kleopatra/main.cpp |
874 |
+@@ -89,7 +89,9 @@ |
875 |
+ #include <gpgme++/global.h> |
876 |
+ #include <gpgme++/error.h> |
877 |
+ |
878 |
++#ifndef Q_MOC_RUN |
879 |
+ #include <boost/shared_ptr.hpp> |
880 |
++#endif |
881 |
+ |
882 |
+ #include <cassert> |
883 |
+ |
884 |
+ |
885 |
+--- a/kleopatra/mainwindow_desktop.cpp |
886 |
++++ b/kleopatra/mainwindow_desktop.cpp |
887 |
+@@ -89,8 +89,10 @@ |
888 |
+ #include <kleo/cryptoconfig.h> |
889 |
+ #include <kleo/stl_util.h> |
890 |
+ |
891 |
++#ifndef Q_MOC_RUN |
892 |
+ #include <boost/bind.hpp> |
893 |
+ #include <boost/shared_ptr.hpp> |
894 |
++#endif |
895 |
+ |
896 |
+ #include <vector> |
897 |
+ |
898 |
+ |
899 |
+--- a/kleopatra/mainwindow_mobile.cpp |
900 |
++++ b/kleopatra/mainwindow_mobile.cpp |
901 |
+@@ -93,8 +93,10 @@ |
902 |
+ #include <ui/cryptoconfigdialog.h> |
903 |
+ #include <kleo/cryptoconfig.h> |
904 |
+ |
905 |
++#ifndef Q_MOC_RUN |
906 |
+ #include <boost/bind.hpp> |
907 |
+ #include <boost/shared_ptr.hpp> |
908 |
++#endif |
909 |
+ |
910 |
+ #include <vector> |
911 |
+ |
912 |
+ |
913 |
+--- a/kleopatra/models/keycache.cpp |
914 |
++++ b/kleopatra/models/keycache.cpp |
915 |
+@@ -63,11 +63,13 @@ |
916 |
+ #include <QPointer> |
917 |
+ #include <QTimer> |
918 |
+ |
919 |
++#ifndef Q_MOC_RUN |
920 |
+ #include <boost/bind.hpp> |
921 |
+ #include <boost/mem_fn.hpp> |
922 |
+ #include <boost/range.hpp> |
923 |
+ #include <boost/weak_ptr.hpp> |
924 |
+ #include <boost/iterator/filter_iterator.hpp> |
925 |
++#endif |
926 |
+ |
927 |
+ #include <utility> |
928 |
+ #include <algorithm> |
929 |
+ |
930 |
+--- a/kleopatra/models/keycache.h |
931 |
++++ b/kleopatra/models/keycache.h |
932 |
+@@ -39,7 +39,9 @@ |
933 |
+ |
934 |
+ #include <gpgme++/global.h> |
935 |
+ |
936 |
++#ifndef Q_MOC_RUN |
937 |
+ #include <boost/shared_ptr.hpp> |
938 |
++#endif |
939 |
+ |
940 |
+ #include <string> |
941 |
+ #include <vector> |
942 |
+ |
943 |
+--- a/kleopatra/models/keylistsortfilterproxymodel.cpp |
944 |
++++ b/kleopatra/models/keylistsortfilterproxymodel.cpp |
945 |
+@@ -42,7 +42,9 @@ |
946 |
+ |
947 |
+ #include <kleo/stl_util.h> |
948 |
+ |
949 |
++#ifndef Q_MOC_RUN |
950 |
+ #include <boost/bind.hpp> |
951 |
++#endif |
952 |
+ |
953 |
+ #include <cassert> |
954 |
+ |
955 |
+ |
956 |
+--- a/kleopatra/models/keylistsortfilterproxymodel.h |
957 |
++++ b/kleopatra/models/keylistsortfilterproxymodel.h |
958 |
+@@ -37,7 +37,9 @@ |
959 |
+ #include <models/keylistmodelinterface.h> |
960 |
+ |
961 |
+ #include <utils/pimpl_ptr.h> |
962 |
++#ifndef Q_MOC_RUN |
963 |
+ #include <boost/shared_ptr.hpp> |
964 |
++#endif |
965 |
+ |
966 |
+ namespace GpgME { |
967 |
+ class Key; |
968 |
+ |
969 |
+--- a/kleopatra/models/predicates.h |
970 |
++++ b/kleopatra/models/predicates.h |
971 |
+@@ -39,7 +39,9 @@ |
972 |
+ |
973 |
+ #include <gpgme++/key.h> |
974 |
+ |
975 |
++#ifndef Q_MOC_RUN |
976 |
+ #include <boost/bind.hpp> |
977 |
++#endif |
978 |
+ |
979 |
+ #include <cstring> |
980 |
+ #include <algorithm> |
981 |
+ |
982 |
+--- a/kleopatra/models/subkeylistmodel.cpp |
983 |
++++ b/kleopatra/models/subkeylistmodel.cpp |
984 |
+@@ -43,7 +43,9 @@ |
985 |
+ #include <QVariant> |
986 |
+ #include <QDate> |
987 |
+ |
988 |
++#ifndef Q_MOC_RUN |
989 |
+ #include <boost/bind.hpp> |
990 |
++#endif |
991 |
+ |
992 |
+ #include <algorithm> |
993 |
+ #include <iterator> |
994 |
+ |
995 |
+--- a/kleopatra/models/useridlistmodel.cpp |
996 |
++++ b/kleopatra/models/useridlistmodel.cpp |
997 |
+@@ -43,7 +43,9 @@ |
998 |
+ #include <QVariant> |
999 |
+ #include <QDate> |
1000 |
+ |
1001 |
++#ifndef Q_MOC_RUN |
1002 |
+ #include <boost/bind.hpp> |
1003 |
++#endif |
1004 |
+ |
1005 |
+ #include <algorithm> |
1006 |
+ #include <iterator> |
1007 |
+ |
1008 |
+--- a/kleopatra/newcertificatewizard/newcertificatewizard.cpp |
1009 |
++++ b/kleopatra/newcertificatewizard/newcertificatewizard.cpp |
1010 |
+@@ -78,7 +78,9 @@ |
1011 |
+ #include <QUrl> |
1012 |
+ #include <QDesktopServices> |
1013 |
+ |
1014 |
++#ifndef Q_MOC_RUN |
1015 |
+ #include <boost/range.hpp> |
1016 |
++#endif |
1017 |
+ |
1018 |
+ #include <algorithm> |
1019 |
+ |
1020 |
+ |
1021 |
+--- a/kleopatra/selftest/enginecheck.cpp |
1022 |
++++ b/kleopatra/selftest/enginecheck.cpp |
1023 |
+@@ -48,8 +48,10 @@ |
1024 |
+ #include <QFile> |
1025 |
+ #include <QRegExp> |
1026 |
+ |
1027 |
++#ifndef Q_MOC_RUN |
1028 |
+ #include <boost/shared_ptr.hpp> |
1029 |
+ #include <boost/range.hpp> |
1030 |
++#endif |
1031 |
+ |
1032 |
+ #include <algorithm> |
1033 |
+ #include <cassert> |
1034 |
+ |
1035 |
+--- a/kleopatra/selftest/gpgagentcheck.cpp |
1036 |
++++ b/kleopatra/selftest/gpgagentcheck.cpp |
1037 |
+@@ -46,7 +46,9 @@ |
1038 |
+ |
1039 |
+ #include <KLocalizedString> |
1040 |
+ |
1041 |
++#ifndef Q_MOC_RUN |
1042 |
+ #include <boost/shared_ptr.hpp> |
1043 |
++#endif |
1044 |
+ |
1045 |
+ #include <cassert> |
1046 |
+ |
1047 |
+ |
1048 |
+--- a/kleopatra/selftest/gpgconfcheck.cpp |
1049 |
++++ b/kleopatra/selftest/gpgconfcheck.cpp |
1050 |
+@@ -45,7 +45,9 @@ |
1051 |
+ #include <QProcess> |
1052 |
+ #include <QDir> |
1053 |
+ |
1054 |
++#ifndef Q_MOC_RUN |
1055 |
+ #include <boost/shared_ptr.hpp> |
1056 |
++#endif |
1057 |
+ |
1058 |
+ #include <cassert> |
1059 |
+ |
1060 |
+ |
1061 |
+--- a/kleopatra/selftest/libkleopatrarccheck.cpp |
1062 |
++++ b/kleopatra/selftest/libkleopatrarccheck.cpp |
1063 |
+@@ -43,7 +43,9 @@ |
1064 |
+ #include <KLocalizedString> |
1065 |
+ |
1066 |
+ |
1067 |
++#ifndef Q_MOC_RUN |
1068 |
+ #include <boost/shared_ptr.hpp> |
1069 |
++#endif |
1070 |
+ |
1071 |
+ #include <cassert> |
1072 |
+ |
1073 |
+ |
1074 |
+--- a/kleopatra/selftest/registrycheck.cpp |
1075 |
++++ b/kleopatra/selftest/registrycheck.cpp |
1076 |
+@@ -41,7 +41,9 @@ |
1077 |
+ |
1078 |
+ #include <QSettings> |
1079 |
+ |
1080 |
++#ifndef Q_MOC_RUN |
1081 |
+ #include <boost/shared_ptr.hpp> |
1082 |
++#endif |
1083 |
+ |
1084 |
+ #include <cassert> |
1085 |
+ |
1086 |
+ |
1087 |
+--- a/kleopatra/selftest/uiservercheck.cpp |
1088 |
++++ b/kleopatra/selftest/uiservercheck.cpp |
1089 |
+@@ -45,7 +45,9 @@ |
1090 |
+ |
1091 |
+ #include <KLocalizedString> |
1092 |
+ |
1093 |
++#ifndef Q_MOC_RUN |
1094 |
+ #include <boost/shared_ptr.hpp> |
1095 |
++#endif |
1096 |
+ |
1097 |
+ #include <cassert> |
1098 |
+ |
1099 |
+ |
1100 |
+--- a/kleopatra/smartcard/readerstatus.cpp |
1101 |
++++ b/kleopatra/smartcard/readerstatus.cpp |
1102 |
+@@ -58,12 +58,14 @@ |
1103 |
+ #include <QThread> |
1104 |
+ #include <QPointer> |
1105 |
+ |
1106 |
++#ifndef Q_MOC_RUN |
1107 |
+ #include <boost/algorithm/string/split.hpp> |
1108 |
+ #include <boost/algorithm/string/classification.hpp> |
1109 |
+ #include <boost/algorithm/string/case_conv.hpp> |
1110 |
+ #include <boost/static_assert.hpp> |
1111 |
+ #include <boost/range.hpp> |
1112 |
+ #include <boost/bind.hpp> |
1113 |
++#endif |
1114 |
+ |
1115 |
+ #include <vector> |
1116 |
+ #include <set> |
1117 |
+ |
1118 |
+--- a/kleopatra/systrayicon.cpp |
1119 |
++++ b/kleopatra/systrayicon.cpp |
1120 |
+@@ -64,8 +64,10 @@ |
1121 |
+ #include <QClipboard> |
1122 |
+ #include <QPointer> |
1123 |
+ |
1124 |
++#ifndef Q_MOC_RUN |
1125 |
+ #include <boost/shared_ptr.hpp> |
1126 |
+ #include <boost/bind.hpp> |
1127 |
++#endif |
1128 |
+ |
1129 |
+ #include <cassert> |
1130 |
+ |
1131 |
+ |
1132 |
+--- a/kleopatra/uiserver/assuancommand.h |
1133 |
++++ b/kleopatra/uiserver/assuancommand.h |
1134 |
+@@ -47,8 +47,10 @@ |
1135 |
+ |
1136 |
+ #include <qwindowdefs.h> // for WId |
1137 |
+ |
1138 |
++#ifndef Q_MOC_RUN |
1139 |
+ #include <boost/shared_ptr.hpp> |
1140 |
+ #include <boost/enable_shared_from_this.hpp> |
1141 |
++#endif |
1142 |
+ |
1143 |
+ #include <string> |
1144 |
+ #include <map> |
1145 |
+ |
1146 |
+--- a/kleopatra/uiserver/assuanserverconnection.h |
1147 |
++++ b/kleopatra/uiserver/assuanserverconnection.h |
1148 |
+@@ -39,7 +39,9 @@ |
1149 |
+ |
1150 |
+ #include <utils/pimpl_ptr.h> |
1151 |
+ |
1152 |
++#ifndef Q_MOC_RUN |
1153 |
+ #include <boost/shared_ptr.hpp> |
1154 |
++#endif |
1155 |
+ |
1156 |
+ #include <string> |
1157 |
+ #include <vector> |
1158 |
+ |
1159 |
+--- a/kleopatra/uiserver/selectcertificatecommand.cpp |
1160 |
++++ b/kleopatra/uiserver/selectcertificatecommand.cpp |
1161 |
+@@ -38,7 +38,9 @@ |
1162 |
+ |
1163 |
+ #include <models/keycache.h> |
1164 |
+ |
1165 |
++#ifndef Q_MOC_RUN |
1166 |
+ #include <boost/mem_fn.hpp> |
1167 |
++#endif |
1168 |
+ |
1169 |
+ #include <kleo/stl_util.h> |
1170 |
+ #include <kleo/exception.h> |
1171 |
+ |
1172 |
+--- a/kleopatra/uiserver/sessiondata.cpp |
1173 |
++++ b/kleopatra/uiserver/sessiondata.cpp |
1174 |
+@@ -38,7 +38,9 @@ |
1175 |
+ |
1176 |
+ #include <QMutex> |
1177 |
+ |
1178 |
++#ifndef Q_MOC_RUN |
1179 |
+ #include <boost/bind.hpp> |
1180 |
++#endif |
1181 |
+ |
1182 |
+ using namespace Kleo; |
1183 |
+ using namespace boost; |
1184 |
+ |
1185 |
+--- a/kleopatra/uiserver/sessiondata.h |
1186 |
++++ b/kleopatra/uiserver/sessiondata.h |
1187 |
+@@ -39,7 +39,9 @@ |
1188 |
+ |
1189 |
+ #include <QTimer> |
1190 |
+ |
1191 |
++#ifndef Q_MOC_RUN |
1192 |
+ #include <boost/shared_ptr.hpp> |
1193 |
++#endif |
1194 |
+ |
1195 |
+ #include <map> |
1196 |
+ |
1197 |
+ |
1198 |
+--- a/kleopatra/uiserver/uiserver.cpp |
1199 |
++++ b/kleopatra/uiserver/uiserver.cpp |
1200 |
+@@ -52,8 +52,10 @@ |
1201 |
+ #include <QTimer> |
1202 |
+ #include <QFile> |
1203 |
+ |
1204 |
++#ifndef Q_MOC_RUN |
1205 |
+ #include <boost/range/empty.hpp> |
1206 |
+ #include <boost/bind.hpp> |
1207 |
++#endif |
1208 |
+ |
1209 |
+ #include <algorithm> |
1210 |
+ #include <cassert> |
1211 |
+ |
1212 |
+--- a/kleopatra/uiserver/uiserver.h |
1213 |
++++ b/kleopatra/uiserver/uiserver.h |
1214 |
+@@ -37,7 +37,9 @@ |
1215 |
+ |
1216 |
+ #include <utils/pimpl_ptr.h> |
1217 |
+ |
1218 |
++#ifndef Q_MOC_RUN |
1219 |
+ #include <boost/shared_ptr.hpp> |
1220 |
++#endif |
1221 |
+ |
1222 |
+ #include <cstdio> |
1223 |
+ |
1224 |
+ |
1225 |
+--- a/kleopatra/uiserver/uiserver_p.h |
1226 |
++++ b/kleopatra/uiserver/uiserver_p.h |
1227 |
+@@ -44,7 +44,9 @@ |
1228 |
+ |
1229 |
+ #include <kleo-assuan.h> |
1230 |
+ |
1231 |
++#ifndef Q_MOC_RUN |
1232 |
+ #include <boost/bind.hpp> |
1233 |
++#endif |
1234 |
+ |
1235 |
+ #include <algorithm> |
1236 |
+ #include <vector> |
1237 |
+ |
1238 |
+--- a/kleopatra/utils/archivedefinition.cpp |
1239 |
++++ b/kleopatra/utils/archivedefinition.cpp |
1240 |
+@@ -55,7 +55,9 @@ |
1241 |
+ #include <QMutex> |
1242 |
+ #include <QCoreApplication> |
1243 |
+ |
1244 |
++#ifndef Q_MOC_RUN |
1245 |
+ #include <boost/shared_ptr.hpp> |
1246 |
++#endif |
1247 |
+ |
1248 |
+ using namespace GpgME; |
1249 |
+ using namespace Kleo; |
1250 |
+ |
1251 |
+--- a/kleopatra/utils/cached.h |
1252 |
++++ b/kleopatra/utils/cached.h |
1253 |
+@@ -33,7 +33,9 @@ |
1254 |
+ #ifndef __KLEOPATRA_UTILS_CACHED_H__ |
1255 |
+ #define __KLEOPATRA_UTILS_CACHED_H__ |
1256 |
+ |
1257 |
++#ifndef Q_MOC_RUN |
1258 |
+ #include <boost/call_traits.hpp> |
1259 |
++#endif |
1260 |
+ |
1261 |
+ namespace Kleo { |
1262 |
+ |
1263 |
+ |
1264 |
+--- a/kleopatra/utils/classify.cpp |
1265 |
++++ b/kleopatra/utils/classify.cpp |
1266 |
+@@ -43,7 +43,9 @@ |
1267 |
+ #include <QtAlgorithms> |
1268 |
+ #include <QByteArrayMatcher> |
1269 |
+ |
1270 |
++#ifndef Q_MOC_RUN |
1271 |
+ #include <boost/range.hpp> |
1272 |
++#endif |
1273 |
+ |
1274 |
+ #ifdef __GLIBCXX__ |
1275 |
+ # include <ext/algorithm> |
1276 |
+ |
1277 |
+--- a/kleopatra/utils/detail_p.h |
1278 |
++++ b/kleopatra/utils/detail_p.h |
1279 |
+@@ -35,7 +35,9 @@ |
1280 |
+ |
1281 |
+ #include <kleo-assuan.h> |
1282 |
+ |
1283 |
++#ifndef Q_MOC_RUN |
1284 |
+ #include <boost/shared_ptr.hpp> |
1285 |
++#endif |
1286 |
+ |
1287 |
+ #include <QByteArray> |
1288 |
+ |
1289 |
+ |
1290 |
+--- a/kleopatra/utils/filesystemwatcher.cpp |
1291 |
++++ b/kleopatra/utils/filesystemwatcher.cpp |
1292 |
+@@ -44,7 +44,9 @@ |
1293 |
+ |
1294 |
+ #include <kleo/stl_util.h> |
1295 |
+ |
1296 |
++#ifndef Q_MOC_RUN |
1297 |
+ #include <boost/bind.hpp> |
1298 |
++#endif |
1299 |
+ |
1300 |
+ #include <set> |
1301 |
+ #include <cassert> |
1302 |
+ |
1303 |
+--- a/kleopatra/utils/input.h |
1304 |
++++ b/kleopatra/utils/input.h |
1305 |
+@@ -35,7 +35,9 @@ |
1306 |
+ |
1307 |
+ #include <kleo-assuan.h> // for assuan_fd_t |
1308 |
+ |
1309 |
++#ifndef Q_MOC_RUN |
1310 |
+ #include <boost/shared_ptr.hpp> |
1311 |
++#endif |
1312 |
+ |
1313 |
+ class QIODevice; |
1314 |
+ class QString; |
1315 |
+ |
1316 |
+--- a/kleopatra/utils/iodevicelogger.h |
1317 |
++++ b/kleopatra/utils/iodevicelogger.h |
1318 |
+@@ -37,7 +37,9 @@ |
1319 |
+ |
1320 |
+ #include <utils/pimpl_ptr.h> |
1321 |
+ |
1322 |
++#ifndef Q_MOC_RUN |
1323 |
+ #include <boost/shared_ptr.hpp> |
1324 |
++#endif |
1325 |
+ |
1326 |
+ namespace Kleo { |
1327 |
+ |
1328 |
+ |
1329 |
+--- a/kleopatra/utils/kleo_assert.h |
1330 |
++++ b/kleopatra/utils/kleo_assert.h |
1331 |
+@@ -35,7 +35,9 @@ |
1332 |
+ |
1333 |
+ #include <kleo/exception.h> |
1334 |
+ |
1335 |
++#ifndef Q_MOC_RUN |
1336 |
+ #include <boost/preprocessor/stringize.hpp> |
1337 |
++#endif |
1338 |
+ |
1339 |
+ #include <assert.h> |
1340 |
+ |
1341 |
+ |
1342 |
+--- a/kleopatra/utils/log.cpp |
1343 |
++++ b/kleopatra/utils/log.cpp |
1344 |
+@@ -45,7 +45,9 @@ |
1345 |
+ #include <QFile> |
1346 |
+ #include <QString> |
1347 |
+ |
1348 |
++#ifndef Q_MOC_RUN |
1349 |
+ #include <boost/weak_ptr.hpp> |
1350 |
++#endif |
1351 |
+ #include <cassert> |
1352 |
+ #include <cstdio> |
1353 |
+ |
1354 |
+ |
1355 |
+--- a/kleopatra/utils/log.h |
1356 |
++++ b/kleopatra/utils/log.h |
1357 |
+@@ -36,7 +36,9 @@ |
1358 |
+ #include <utils/pimpl_ptr.h> |
1359 |
+ |
1360 |
+ |
1361 |
++#ifndef Q_MOC_RUN |
1362 |
+ #include <boost/shared_ptr.hpp> |
1363 |
++#endif |
1364 |
+ |
1365 |
+ #include <cstdio> |
1366 |
+ |
1367 |
+ |
1368 |
+--- a/kleopatra/utils/multivalidator.cpp |
1369 |
++++ b/kleopatra/utils/multivalidator.cpp |
1370 |
+@@ -36,8 +36,10 @@ |
1371 |
+ |
1372 |
+ #include <kleo/stl_util.h> |
1373 |
+ |
1374 |
++#ifndef Q_MOC_RUN |
1375 |
+ #include <boost/lambda/lambda.hpp> |
1376 |
+ #include <boost/lambda/bind.hpp> |
1377 |
++#endif |
1378 |
+ |
1379 |
+ #include <vector> |
1380 |
+ #include <iterator> |
1381 |
+ |
1382 |
+--- a/kleopatra/utils/output.h |
1383 |
++++ b/kleopatra/utils/output.h |
1384 |
+@@ -37,7 +37,9 @@ |
1385 |
+ |
1386 |
+ #include <utils/pimpl_ptr.h> |
1387 |
+ |
1388 |
++#ifndef Q_MOC_RUN |
1389 |
+ #include <boost/shared_ptr.hpp> |
1390 |
++#endif |
1391 |
+ |
1392 |
+ class QIODevice; |
1393 |
+ class QString; |
1394 |
+ |
1395 |
+--- a/kleopatra/utils/path-helper.cpp |
1396 |
++++ b/kleopatra/utils/path-helper.cpp |
1397 |
+@@ -46,7 +46,9 @@ |
1398 |
+ #include <QFileInfo> |
1399 |
+ #include <QDir> |
1400 |
+ |
1401 |
++#ifndef Q_MOC_RUN |
1402 |
+ #include <boost/bind.hpp> |
1403 |
++#endif |
1404 |
+ |
1405 |
+ #include <algorithm> |
1406 |
+ |
1407 |
+ |
1408 |
+--- a/kleopatra/utils/types.cpp |
1409 |
++++ b/kleopatra/utils/types.cpp |
1410 |
+@@ -38,8 +38,10 @@ |
1411 |
+ #include <QWidget> |
1412 |
+ #include <QVector> |
1413 |
+ |
1414 |
++#ifndef Q_MOC_RUN |
1415 |
+ #include <boost/shared_ptr.hpp> |
1416 |
+ #include <boost/weak_ptr.hpp> |
1417 |
++#endif |
1418 |
+ |
1419 |
+ #ifdef Q_OS_WIN |
1420 |
+ #include <windows.h> |
1421 |
+ |
1422 |
+--- a/kleopatra/view/keylistcontroller.cpp |
1423 |
++++ b/kleopatra/view/keylistcontroller.cpp |
1424 |
+@@ -83,7 +83,9 @@ |
1425 |
+ #include <QItemSelectionModel> |
1426 |
+ #include <QAction> |
1427 |
+ |
1428 |
++#ifndef Q_MOC_RUN |
1429 |
+ #include <boost/bind.hpp> |
1430 |
++#endif |
1431 |
+ |
1432 |
+ #include <algorithm> |
1433 |
+ #include <cassert> |
1434 |
+ |
1435 |
+--- a/kleopatra/view/keytreeview.h |
1436 |
++++ b/kleopatra/view/keytreeview.h |
1437 |
+@@ -39,7 +39,9 @@ |
1438 |
+ |
1439 |
+ #include <gpgme++/key.h> |
1440 |
+ |
1441 |
++#ifndef Q_MOC_RUN |
1442 |
+ #include <boost/shared_ptr.hpp> |
1443 |
++#endif |
1444 |
+ #include <vector> |
1445 |
+ |
1446 |
+ class QTreeView; |
1447 |
+ |
1448 |
+--- a/kleopatra/view/searchbar.h |
1449 |
++++ b/kleopatra/view/searchbar.h |
1450 |
+@@ -37,7 +37,9 @@ |
1451 |
+ |
1452 |
+ #include <utils/pimpl_ptr.h> |
1453 |
+ |
1454 |
++#ifndef Q_MOC_RUN |
1455 |
+ #include <boost/shared_ptr.hpp> |
1456 |
++#endif |
1457 |
+ |
1458 |
+ class KLineEdit; |
1459 |
+ |
1460 |
+ |
1461 |
+--- a/kleopatra/view/tabwidget.h |
1462 |
++++ b/kleopatra/view/tabwidget.h |
1463 |
+@@ -39,7 +39,9 @@ |
1464 |
+ |
1465 |
+ #include <utils/pimpl_ptr.h> |
1466 |
+ |
1467 |
++#ifndef Q_MOC_RUN |
1468 |
+ #include <boost/shared_ptr.hpp> |
1469 |
++#endif |
1470 |
+ |
1471 |
+ class QAbstractItemView; |
1472 |
+ |
1473 |
+ |
1474 |
+--- a/libkleo/backends/qgpgme/qgpgmedecryptjob.cpp |
1475 |
++++ b/libkleo/backends/qgpgme/qgpgmedecryptjob.cpp |
1476 |
+@@ -40,7 +40,9 @@ |
1477 |
+ |
1478 |
+ #include <QBuffer> |
1479 |
+ |
1480 |
++#ifndef Q_MOC_RUN |
1481 |
+ #include <boost/weak_ptr.hpp> |
1482 |
++#endif |
1483 |
+ |
1484 |
+ #include <cassert> |
1485 |
+ |
1486 |
+ |
1487 |
+--- a/libkleo/backends/qgpgme/qgpgmedecryptverifyjob.cpp |
1488 |
++++ b/libkleo/backends/qgpgme/qgpgmedecryptverifyjob.cpp |
1489 |
+@@ -43,7 +43,9 @@ |
1490 |
+ |
1491 |
+ #include <QBuffer> |
1492 |
+ |
1493 |
++#ifndef Q_MOC_RUN |
1494 |
+ #include <boost/weak_ptr.hpp> |
1495 |
++#endif |
1496 |
+ |
1497 |
+ #include <cassert> |
1498 |
+ |
1499 |
+ |
1500 |
+--- a/libkleo/backends/qgpgme/qgpgmedownloadjob.cpp |
1501 |
++++ b/libkleo/backends/qgpgme/qgpgmedownloadjob.cpp |
1502 |
+@@ -39,7 +39,9 @@ |
1503 |
+ |
1504 |
+ #include <QStringList> |
1505 |
+ |
1506 |
++#ifndef Q_MOC_RUN |
1507 |
+ #include <boost/weak_ptr.hpp> |
1508 |
++#endif |
1509 |
+ |
1510 |
+ #include <cassert> |
1511 |
+ |
1512 |
+ |
1513 |
+--- a/libkleo/backends/qgpgme/qgpgmeencryptjob.cpp |
1514 |
++++ b/libkleo/backends/qgpgme/qgpgmeencryptjob.cpp |
1515 |
+@@ -42,7 +42,9 @@ |
1516 |
+ |
1517 |
+ #include <QBuffer> |
1518 |
+ |
1519 |
++#ifndef Q_MOC_RUN |
1520 |
+ #include <boost/weak_ptr.hpp> |
1521 |
++#endif |
1522 |
+ |
1523 |
+ #include <cassert> |
1524 |
+ |
1525 |
+ |
1526 |
+--- a/libkleo/backends/qgpgme/qgpgmenewcryptoconfig.cpp |
1527 |
++++ b/libkleo/backends/qgpgme/qgpgmenewcryptoconfig.cpp |
1528 |
+@@ -41,9 +41,11 @@ |
1529 |
+ #include <gpgme++/global.h> |
1530 |
+ #include <gpgme++/error.h> |
1531 |
+ |
1532 |
++#ifndef Q_MOC_RUN |
1533 |
+ #include <boost/foreach.hpp> |
1534 |
+ #include <boost/bind.hpp> |
1535 |
+ #include <boost/mem_fn.hpp> |
1536 |
++#endif |
1537 |
+ |
1538 |
+ #include <sstream> |
1539 |
+ #include <string> |
1540 |
+ |
1541 |
+--- a/libkleo/backends/qgpgme/qgpgmenewcryptoconfig.h |
1542 |
++++ b/libkleo/backends/qgpgme/qgpgmenewcryptoconfig.h |
1543 |
+@@ -44,9 +44,11 @@ |
1544 |
+ |
1545 |
+ #include <gpgme++/configuration.h> |
1546 |
+ |
1547 |
++#ifndef Q_MOC_RUN |
1548 |
+ #include <boost/shared_ptr.hpp> |
1549 |
+ #include <boost/weak_ptr.hpp> |
1550 |
+ #include <boost/enable_shared_from_this.hpp> |
1551 |
++#endif |
1552 |
+ |
1553 |
+ #include <vector> |
1554 |
+ #include <utility> |
1555 |
+ |
1556 |
+--- a/libkleo/backends/qgpgme/qgpgmeprogresstokenmapper.cpp |
1557 |
++++ b/libkleo/backends/qgpgme/qgpgmeprogresstokenmapper.cpp |
1558 |
+@@ -37,7 +37,9 @@ |
1559 |
+ |
1560 |
+ #include <QString> |
1561 |
+ |
1562 |
++#ifndef Q_MOC_RUN |
1563 |
+ #include <boost/range.hpp> |
1564 |
++#endif |
1565 |
+ |
1566 |
+ #include <cassert> |
1567 |
+ |
1568 |
+ |
1569 |
+--- a/libkleo/backends/qgpgme/qgpgmesignencryptjob.cpp |
1570 |
++++ b/libkleo/backends/qgpgme/qgpgmesignencryptjob.cpp |
1571 |
+@@ -45,7 +45,9 @@ |
1572 |
+ |
1573 |
+ #include <QBuffer> |
1574 |
+ |
1575 |
++#ifndef Q_MOC_RUN |
1576 |
+ #include <boost/weak_ptr.hpp> |
1577 |
++#endif |
1578 |
+ |
1579 |
+ #include <cassert> |
1580 |
+ |
1581 |
+ |
1582 |
+--- a/libkleo/backends/qgpgme/qgpgmesignjob.cpp |
1583 |
++++ b/libkleo/backends/qgpgme/qgpgmesignjob.cpp |
1584 |
+@@ -42,7 +42,9 @@ |
1585 |
+ |
1586 |
+ #include <QBuffer> |
1587 |
+ |
1588 |
++#ifndef Q_MOC_RUN |
1589 |
+ #include <boost/weak_ptr.hpp> |
1590 |
++#endif |
1591 |
+ |
1592 |
+ #include <cassert> |
1593 |
+ |
1594 |
+ |
1595 |
+--- a/libkleo/backends/qgpgme/qgpgmeverifydetachedjob.cpp |
1596 |
++++ b/libkleo/backends/qgpgme/qgpgmeverifydetachedjob.cpp |
1597 |
+@@ -42,7 +42,9 @@ |
1598 |
+ |
1599 |
+ #include <cassert> |
1600 |
+ |
1601 |
++#ifndef Q_MOC_RUN |
1602 |
+ #include <boost/weak_ptr.hpp> |
1603 |
++#endif |
1604 |
+ |
1605 |
+ using namespace Kleo; |
1606 |
+ using namespace GpgME; |
1607 |
+ |
1608 |
+--- a/libkleo/backends/qgpgme/qgpgmeverifyopaquejob.cpp |
1609 |
++++ b/libkleo/backends/qgpgme/qgpgmeverifyopaquejob.cpp |
1610 |
+@@ -40,7 +40,9 @@ |
1611 |
+ |
1612 |
+ #include <QBuffer> |
1613 |
+ |
1614 |
++#ifndef Q_MOC_RUN |
1615 |
+ #include <boost/weak_ptr.hpp> |
1616 |
++#endif |
1617 |
+ |
1618 |
+ #include <cassert> |
1619 |
+ |
1620 |
+ |
1621 |
+--- a/libkleo/backends/qgpgme/threadedjobmixin.cpp |
1622 |
++++ b/libkleo/backends/qgpgme/threadedjobmixin.cpp |
1623 |
+@@ -40,7 +40,9 @@ |
1624 |
+ #include <QStringList> |
1625 |
+ #include <QByteArray> |
1626 |
+ |
1627 |
++#ifndef Q_MOC_RUN |
1628 |
+ #include <boost/mem_fn.hpp> |
1629 |
++#endif |
1630 |
+ |
1631 |
+ #include <algorithm> |
1632 |
+ #include <iterator> |
1633 |
+ |
1634 |
+--- a/libkleo/backends/qgpgme/threadedjobmixin.h |
1635 |
++++ b/libkleo/backends/qgpgme/threadedjobmixin.h |
1636 |
+@@ -44,6 +44,7 @@ |
1637 |
+ #include <gpgme++/context.h> |
1638 |
+ #include <gpgme++/interfaces/progressprovider.h> |
1639 |
+ |
1640 |
++#ifndef Q_MOC_RUN |
1641 |
+ #include <boost/shared_ptr.hpp> |
1642 |
+ #include <boost/weak_ptr.hpp> |
1643 |
+ #include <boost/bind.hpp> |
1644 |
+@@ -51,6 +52,7 @@ |
1645 |
+ #include <boost/tuple/tuple.hpp> |
1646 |
+ #include <boost/utility/enable_if.hpp> |
1647 |
+ #include <boost/type_traits/is_same.hpp> |
1648 |
++#endif |
1649 |
+ |
1650 |
+ #include <cassert> |
1651 |
+ |
1652 |
+ |
1653 |
+--- a/libkleo/kleo/checksumdefinition.cpp |
1654 |
++++ b/libkleo/kleo/checksumdefinition.cpp |
1655 |
+@@ -51,7 +51,9 @@ |
1656 |
+ #include <QMutex> |
1657 |
+ #include <QCoreApplication> |
1658 |
+ |
1659 |
++#ifndef Q_MOC_RUN |
1660 |
+ #include <boost/shared_ptr.hpp> |
1661 |
++#endif |
1662 |
+ |
1663 |
+ #ifdef stdin |
1664 |
+ # undef stdin // pah.. |
1665 |
+ |
1666 |
+--- a/libkleo/kleo/decryptjob.h |
1667 |
++++ b/libkleo/kleo/decryptjob.h |
1668 |
+@@ -35,7 +35,9 @@ |
1669 |
+ |
1670 |
+ #include "job.h" |
1671 |
+ |
1672 |
++#ifndef Q_MOC_RUN |
1673 |
+ #include <boost/shared_ptr.hpp> |
1674 |
++#endif |
1675 |
+ |
1676 |
+ class QByteArray; |
1677 |
+ class QIODevice; |
1678 |
+ |
1679 |
+--- a/libkleo/kleo/decryptverifyjob.h |
1680 |
++++ b/libkleo/kleo/decryptverifyjob.h |
1681 |
+@@ -35,7 +35,9 @@ |
1682 |
+ |
1683 |
+ #include "job.h" |
1684 |
+ |
1685 |
++#ifndef Q_MOC_RUN |
1686 |
+ #include <boost/shared_ptr.hpp> |
1687 |
++#endif |
1688 |
+ |
1689 |
+ class QByteArray; |
1690 |
+ class QIODevice; |
1691 |
+ |
1692 |
+--- a/libkleo/kleo/encryptjob.h |
1693 |
++++ b/libkleo/kleo/encryptjob.h |
1694 |
+@@ -35,7 +35,9 @@ |
1695 |
+ |
1696 |
+ #include "job.h" |
1697 |
+ |
1698 |
++#ifndef Q_MOC_RUN |
1699 |
+ #include <boost/shared_ptr.hpp> |
1700 |
++#endif |
1701 |
+ |
1702 |
+ #include <vector> |
1703 |
+ |
1704 |
+ |
1705 |
+--- a/libkleo/kleo/kconfigbasedkeyfilter.cpp |
1706 |
++++ b/libkleo/kleo/kconfigbasedkeyfilter.cpp |
1707 |
+@@ -37,7 +37,9 @@ |
1708 |
+ #include <kconfiggroup.h> |
1709 |
+ #include <klocale.h> |
1710 |
+ |
1711 |
++#ifndef Q_MOC_RUN |
1712 |
+ #include <boost/mem_fn.hpp> |
1713 |
++#endif |
1714 |
+ #include <algorithm> |
1715 |
+ |
1716 |
+ using namespace Kleo; |
1717 |
+ |
1718 |
+--- a/libkleo/kleo/keyfiltermanager.cpp |
1719 |
++++ b/libkleo/kleo/keyfiltermanager.cpp |
1720 |
+@@ -48,8 +48,10 @@ |
1721 |
+ #include <QAbstractListModel> |
1722 |
+ #include <QModelIndex> |
1723 |
+ |
1724 |
++#ifndef Q_MOC_RUN |
1725 |
+ #include <boost/bind.hpp> |
1726 |
+ #include <boost/iterator/filter_iterator.hpp> |
1727 |
++#endif |
1728 |
+ |
1729 |
+ #include <algorithm> |
1730 |
+ #include <vector> |
1731 |
+ |
1732 |
+--- a/libkleo/kleo/keyfiltermanager.h |
1733 |
++++ b/libkleo/kleo/keyfiltermanager.h |
1734 |
+@@ -36,7 +36,9 @@ |
1735 |
+ #include "kleo/kleo_export.h" |
1736 |
+ #include <QtCore/QObject> |
1737 |
+ |
1738 |
++#ifndef Q_MOC_RUN |
1739 |
+ #include <boost/shared_ptr.hpp> |
1740 |
++#endif |
1741 |
+ |
1742 |
+ #include <kleo/keyfilter.h> |
1743 |
+ |
1744 |
+ |
1745 |
+--- a/libkleo/kleo/signencryptjob.h |
1746 |
++++ b/libkleo/kleo/signencryptjob.h |
1747 |
+@@ -37,7 +37,9 @@ |
1748 |
+ |
1749 |
+ #include <gpgme++/global.h> |
1750 |
+ |
1751 |
++#ifndef Q_MOC_RUN |
1752 |
+ #include <boost/shared_ptr.hpp> |
1753 |
++#endif |
1754 |
+ |
1755 |
+ #include <vector> |
1756 |
+ #include <utility> |
1757 |
+ |
1758 |
+--- a/libkleo/kleo/signjob.h |
1759 |
++++ b/libkleo/kleo/signjob.h |
1760 |
+@@ -37,7 +37,9 @@ |
1761 |
+ |
1762 |
+ #include <gpgme++/global.h> |
1763 |
+ |
1764 |
++#ifndef Q_MOC_RUN |
1765 |
+ #include <boost/shared_ptr.hpp> |
1766 |
++#endif |
1767 |
+ |
1768 |
+ #include <vector> |
1769 |
+ |
1770 |
+ |
1771 |
+--- a/libkleo/kleo/stl_util.h |
1772 |
++++ b/libkleo/kleo/stl_util.h |
1773 |
+@@ -22,11 +22,13 @@ |
1774 |
+ #ifndef __KDTOOLSCORE_STL_UTIL_H__ |
1775 |
+ #define __KDTOOLSCORE_STL_UTIL_H__ |
1776 |
+ |
1777 |
++#ifndef Q_MOC_RUN |
1778 |
+ #include <boost/range.hpp> |
1779 |
+ #include <boost/iterator/filter_iterator.hpp> |
1780 |
+ #include <boost/iterator/transform_iterator.hpp> |
1781 |
+ #include <boost/call_traits.hpp> |
1782 |
+ #include <boost/version.hpp> |
1783 |
++#endif |
1784 |
+ |
1785 |
+ #include <algorithm> |
1786 |
+ #include <numeric> |
1787 |
+ |
1788 |
+--- a/libkleo/kleo/verifydetachedjob.h |
1789 |
++++ b/libkleo/kleo/verifydetachedjob.h |
1790 |
+@@ -35,7 +35,9 @@ |
1791 |
+ |
1792 |
+ #include "job.h" |
1793 |
+ |
1794 |
++#ifndef Q_MOC_RUN |
1795 |
+ #include <boost/shared_ptr.hpp> |
1796 |
++#endif |
1797 |
+ |
1798 |
+ class QByteArray; |
1799 |
+ class QIODevice; |
1800 |
+ |
1801 |
+--- a/libkleo/kleo/verifyopaquejob.h |
1802 |
++++ b/libkleo/kleo/verifyopaquejob.h |
1803 |
+@@ -35,7 +35,9 @@ |
1804 |
+ |
1805 |
+ #include "job.h" |
1806 |
+ |
1807 |
++#ifndef Q_MOC_RUN |
1808 |
+ #include <boost/shared_ptr.hpp> |
1809 |
++#endif |
1810 |
+ |
1811 |
+ class QByteArray; |
1812 |
+ class QIODevice; |
1813 |
+ |
1814 |
+--- a/libkleo/ui/directoryserviceswidget.cpp |
1815 |
++++ b/libkleo/ui/directoryserviceswidget.cpp |
1816 |
+@@ -45,7 +45,9 @@ |
1817 |
+ #include <QMenu> |
1818 |
+ #include <QAction> |
1819 |
+ |
1820 |
++#ifndef Q_MOC_RUN |
1821 |
+ #include <boost/bind.hpp> |
1822 |
++#endif |
1823 |
+ |
1824 |
+ #include <vector> |
1825 |
+ |
1826 |
+ |
1827 |
+ |
1828 |
|
1829 |
diff --git a/kde-base/kleopatra/kleopatra-4.14.10.ebuild b/kde-base/kleopatra/kleopatra-4.14.10.ebuild |
1830 |
index f741b20..fdf67ef 100644 |
1831 |
--- a/kde-base/kleopatra/kleopatra-4.14.10.ebuild |
1832 |
+++ b/kde-base/kleopatra/kleopatra-4.14.10.ebuild |
1833 |
@@ -30,7 +30,10 @@ KMEXTRACTONLY=" |
1834 |
libkleo/ |
1835 |
" |
1836 |
|
1837 |
-PATCHES=( "${FILESDIR}/${PN}-install-headers.patch" ) |
1838 |
+PATCHES=( |
1839 |
+ "${FILESDIR}/${PN}-install-headers.patch" |
1840 |
+ "${FILESDIR}/${P}-newer-boost-buildfix.patch" |
1841 |
+) |
1842 |
|
1843 |
src_unpack() { |
1844 |
if use handbook; then |