----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: http://git.reviewboard.kde.org/r/104021/ -----------------------------------------------------------
Review request for Calligra. Description ------- Attached patch is the first draft of the try to get parts of the work done by Mek for the Calligra@Android port ( http://blogs.kde.org/node/4521 ) into master. This is related to the discussion about making dbus optional in Calligra ( http://mail.kde.org/pipermail/calligra-devel/2012-February/003821.html ). What the first iteration of the patch does is to cherry-pick 4-5 of the patches related to dbus, kntofiy and phonon from the mobile-android-mek branch into my own mobile-android-sebsauer branch. Then I introduced 3 new compiletime options: DBUS, PHONON and KNOTIFY. I then changed the cherry-picked code to not hard-code against Android but use these 3 new compile-time switches to enable/disable the functionality. Note that this, compile-time switches, are already used in Calligra to enable/disable optionally QT3SUPPORT, GHNS and NEPOMUK. So, the 3 new options do not introduce something new but extend an already established and used concept in Calligra (means to be able to disable certain functionality/dependencies so packager are able to customize Calligra - useful when e.g. building Calligra for another platform like Android or Windows). What is still missing; 1) use CALLIGRA_NO_DBUS also in all the other parts of Calligra. The Android-port just did disable compiling certain Calligra parts/applications what means no patches where done for some parts/apps. I would need to add more code to handle also those other parts/apps. But since the patch is already rather large I think we can still do that in a second round. That makes it easier to merge patches from master back to Mek's branch :) 2) I am still not sure if it makes really sense to introduce own CALLIGRA_* variables for that or just reuse what Qt/KDE offer (e.g. QT_NO_DBUS). Maybe reusing the Qt/KDE defines would make it easier to understand the defines? Absolute not sure there :-/ So, ideas, wishes, ...? :) Diffs ----- CMakeLists.txt be6c889 filters/tables/excel/CMakeLists.txt fbab01c filters/tables/excel/sidewinder/CMakeLists.txt 6e232ab libs/main/CMakeLists.txt 30c0e8e libs/main/KoApplication.cpp c209224 libs/main/KoApplicationAdaptor.h c17a6fb libs/main/KoApplicationAdaptor.cpp aeb7ab5 libs/main/KoDocument.cpp c790f1e libs/main/KoDocumentAdaptor.h b8c1f26 libs/main/KoDocumentAdaptor.cpp 7e099d5 libs/main/KoMainWindow.cpp a9ab932 libs/main/KoView.cpp 679adb9 libs/main/KoViewAdaptor.h 9406b3d libs/main/KoViewAdaptor.cpp 6542c35 plan/libs/models/kcalendar/kdatepicker.cpp 8882f3f plan/libs/models/kcalendar/kdatetable.cpp 9c4e640 plugins/videoshape/FullScreenPlayer.cpp e88d39a plugins/videoshape/VideoShapeConfigWidget.cpp 4f5d22e stage/part/KPrPresentationTool.cpp 4cb0e17 stage/part/KPrPresentationToolAdaptor.h e0f8def stage/part/KPrPresentationToolAdaptor.cpp 1b29031 stage/part/KPrView.cpp 1606dfa stage/part/KPrViewAdaptor.h 081cf76 stage/part/KPrViewAdaptor.cpp 1fd9051 stage/plugins/eventactions/sound/KPrSoundEventAction.cpp 1fbb3f4 tables/CMakeLists.txt 31c74a4 tables/HeaderFooter.cpp 5e0bd48 tables/part/Doc.cpp 25e3fd3 tables/part/View.cpp e4097ed Diff: http://git.reviewboard.kde.org/r/104021/diff/ Testing ------- compiles Thanks, Sebastian Sauer
_______________________________________________ calligra-devel mailing list calligra-devel@kde.org https://mail.kde.org/mailman/listinfo/calligra-devel
