* [gentoo-commits] gentoo-x86 commit in kde-base/plasma-workspace/files: plasma-workspace-4.6.0-optional_akonadi-server.patch
@ 2011-02-04 13:28 Theo Chatzimichos (tampakrap)
0 siblings, 0 replies; 5+ messages in thread
From: Theo Chatzimichos (tampakrap) @ 2011-02-04 13:28 UTC (permalink / raw
To: gentoo-commits
tampakrap 11/02/04 13:28:35
Added:
plasma-workspace-4.6.0-optional_akonadi-server.patch
Log:
Make semantic-desktop optional again for plasma-workspace, patch by Fabiano <fabianoengler at gmail dot com>, bug 350850
(Portage version: 2.2.0_alpha19/cvs/Linux x86_64)
Revision Changes Path
1.1 kde-base/plasma-workspace/files/plasma-workspace-4.6.0-optional_akonadi-server.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/plasma-workspace/files/plasma-workspace-4.6.0-optional_akonadi-server.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/plasma-workspace/files/plasma-workspace-4.6.0-optional_akonadi-server.patch?rev=1.1&content-type=text/plain
Index: plasma-workspace-4.6.0-optional_akonadi-server.patch
===================================================================
diff -r -u plasma-workspace-4.6.0-orig/plasma/generic/dataengines/CMakeLists.txt plasma-workspace-4.6.0/plasma/generic/dataengines/CMakeLists.txt
--- plasma-workspace-4.6.0-orig/plasma/generic/dataengines/CMakeLists.txt 2011-02-03 18:58:47.884000165 -0500
+++ plasma-workspace-4.6.0/plasma/generic/dataengines/CMakeLists.txt 2011-02-03 19:24:21.511000165 -0500
@@ -28,8 +28,10 @@
macro_log_feature(KDEPIMLIBS_FOUND "kdepimlibs" "KDE PIM libraries" "http://www.kde.org" FALSE "" "Needed for building several plasma dataengines")
if(KDEPIMLIBS_FOUND)
- add_subdirectory(akonadi)
- add_subdirectory(calendar)
+ if(AKONADI_FOUND)
+ add_subdirectory(akonadi)
+ add_subdirectory(calendar)
+ endif(AKONADI_FOUND)
add_subdirectory(rss)
endif(KDEPIMLIBS_FOUND)
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in kde-base/plasma-workspace/files: plasma-workspace-4.6.0-optional_akonadi-server.patch
@ 2011-02-05 13:28 Theo Chatzimichos (tampakrap)
0 siblings, 0 replies; 5+ messages in thread
From: Theo Chatzimichos (tampakrap) @ 2011-02-05 13:28 UTC (permalink / raw
To: gentoo-commits
tampakrap 11/02/05 13:28:43
Modified:
plasma-workspace-4.6.0-optional_akonadi-server.patch
Log:
Properly fix bug 350850 in making akonadi optional
Should also fix bug 353730 and bug 353744
Patch taken from upstream commit 5d49ab8a005166563e925e0768857517fea9228e
(Portage version: 2.2.0_alpha19/cvs/Linux x86_64)
Revision Changes Path
1.2 kde-base/plasma-workspace/files/plasma-workspace-4.6.0-optional_akonadi-server.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/plasma-workspace/files/plasma-workspace-4.6.0-optional_akonadi-server.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/plasma-workspace/files/plasma-workspace-4.6.0-optional_akonadi-server.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/plasma-workspace/files/plasma-workspace-4.6.0-optional_akonadi-server.patch?r1=1.1&r2=1.2
Index: plasma-workspace-4.6.0-optional_akonadi-server.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/files/plasma-workspace-4.6.0-optional_akonadi-server.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plasma-workspace-4.6.0-optional_akonadi-server.patch 4 Feb 2011 13:28:34 -0000 1.1
+++ plasma-workspace-4.6.0-optional_akonadi-server.patch 5 Feb 2011 13:28:43 -0000 1.2
@@ -1,16 +1,130 @@
-diff -r -u plasma-workspace-4.6.0-orig/plasma/generic/dataengines/CMakeLists.txt plasma-workspace-4.6.0/plasma/generic/dataengines/CMakeLists.txt
---- plasma-workspace-4.6.0-orig/plasma/generic/dataengines/CMakeLists.txt 2011-02-03 18:58:47.884000165 -0500
-+++ plasma-workspace-4.6.0/plasma/generic/dataengines/CMakeLists.txt 2011-02-03 19:24:21.511000165 -0500
-@@ -28,8 +28,10 @@
- macro_log_feature(KDEPIMLIBS_FOUND "kdepimlibs" "KDE PIM libraries" "http://www.kde.org" FALSE "" "Needed for building several plasma dataengines")
+diff --git a/plasma/generic/dataengines/CMakeLists.txt b/plasma/generic/dataengines/CMakeLists.txt
+index 4664a02..1278224 100644
+--- a/plasma/generic/dataengines/CMakeLists.txt
++++ b/plasma/generic/dataengines/CMakeLists.txt
+@@ -25,10 +25,15 @@ if (NEPOMUK_FOUND)
+ endif (NEPOMUK_FOUND)
+
+ macro_optional_find_package(KdepimLibs 4.5.60)
+-macro_log_feature(KDEPIMLIBS_FOUND "kdepimlibs" "KDE PIM libraries" "http://www.kde.org" FALSE "" "Needed for building several plasma dataengines")
++macro_log_feature(KDEPIMLIBS_FOUND "kdepimlibs" "KDE PIM libraries" "http://www.kde.org" FALSE "" "Needed for building several Plasma DataEngines")
++
++macro_optional_find_package(Akonadi)
++macro_log_feature(AKONADI_FOUND "Akonadi" "Akonadi libraries" "http://pim.kde.org/akonadi/" FALSE "" "Needed for event support in the calendar DataEngine")
if(KDEPIMLIBS_FOUND)
- add_subdirectory(akonadi)
-- add_subdirectory(calendar)
+ if(AKONADI_FOUND)
+ add_subdirectory(akonadi)
-+ add_subdirectory(calendar)
+ endif(AKONADI_FOUND)
+ add_subdirectory(calendar)
add_subdirectory(rss)
endif(KDEPIMLIBS_FOUND)
+diff --git a/plasma/generic/dataengines/calendar/CMakeLists.txt b/plasma/generic/dataengines/calendar/CMakeLists.txt
+index d3d76e6..a6abcdc 100644
+--- a/plasma/generic/dataengines/calendar/CMakeLists.txt
++++ b/plasma/generic/dataengines/calendar/CMakeLists.txt
+@@ -1,7 +1,6 @@
+ project(calendar_engine)
+
+ find_package(KdepimLibs REQUIRED)
+-find_package(Akonadi REQUIRED)
+ find_package(Boost REQUIRED)
+
+ include_directories(
+@@ -14,14 +13,20 @@ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" )
+
+ set(calendar_engine_srcs
+ calendarengine.cpp
+- eventdatacontainer.cpp
+-# taken from kdepim/akonadi/kcal as long as it's not yet exported:
+- akonadi/calendar.cpp
+- akonadi/calendarmodel.cpp
+- akonadi/calfilterproxymodel.cpp
+- akonadi/utils.cpp
+ )
+
++if(AKONADI_FOUND)
++ ADD_DEFINITIONS(-DAKONADI_FOUND)
++ set(calendar_engine_srcs ${calendar_engine_srcs}
++ eventdatacontainer.cpp
++ # taken from kdepim/akonadi/kcal as long as it's not yet exported:
++ akonadi/calendar.cpp
++ akonadi/calendarmodel.cpp
++ akonadi/calfilterproxymodel.cpp
++ akonadi/utils.cpp
++ )
++endif(AKONADI_FOUND)
++
+ kde4_add_plugin(plasma_engine_calendar ${calendar_engine_srcs})
+
+ target_link_libraries(
+@@ -29,13 +34,19 @@ target_link_libraries(
+ ${KDEPIMLIBS_KHOLIDAYS_LIBRARY}
+ ${KDE4_KDECORE_LIBS}
+ ${KDE4_PLASMA_LIBS}
+- ${KDE4_AKONADI_LIBS}
+ ${KDE4_KMIME_LIBS}
+ ${KDE4_KCALCORE_LIBS}
+ ${KDE4_KCALUTILS_LIBS}
+- ${KDEPIMLIBS_AKONADI_KCAL_LIBS}
+ )
+
++if(AKONADI_FOUND)
++ target_link_libraries(
++ plasma_engine_calendar
++ ${KDE4_AKONADI_LIBS}
++ ${KDEPIMLIBS_AKONADI_KCAL_LIBS}
++ )
++endif(AKONADI_FOUND)
++
+ install(TARGETS plasma_engine_calendar DESTINATION ${PLUGIN_INSTALL_DIR})
+ install(FILES plasma-dataengine-calendar.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+
+diff --git a/plasma/generic/dataengines/calendar/calendarengine.cpp b/plasma/generic/dataengines/calendar/calendarengine.cpp
+index 0fdd65d..53f98c0 100644
+--- a/plasma/generic/dataengines/calendar/calendarengine.cpp
++++ b/plasma/generic/dataengines/calendar/calendarengine.cpp
+@@ -32,6 +32,7 @@
+ #include <KCalCore/Todo>
+ #include <KCalCore/Journal>
+
++#ifdef AKONADI_FOUND
+ #include <Akonadi/ChangeRecorder>
+ #include <Akonadi/Session>
+ #include <Akonadi/Collection>
+@@ -41,6 +42,7 @@
+ #include "akonadi/calendar.h"
+ #include "akonadi/calendarmodel.h"
+ #include "eventdatacontainer.h"
++#endif
+
+ CalendarEngine::CalendarEngine(QObject* parent, const QVariantList& args)
+ : Plasma::DataEngine(parent),
+@@ -74,9 +76,11 @@ bool CalendarEngine::sourceRequestEvent(const QString &request)
+ return holidayCalendarSourceRequest(requestKey, requestTokens, request);
+ }
+
++#ifdef AKONADI_FOUND
+ if (requestKey == "events" || requestKey == "eventsInMonth") {
+ return akonadiCalendarSourceRequest(requestKey, requestTokens, request);
+ }
++#endif
+
+ return false;
+ }
+@@ -272,6 +276,7 @@ bool CalendarEngine::holidayCalendarSourceRequest(const QString& key, const QStr
+ return false;
+ }
+
++#ifdef AKONADI_FOUND
+ bool CalendarEngine::akonadiCalendarSourceRequest(const QString& key, const QStringList& args, const QString& request)
+ {
+ // figure out what time range was requested from the source string
+@@ -339,5 +344,6 @@ void CalendarEngine::initAkonadiCalendar()
+ calendarModel->setCollectionFetchStrategy(Akonadi::EntityTreeModel::InvisibleCollectionFetch);
+ m_calendar = new CalendarSupport::Calendar(calendarModel, calendarModel, KSystemTimeZones::local());
+ }
++#endif
+ #include "calendarengine.moc"
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in kde-base/plasma-workspace/files: plasma-workspace-4.6.0-optional_akonadi-server.patch
@ 2011-03-04 18:00 Alexey Shvetsov (alexxy)
0 siblings, 0 replies; 5+ messages in thread
From: Alexey Shvetsov (alexxy) @ 2011-03-04 18:00 UTC (permalink / raw
To: gentoo-commits
alexxy 11/03/04 18:00:05
Modified:
plasma-workspace-4.6.0-optional_akonadi-server.patch
Log:
[kde-base] Add KDE SC 4.6.1
(Portage version: 2.2.0_alpha26/cvs/Linux x86_64)
Revision Changes Path
1.3 kde-base/plasma-workspace/files/plasma-workspace-4.6.0-optional_akonadi-server.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/plasma-workspace/files/plasma-workspace-4.6.0-optional_akonadi-server.patch?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/plasma-workspace/files/plasma-workspace-4.6.0-optional_akonadi-server.patch?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/plasma-workspace/files/plasma-workspace-4.6.0-optional_akonadi-server.patch?r1=1.2&r2=1.3
Index: plasma-workspace-4.6.0-optional_akonadi-server.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/files/plasma-workspace-4.6.0-optional_akonadi-server.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plasma-workspace-4.6.0-optional_akonadi-server.patch 5 Feb 2011 13:28:43 -0000 1.2
+++ plasma-workspace-4.6.0-optional_akonadi-server.patch 4 Mar 2011 18:00:05 -0000 1.3
@@ -1,130 +1,16 @@
-diff --git a/plasma/generic/dataengines/CMakeLists.txt b/plasma/generic/dataengines/CMakeLists.txt
-index 4664a02..1278224 100644
---- a/plasma/generic/dataengines/CMakeLists.txt
-+++ b/plasma/generic/dataengines/CMakeLists.txt
-@@ -25,10 +25,15 @@ if (NEPOMUK_FOUND)
- endif (NEPOMUK_FOUND)
-
- macro_optional_find_package(KdepimLibs 4.5.60)
--macro_log_feature(KDEPIMLIBS_FOUND "kdepimlibs" "KDE PIM libraries" "http://www.kde.org" FALSE "" "Needed for building several plasma dataengines")
-+macro_log_feature(KDEPIMLIBS_FOUND "kdepimlibs" "KDE PIM libraries" "http://www.kde.org" FALSE "" "Needed for building several Plasma DataEngines")
-+
-+macro_optional_find_package(Akonadi)
-+macro_log_feature(AKONADI_FOUND "Akonadi" "Akonadi libraries" "http://pim.kde.org/akonadi/" FALSE "" "Needed for event support in the calendar DataEngine")
+diff -r -u plasma-workspace-4.6.0-orig/plasma/generic/dataengines/CMakeLists.txt plasma-workspace-4.6.0/plasma/generic/dataengines/CMakeLists.txt
+--- plasma-workspace-4.6.0-orig/plasma/generic/dataengines/CMakeLists.txt 2011-02-03 18:58:47.884000165 -0500
++++ plasma-workspace-4.6.0/plasma/generic/dataengines/CMakeLists.txt 2011-02-03 19:24:21.511000165 -0500
+@@ -28,8 +28,10 @@
+ macro_log_feature(KDEPIMLIBS_FOUND "kdepimlibs" "KDE PIM libraries" "http://www.kde.org" FALSE "" "Needed for building several plasma dataengines")
if(KDEPIMLIBS_FOUND)
- add_subdirectory(akonadi)
+- add_subdirectory(calendar)
+ if(AKONADI_FOUND)
+ add_subdirectory(akonadi)
++ add_subdirectory(calendar)
+ endif(AKONADI_FOUND)
- add_subdirectory(calendar)
add_subdirectory(rss)
endif(KDEPIMLIBS_FOUND)
-diff --git a/plasma/generic/dataengines/calendar/CMakeLists.txt b/plasma/generic/dataengines/calendar/CMakeLists.txt
-index d3d76e6..a6abcdc 100644
---- a/plasma/generic/dataengines/calendar/CMakeLists.txt
-+++ b/plasma/generic/dataengines/calendar/CMakeLists.txt
-@@ -1,7 +1,6 @@
- project(calendar_engine)
-
- find_package(KdepimLibs REQUIRED)
--find_package(Akonadi REQUIRED)
- find_package(Boost REQUIRED)
-
- include_directories(
-@@ -14,14 +13,20 @@ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" )
-
- set(calendar_engine_srcs
- calendarengine.cpp
-- eventdatacontainer.cpp
--# taken from kdepim/akonadi/kcal as long as it's not yet exported:
-- akonadi/calendar.cpp
-- akonadi/calendarmodel.cpp
-- akonadi/calfilterproxymodel.cpp
-- akonadi/utils.cpp
- )
-
-+if(AKONADI_FOUND)
-+ ADD_DEFINITIONS(-DAKONADI_FOUND)
-+ set(calendar_engine_srcs ${calendar_engine_srcs}
-+ eventdatacontainer.cpp
-+ # taken from kdepim/akonadi/kcal as long as it's not yet exported:
-+ akonadi/calendar.cpp
-+ akonadi/calendarmodel.cpp
-+ akonadi/calfilterproxymodel.cpp
-+ akonadi/utils.cpp
-+ )
-+endif(AKONADI_FOUND)
-+
- kde4_add_plugin(plasma_engine_calendar ${calendar_engine_srcs})
-
- target_link_libraries(
-@@ -29,13 +34,19 @@ target_link_libraries(
- ${KDEPIMLIBS_KHOLIDAYS_LIBRARY}
- ${KDE4_KDECORE_LIBS}
- ${KDE4_PLASMA_LIBS}
-- ${KDE4_AKONADI_LIBS}
- ${KDE4_KMIME_LIBS}
- ${KDE4_KCALCORE_LIBS}
- ${KDE4_KCALUTILS_LIBS}
-- ${KDEPIMLIBS_AKONADI_KCAL_LIBS}
- )
-
-+if(AKONADI_FOUND)
-+ target_link_libraries(
-+ plasma_engine_calendar
-+ ${KDE4_AKONADI_LIBS}
-+ ${KDEPIMLIBS_AKONADI_KCAL_LIBS}
-+ )
-+endif(AKONADI_FOUND)
-+
- install(TARGETS plasma_engine_calendar DESTINATION ${PLUGIN_INSTALL_DIR})
- install(FILES plasma-dataengine-calendar.desktop DESTINATION ${SERVICES_INSTALL_DIR})
-
-diff --git a/plasma/generic/dataengines/calendar/calendarengine.cpp b/plasma/generic/dataengines/calendar/calendarengine.cpp
-index 0fdd65d..53f98c0 100644
---- a/plasma/generic/dataengines/calendar/calendarengine.cpp
-+++ b/plasma/generic/dataengines/calendar/calendarengine.cpp
-@@ -32,6 +32,7 @@
- #include <KCalCore/Todo>
- #include <KCalCore/Journal>
-
-+#ifdef AKONADI_FOUND
- #include <Akonadi/ChangeRecorder>
- #include <Akonadi/Session>
- #include <Akonadi/Collection>
-@@ -41,6 +42,7 @@
- #include "akonadi/calendar.h"
- #include "akonadi/calendarmodel.h"
- #include "eventdatacontainer.h"
-+#endif
-
- CalendarEngine::CalendarEngine(QObject* parent, const QVariantList& args)
- : Plasma::DataEngine(parent),
-@@ -74,9 +76,11 @@ bool CalendarEngine::sourceRequestEvent(const QString &request)
- return holidayCalendarSourceRequest(requestKey, requestTokens, request);
- }
-
-+#ifdef AKONADI_FOUND
- if (requestKey == "events" || requestKey == "eventsInMonth") {
- return akonadiCalendarSourceRequest(requestKey, requestTokens, request);
- }
-+#endif
-
- return false;
- }
-@@ -272,6 +276,7 @@ bool CalendarEngine::holidayCalendarSourceRequest(const QString& key, const QStr
- return false;
- }
-
-+#ifdef AKONADI_FOUND
- bool CalendarEngine::akonadiCalendarSourceRequest(const QString& key, const QStringList& args, const QString& request)
- {
- // figure out what time range was requested from the source string
-@@ -339,5 +344,6 @@ void CalendarEngine::initAkonadiCalendar()
- calendarModel->setCollectionFetchStrategy(Akonadi::EntityTreeModel::InvisibleCollectionFetch);
- m_calendar = new CalendarSupport::Calendar(calendarModel, calendarModel, KSystemTimeZones::local());
- }
-+#endif
- #include "calendarengine.moc"
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in kde-base/plasma-workspace/files: plasma-workspace-4.6.0-optional_akonadi-server.patch
@ 2011-03-28 1:44 Theo Chatzimichos (tampakrap)
0 siblings, 0 replies; 5+ messages in thread
From: Theo Chatzimichos (tampakrap) @ 2011-03-28 1:44 UTC (permalink / raw
To: gentoo-commits
tampakrap 11/03/28 01:44:55
Modified:
plasma-workspace-4.6.0-optional_akonadi-server.patch
Log:
Update the akonadi-optional patch
Revision Changes Path
1.4 kde-base/plasma-workspace/files/plasma-workspace-4.6.0-optional_akonadi-server.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/plasma-workspace/files/plasma-workspace-4.6.0-optional_akonadi-server.patch?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/plasma-workspace/files/plasma-workspace-4.6.0-optional_akonadi-server.patch?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/plasma-workspace/files/plasma-workspace-4.6.0-optional_akonadi-server.patch?r1=1.3&r2=1.4
Index: plasma-workspace-4.6.0-optional_akonadi-server.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/files/plasma-workspace-4.6.0-optional_akonadi-server.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plasma-workspace-4.6.0-optional_akonadi-server.patch 4 Mar 2011 18:00:05 -0000 1.3
+++ plasma-workspace-4.6.0-optional_akonadi-server.patch 28 Mar 2011 01:44:55 -0000 1.4
@@ -1,16 +1,141 @@
-diff -r -u plasma-workspace-4.6.0-orig/plasma/generic/dataengines/CMakeLists.txt plasma-workspace-4.6.0/plasma/generic/dataengines/CMakeLists.txt
---- plasma-workspace-4.6.0-orig/plasma/generic/dataengines/CMakeLists.txt 2011-02-03 18:58:47.884000165 -0500
-+++ plasma-workspace-4.6.0/plasma/generic/dataengines/CMakeLists.txt 2011-02-03 19:24:21.511000165 -0500
-@@ -28,8 +28,10 @@
- macro_log_feature(KDEPIMLIBS_FOUND "kdepimlibs" "KDE PIM libraries" "http://www.kde.org" FALSE "" "Needed for building several plasma dataengines")
+commit 5701ee97f896bf25de5dfbcc2699695794f25b34
+Author: Aaron Seigo <aseigo@kde.org>
+Date: Fri Feb 4 15:48:30 2011 -0800
+
+ make akonadi optional
+
+ based on a patch by Theo Chatzimichos, whose patch in turn was based
+ on one by Fabiano Engler via Gentoo
+
+ REVIEW:100568
+
+diff --git a/plasma/generic/dataengines/CMakeLists.txt b/plasma/generic/dataengines/CMakeLists.txt
+index 4664a02..1278224 100644
+--- a/plasma/generic/dataengines/CMakeLists.txt
++++ b/plasma/generic/dataengines/CMakeLists.txt
+@@ -25,10 +25,15 @@ if (NEPOMUK_FOUND)
+ endif (NEPOMUK_FOUND)
+
+ macro_optional_find_package(KdepimLibs 4.5.60)
+-macro_log_feature(KDEPIMLIBS_FOUND "kdepimlibs" "KDE PIM libraries" "http://www.kde.org" FALSE "" "Needed for building several plasma dataengines")
++macro_log_feature(KDEPIMLIBS_FOUND "kdepimlibs" "KDE PIM libraries" "http://www.kde.org" FALSE "" "Needed for building several Plasma DataEngines")
++
++macro_optional_find_package(Akonadi)
++macro_log_feature(AKONADI_FOUND "Akonadi" "Akonadi libraries" "http://pim.kde.org/akonadi/" FALSE "" "Needed for event support in the calendar DataEngine")
if(KDEPIMLIBS_FOUND)
- add_subdirectory(akonadi)
-- add_subdirectory(calendar)
+ if(AKONADI_FOUND)
+ add_subdirectory(akonadi)
-+ add_subdirectory(calendar)
+ endif(AKONADI_FOUND)
+ add_subdirectory(calendar)
add_subdirectory(rss)
endif(KDEPIMLIBS_FOUND)
+diff --git a/plasma/generic/dataengines/calendar/CMakeLists.txt b/plasma/generic/dataengines/calendar/CMakeLists.txt
+index d3d76e6..a6abcdc 100644
+--- a/plasma/generic/dataengines/calendar/CMakeLists.txt
++++ b/plasma/generic/dataengines/calendar/CMakeLists.txt
+@@ -1,7 +1,6 @@
+ project(calendar_engine)
+
+ find_package(KdepimLibs REQUIRED)
+-find_package(Akonadi REQUIRED)
+ find_package(Boost REQUIRED)
+
+ include_directories(
+@@ -14,14 +13,20 @@ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" )
+
+ set(calendar_engine_srcs
+ calendarengine.cpp
+- eventdatacontainer.cpp
+-# taken from kdepim/akonadi/kcal as long as it's not yet exported:
+- akonadi/calendar.cpp
+- akonadi/calendarmodel.cpp
+- akonadi/calfilterproxymodel.cpp
+- akonadi/utils.cpp
+ )
+
++if(AKONADI_FOUND)
++ ADD_DEFINITIONS(-DAKONADI_FOUND)
++ set(calendar_engine_srcs ${calendar_engine_srcs}
++ eventdatacontainer.cpp
++ # taken from kdepim/akonadi/kcal as long as it's not yet exported:
++ akonadi/calendar.cpp
++ akonadi/calendarmodel.cpp
++ akonadi/calfilterproxymodel.cpp
++ akonadi/utils.cpp
++ )
++endif(AKONADI_FOUND)
++
+ kde4_add_plugin(plasma_engine_calendar ${calendar_engine_srcs})
+
+ target_link_libraries(
+@@ -29,13 +34,19 @@ target_link_libraries(
+ ${KDEPIMLIBS_KHOLIDAYS_LIBRARY}
+ ${KDE4_KDECORE_LIBS}
+ ${KDE4_PLASMA_LIBS}
+- ${KDE4_AKONADI_LIBS}
+ ${KDE4_KMIME_LIBS}
+ ${KDE4_KCALCORE_LIBS}
+ ${KDE4_KCALUTILS_LIBS}
+- ${KDEPIMLIBS_AKONADI_KCAL_LIBS}
+ )
+
++if(AKONADI_FOUND)
++ target_link_libraries(
++ plasma_engine_calendar
++ ${KDE4_AKONADI_LIBS}
++ ${KDEPIMLIBS_AKONADI_KCAL_LIBS}
++ )
++endif(AKONADI_FOUND)
++
+ install(TARGETS plasma_engine_calendar DESTINATION ${PLUGIN_INSTALL_DIR})
+ install(FILES plasma-dataengine-calendar.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+
+diff --git a/plasma/generic/dataengines/calendar/calendarengine.cpp b/plasma/generic/dataengines/calendar/calendarengine.cpp
+index 0fdd65d..53f98c0 100644
+--- a/plasma/generic/dataengines/calendar/calendarengine.cpp
++++ b/plasma/generic/dataengines/calendar/calendarengine.cpp
+@@ -32,6 +32,7 @@
+ #include <KCalCore/Todo>
+ #include <KCalCore/Journal>
+
++#ifdef AKONADI_FOUND
+ #include <Akonadi/ChangeRecorder>
+ #include <Akonadi/Session>
+ #include <Akonadi/Collection>
+@@ -41,6 +42,7 @@
+ #include "akonadi/calendar.h"
+ #include "akonadi/calendarmodel.h"
+ #include "eventdatacontainer.h"
++#endif
+
+ CalendarEngine::CalendarEngine(QObject* parent, const QVariantList& args)
+ : Plasma::DataEngine(parent),
+@@ -74,9 +76,11 @@ bool CalendarEngine::sourceRequestEvent(const QString &request)
+ return holidayCalendarSourceRequest(requestKey, requestTokens, request);
+ }
+
++#ifdef AKONADI_FOUND
+ if (requestKey == "events" || requestKey == "eventsInMonth") {
+ return akonadiCalendarSourceRequest(requestKey, requestTokens, request);
+ }
++#endif
+
+ return false;
+ }
+@@ -272,6 +276,7 @@ bool CalendarEngine::holidayCalendarSourceRequest(const QString& key, const QStr
+ return false;
+ }
+
++#ifdef AKONADI_FOUND
+ bool CalendarEngine::akonadiCalendarSourceRequest(const QString& key, const QStringList& args, const QString& request)
+ {
+ // figure out what time range was requested from the source string
+@@ -339,5 +344,6 @@ void CalendarEngine::initAkonadiCalendar()
+ calendarModel->setCollectionFetchStrategy(Akonadi::EntityTreeModel::InvisibleCollectionFetch);
+ m_calendar = new CalendarSupport::Calendar(calendarModel, calendarModel, KSystemTimeZones::local());
+ }
++#endif
+ #include "calendarengine.moc"
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in kde-base/plasma-workspace/files: plasma-workspace-4.6.0-optional_akonadi-server.patch
@ 2011-04-08 20:15 Andreas HAttel (dilfridge)
0 siblings, 0 replies; 5+ messages in thread
From: Andreas HAttel (dilfridge) @ 2011-04-08 20:15 UTC (permalink / raw
To: gentoo-commits
dilfridge 11/04/08 20:15:49
Removed:
plasma-workspace-4.6.0-optional_akonadi-server.patch
Log:
Cleanup
(Portage version: 2.1.9.45/cvs/Linux x86_64)
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-04-08 20:16 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-04 13:28 [gentoo-commits] gentoo-x86 commit in kde-base/plasma-workspace/files: plasma-workspace-4.6.0-optional_akonadi-server.patch Theo Chatzimichos (tampakrap)
-- strict thread matches above, loose matches on Subject: below --
2011-02-05 13:28 Theo Chatzimichos (tampakrap)
2011-03-04 18:00 Alexey Shvetsov (alexxy)
2011-03-28 1:44 Theo Chatzimichos (tampakrap)
2011-04-08 20:15 Andreas HAttel (dilfridge)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox