Hi Maxy! JFYI. Seems building KDEPIM with recent Boost is fixed upstream now.
Thanks, Martin ---------- Weitergeleitete Nachricht ---------- Betreff: [Kde-pim] Review Request 124926: Fix KDE 4 kdepim build with recent Boost Datum: Dienstag, 25. August 2015, 21:23:12 Von: Michael Pyne <mp...@kde.org> An: Michael Pyne <mp...@kde.org>, KDEPIM <kde-...@kde.org> ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/124926/ ----------------------------------------------------------- Review request for KDEPIM. Repository: kdepim Description ------- Recent Boost distributions use a "BOOST_JOIN" macro in their namespace declarations for what I'm sure is a good reason. But this wasn't supported by Qt's moc. This has been fixed in Qt 5 (see https://bugreports.qt.io/browse/QTBUG-22829) but can't be backported to Qt 4. So to get KDE 4-based kdepim to compile we need to wrap usages of Boost includes with a #define that moc will skip, as recommended by the Qt devs. I've found all kdepim *.h and *.cpp files that require this and have made the change. Is this OK to commit to KDE/4.14 so that we can continue to build KDE 4's kdepim? Diffs ----- agents/mailfilteragent/filtermanager.cpp 5a30871 akonadiconsole/akonadibrowsermodel.cpp 7bca6a1 akonadiconsole/notificationmodel.cpp d3caaa7 akonadiconsole/querydebugger.cpp c09deab akregator/interfaces/article.h 515804d akregator/src/abstractselectioncontroller.h 0657caa akregator/src/akregator_part.h f8a16aa akregator/src/articlejobs.h abca7d3 akregator/src/articlelistview.h f21d311 akregator/src/articlemodel.h 7e770f5 akregator/src/articleviewer.h 5bc4631 akregator/src/articleviewer.cpp 3a4986e akregator/src/deletesubscriptioncommand.h 8948452 akregator/src/editsubscriptioncommand.h 6b181ea akregator/src/expireitemscommand.h 2b3575d akregator/src/expireitemscommand.cpp 3b3711c akregator/src/feed.cpp e524a5a akregator/src/feedlist.h 6aa5055 akregator/src/importfeedlistcommand.h 4e3e9a1 akregator/src/importfeedlistcommand.cpp efd155b akregator/src/kernel.h 1836019 akregator/src/loadfeedlistcommand.h e9ee6e7 akregator/src/mainwidget.h e0df7f4 akregator/src/progressmanager.h c2a28f8 akregator/src/searchbar.h 7cae1c0 akregator/src/subscriptionlistjobs.h 3698ef4 akregator/src/subscriptionlistmodel.h 304f62a calendarsupport/utils.cpp cd97639 calendarviews/agenda/timelabels.h edf70de calendarviews/agenda/timelabelszone.h c886b58 calendarviews/agenda/timescaleconfigdialog.h e7e1f94 examples/etm_usage/mailmodel.cpp 22fc7f4 incidenceeditor-ng/tests/conflictresolvertest.cpp 93b9f46 kleopatra/commands/certifycertificatecommand.cpp 3b59fe6 kleopatra/commands/deletecertificatescommand.cpp ba3956a kleopatra/commands/exportcertificatecommand.cpp 330d8ac kleopatra/commands/importcertificatescommand.cpp 4c10995 kleopatra/commands/lookupcertificatescommand.cpp 83308d6 kleopatra/commands/reloadkeyscommand.cpp a405d16 kleopatra/commands/selftestcommand.cpp bd1e4df kleopatra/conf/appearanceconfigwidget.cpp 0b3012d kleopatra/conf/cryptooperationsconfigwidget.cpp c6132c1 kleopatra/crypto/certificateresolver.cpp 5f7b4e1 kleopatra/crypto/controller.h 12fa73f kleopatra/crypto/createchecksumscontroller.h 77c2672 kleopatra/crypto/createchecksumscontroller.cpp a07f38f kleopatra/crypto/decryptverifyemailcontroller.h 747188c kleopatra/crypto/decryptverifyemailcontroller.cpp 1136665 kleopatra/crypto/decryptverifyfilescontroller.cpp f6cd0cb kleopatra/crypto/decryptverifytask.h 458e366 kleopatra/crypto/decryptverifytask.cpp a6e4ea1 kleopatra/crypto/encryptemailcontroller.cpp a4e6b75 kleopatra/crypto/encryptemailtask.h d626e0e kleopatra/crypto/encryptemailtask.cpp 3db2b1a kleopatra/crypto/gui/decryptverifyfileswizard.h 9daa48c kleopatra/crypto/gui/decryptverifyfileswizard.cpp c0a7d7d kleopatra/crypto/gui/decryptverifyoperationwidget.cpp f70566c kleopatra/crypto/gui/newresultpage.cpp 53993d1 kleopatra/crypto/gui/newsignencryptfileswizard.cpp 1d11551 kleopatra/crypto/gui/resolverecipientspage.h eb6f6dd kleopatra/crypto/gui/resolverecipientspage.cpp 582a80e kleopatra/crypto/gui/resultitemwidget.h bf5c107 kleopatra/crypto/gui/resultlistwidget.h 839d2f0 kleopatra/crypto/gui/resultlistwidget.cpp b4fbe9d kleopatra/crypto/gui/resultpage.h 0bf3ba9 kleopatra/crypto/gui/signencryptemailconflictdialog.cpp a3d9b31 kleopatra/crypto/gui/signencryptwizard.h d5475b3 kleopatra/crypto/gui/signencryptwizard.cpp 8840b54 kleopatra/crypto/gui/signerresolvepage.h a09b997 kleopatra/crypto/gui/signingcertificateselectionwidget.cpp d3ccd1c kleopatra/crypto/gui/verifychecksumsdialog.cpp 16d1885 kleopatra/crypto/newsignencryptemailcontroller.cpp 9e91f7d kleopatra/crypto/recipient.h b2cd32b kleopatra/crypto/sender.h c6b67e2 kleopatra/crypto/signemailcontroller.cpp f4b2f4c kleopatra/crypto/signemailtask.h 12e2741 kleopatra/crypto/signemailtask.cpp 1292197 kleopatra/crypto/signencryptfilescontroller.h abc0c25 kleopatra/crypto/signencryptfilescontroller.cpp 302d39b kleopatra/crypto/signencryptfilestask.cpp abfa6e4 kleopatra/crypto/task.h ed4ce4b kleopatra/crypto/task.cpp 9822623 kleopatra/crypto/taskcollection.h 9d901c9 kleopatra/crypto/taskcollection.cpp 067367b kleopatra/crypto/verifychecksumscontroller.h 5e069c8 kleopatra/crypto/verifychecksumscontroller.cpp e85ea3d kleopatra/dialogs/certificatedetailsdialog.cpp bc5ffcb kleopatra/dialogs/certificateselectiondialog.cpp 8caa459 kleopatra/dialogs/certifycertificatedialog.cpp 2a44873 kleopatra/dialogs/deletecertificatesdialog.cpp b945692 kleopatra/dialogs/lookupcertificatesdialog.cpp fb3632a kleopatra/dialogs/selftestdialog.cpp f0000c0 kleopatra/dialogs/setinitialpindialog.cpp cac9c08 kleopatra/kleopatraapplication.cpp e8487ed kleopatra/libkleopatraclient/core/command.cpp c32de6d kleopatra/main.cpp 6f19561 kleopatra/mainwindow_desktop.cpp ccbf3d9 kleopatra/mainwindow_mobile.cpp 8709c15 kleopatra/models/keycache.h 14f7541 kleopatra/models/keycache.cpp f35600f kleopatra/models/keylistmodel.cpp 4c3e6ba kleopatra/models/keylistsortfilterproxymodel.h c75dc1b kleopatra/models/keylistsortfilterproxymodel.cpp 873d818 kleopatra/models/predicates.h cb555d2 kleopatra/models/subkeylistmodel.cpp c421d84 kleopatra/models/useridlistmodel.cpp cd2fe41 kleopatra/newcertificatewizard/newcertificatewizard.cpp d6283cd kleopatra/selftest/enginecheck.cpp 52e6934 kleopatra/selftest/gpgagentcheck.cpp fdbf63e kleopatra/selftest/gpgconfcheck.cpp 2cea8b1 kleopatra/selftest/libkleopatrarccheck.cpp 2b1b33e kleopatra/selftest/registrycheck.cpp 7af7ade kleopatra/selftest/uiservercheck.cpp b8827d9 kleopatra/smartcard/readerstatus.cpp 9b67890 kleopatra/systrayicon.cpp 2fe0661 kleopatra/uiserver/assuancommand.h 0dc2623 kleopatra/uiserver/assuanserverconnection.h 6ffc9ad kleopatra/uiserver/assuanserverconnection.cpp 24c7bef kleopatra/uiserver/selectcertificatecommand.cpp 693819f kleopatra/uiserver/sessiondata.h 4ad36be kleopatra/uiserver/sessiondata.cpp 5ba8b07 kleopatra/uiserver/uiserver.h 5d330fa kleopatra/uiserver/uiserver.cpp e2bf618 kleopatra/uiserver/uiserver_p.h e49ff68 kleopatra/utils/archivedefinition.cpp 1bf4ab8 kleopatra/utils/cached.h d2550bf kleopatra/utils/classify.cpp 0945db0 kleopatra/utils/detail_p.h e32e2dd kleopatra/utils/filesystemwatcher.cpp 3e29bf1 kleopatra/utils/input.h 0a4a930 kleopatra/utils/iodevicelogger.h 7feee2a kleopatra/utils/kleo_assert.h 27ae43d kleopatra/utils/log.h 24d7a13 kleopatra/utils/log.cpp e78b926 kleopatra/utils/multivalidator.cpp a13b158 kleopatra/utils/output.h bf07416 kleopatra/utils/path-helper.cpp 56b415e kleopatra/utils/types.cpp 476a210 kleopatra/view/keylistcontroller.cpp b8eeefe kleopatra/view/keytreeview.h 115a056 kleopatra/view/searchbar.h 7bd8d95 kleopatra/view/tabwidget.h 7897871 kmail/editor/attachment/attachmentview.cpp 0869f61 kmail/editor/composer.h f2683ec kmail/kmcommands.cpp 0063fae kmail/kmreadermainwin.h 0d66242 kmail/searchdialog/kmsearchmessagemodel.cpp fb93421 knode/knarticle.h 2ffc7c0 knode/kncollection.h b67042e knode/knserverinfo.h f374e61 libkleo/backends/qgpgme/qgpgmedecryptjob.cpp b265e2b libkleo/backends/qgpgme/qgpgmedecryptverifyjob.cpp 0c47f4e libkleo/backends/qgpgme/qgpgmedownloadjob.cpp 73ef585 libkleo/backends/qgpgme/qgpgmeencryptjob.cpp 2506e2b libkleo/backends/qgpgme/qgpgmenewcryptoconfig.h 04225c6 libkleo/backends/qgpgme/qgpgmenewcryptoconfig.cpp 3ca7d56 libkleo/backends/qgpgme/qgpgmeprogresstokenmapper.cpp 46d7317 libkleo/backends/qgpgme/qgpgmesignencryptjob.cpp f09bbae libkleo/backends/qgpgme/qgpgmesignjob.cpp d8c14b9 libkleo/backends/qgpgme/qgpgmeverifydetachedjob.cpp 20edeee libkleo/backends/qgpgme/qgpgmeverifyopaquejob.cpp 578e5e5 libkleo/backends/qgpgme/threadedjobmixin.h a1f85cc libkleo/backends/qgpgme/threadedjobmixin.cpp 70f5d5d libkleo/kleo/checksumdefinition.cpp b2434ec libkleo/kleo/decryptjob.h b037996 libkleo/kleo/decryptverifyjob.h 7db7f4e libkleo/kleo/encryptjob.h e9fefff libkleo/kleo/kconfigbasedkeyfilter.cpp fb03c2c libkleo/kleo/keyfiltermanager.h 66a6530 libkleo/kleo/keyfiltermanager.cpp f716d22 libkleo/kleo/signencryptjob.h aa095ba libkleo/kleo/signjob.h 79ee85f libkleo/kleo/stl_util.h cd83bff libkleo/kleo/verifydetachedjob.h 3c3508a libkleo/kleo/verifyopaquejob.h f690180 libkleo/ui/directoryserviceswidget.cpp 931f73f mailcommon/filter/mailfilter.cpp 3f39be3 mailcommon/filter/mdnadvicedialog.cpp 5ed7499 mailcommon/search/searchpattern.h d514e0c mailcommon/search/searchpattern.cpp 28c997b mailcommon/search/searchrule/searchrule.h 559801f mailcommon/search/searchrule/searchrule.cpp 9ace311 mailcommon/search/searchrule/searchrulestring.cpp 9221f47 mailimporter/filter_kmail_archive.cpp eb3a769 messagecomposer/attachment/attachmentmodel.cpp eccbf98 messagecomposer/job/attachmentfrompublickeyjob.cpp decaaad messagecomposer/job/attachmentjob.cpp 93c23b8 messagecomposer/part/infopart.h 045c2c5 messagecomposer/sender/akonadisender.cpp 59bd629 messagecomposer/tests/attachmentjobtest.cpp 8ebf700 messagecomposer/tests/composertest.cpp a9ae5db messagecomposer/tests/cryptocomposertest.cpp e37acde messagecore/attachment/attachmentcompressjob.cpp 5512f7a messagecore/attachment/attachmentfrommimecontentjob.cpp bb3b18e messagecore/attachment/attachmentfromurljob.cpp cadff41 messagecore/attachment/attachmentloadjob.cpp df10ff1 messagecore/attachment/attachmentpart.h 0b8b248 messagecore/attachment/attachmentpropertiesdialog.cpp af6b95c messagecore/helpers/messagehelpers.h f0df410 messagecore/misc/mailinglist.cpp 552e345 messagecore/tests/attachmentcompressjobtest.cpp 9510820 messagecore/tests/attachmentfrommimecontentjobtest.cpp 0bd3903 messagecore/tests/attachmentfromurljobtest.cpp ec7c866 messagecore/tests/attachmentparttest.cpp ba92059 messagecore/tests/attachmentpropertiesdialogtest.cpp f527e66 messageviewer/antispam/spamheaderanalyzer.cpp 2831bf9 messageviewer/viewer/mailwebview.h 5cf540c messageviewer/viewer/viewer_p.cpp 2be6007 mobile/lib/declarativewidgetbase.h b83b693 mobile/lib/kdeclarativefullscreenview.cpp b412026 pimprint/calendar/calprintbase.cpp 3d089d7 Diff: https://git.reviewboard.kde.org/r/124926/diff/ Testing ------- Everything builds and seems to work fine (I haven't been able to test much since Akonadi is broken for me again) Thanks, Michael Pyne _______________________________________________ KDE PIM mailing list kde-...@kde.org https://mail.kde.org/mailman/listinfo/kde-pim KDE PIM home page at http://pim.kde.org/ ------------------------------------------------------------- -- Martin