qtorganizer5-eds

Merge lp:~renatofilho/qtorganizer5-eds/eds3.16-vivid into lp:~laney/qtorganizer5-eds/eds3.16

  1. eds3.16-vivid
  2. Merge into eds3.16
Proposed by Renato Araujo Oliveira Filho
Status: Merged
Merged at revision: 91
Proposed branch: lp:~renatofilho/qtorganizer5-eds/eds3.16-vivid
Merge into: lp:~laney/qtorganizer5-eds/eds3.16
Diff against target: 177 lines (+40/-27)
8 files modified
CMakeLists.txt (+13/-7)
config.h.in (+13/-4)
organizer/CMakeLists.txt (+1/-1)
organizer/qorganizer-eds-engine.cpp (+2/-5)
organizer/qorganizer-eds-source-registry.cpp (+3/-1)
tests/unittest/CMakeLists.txt (+2/-2)
tests/unittest/eds-base-test.cpp (+1/-2)
tests/unittest/run-eds-test.sh (+5/-5)
To merge this branch: bzr merge lp:~renatofilho/qtorganizer5-eds/eds3.16-vivid
Reviewer Review Type Date Requested Status
Iain Lane Pending
Review via email: mp+264657@code.launchpad.net

Commit message

Make sure that vivid build still working.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2015-06-18 11:32:43 +0000
3+++ CMakeLists.txt 2015-07-14 00:56:12 +0000
4@@ -13,8 +13,8 @@
5
6 pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
7 pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
8-pkg_check_modules(EDATASERVER REQUIRED libedataserver-1.2>=3.16)
9-pkg_check_modules(ECAL REQUIRED REQUIRED libecal-1.2>=3.16)
10+pkg_check_modules(EDATASERVER REQUIRED libedataserver-1.2>=3.8)
11+pkg_check_modules(ECAL REQUIRED REQUIRED libecal-1.2>=3.8)
12
13 set(CMAKE_INCLUDE_CURRENT_DIR ON)
14 set(CMAKE_AUTOMOC ON)
15@@ -64,13 +64,19 @@
16 PATHS /usr/lib/evolution/)
17 find_program(GVFSD gvfsd
18 PATHS /usr/lib/gvfs/)
19+
20+if(EDATASERVER_VERSION VERSION_LESS "3.16")
21+ set(EVOLUTION_API_3_17 "0")
22+ set(EVOLUTION_SOURCE_SERVICE_NAME "org.gnome.evolution.dataserver.Sources3")
23+ set(EVOLUTION_CALENDAR_SERVICE_NAME "org.gnome.evolution.dataserver.Calendar4")
24+else()
25+ set(EVOLUTION_API_3_17 "1")
26+ set(EVOLUTION_SOURCE_SERVICE_NAME "org.gnome.evolution.dataserver.Sources4")
27+ set(EVOLUTION_CALENDAR_SERVICE_NAME "org.gnome.evolution.dataserver.Calendar7")
28+endif()
29+
30 configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
31
32-OPTION(EVOLUTION_SOURCE_SERVICE_NAME "DBus name for source registry")
33-if(NOT EVOLUTION_SOURCE_SERVICE_NAME)
34- set(EVOLUTION_SOURCE_SERVICE_NAME "org.gnome.evolution.dataserver.Sources4")
35-endif()
36-
37 add_subdirectory(organizer)
38 if(DBUS_RUNNER)
39 if(EVOLUTION_CALENDAR_FACTORY)
40
41=== modified file 'config.h.in'
42--- config.h.in 2015-06-18 11:32:43 +0000
43+++ config.h.in 2015-07-14 00:56:12 +0000
44@@ -1,9 +1,18 @@
45 #ifndef __CONFIG_H__
46 #define __CONFIG_H__
47
48-#define TMP_DIR "@TMP_DIR@"
49-#define EVOLUTION_CALENDAR_FACTORY "@EVOLUTION_CALENDAR_FACTORY@"
50-#define EVOLUTION_CALENDAR_SERVICE "org.gnome.evolution.dataserver.Calendar7"
51-#define QORGANIZER_DEV_PATH "@CMAKE_BINARY_DIR@"
52+#define TMP_DIR "@TMP_DIR@"
53+#define EVOLUTION_CALENDAR_FACTORY "@EVOLUTION_CALENDAR_FACTORY@"
54+#define EVOLUTION_CALENDAR_SERVICE_NAME "@EVOLUTION_CALENDAR_SERVICE@"
55+#define QORGANIZER_DEV_PATH "@CMAKE_BINARY_DIR@"
56+#define EVOLUTION_API_3_17 @EVOLUTION_API_3_17@
57+
58+#if EVOLUTION_API_3_17
59+ #define E_CAL_CLIENT_CONNECT_SYNC(SOURCE, SOURCE_TYPE, CANCELLABLE, ERROR) \
60+ e_cal_client_connect_sync(SOURCE, SOURCE_TYPE, -1, CANCELLABLE, ERROR)
61+#else
62+ #define E_CAL_CLIENT_CONNECT_SYNC(SOURCE, SOURCE_TYPE, CANCELLABLE, ERROR) \
63+ e_cal_client_connect_sync(SOURCE, SOURCE_TYPE, CANCELLABLE, ERROR)
64+#endif
65
66 #endif
67
68=== modified file 'organizer/CMakeLists.txt'
69--- organizer/CMakeLists.txt 2014-02-25 17:12:32 +0000
70+++ organizer/CMakeLists.txt 2015-07-14 00:56:12 +0000
71@@ -49,7 +49,7 @@
72 )
73
74 include_directories(
75- ${CMAKE_SOURCE_DIR}
76+ ${CMAKE_BINARY_DIR}
77 ${GLIB_INCLUDE_DIRS}
78 ${GIO_INCLUDE_DIRS}
79 ${ECAL_INCLUDE_DIRS}
80
81=== modified file 'organizer/qorganizer-eds-engine.cpp'
82--- organizer/qorganizer-eds-engine.cpp 2015-05-08 20:01:32 +0000
83+++ organizer/qorganizer-eds-engine.cpp 2015-07-14 00:56:12 +0000
84@@ -1944,12 +1944,9 @@
85 {
86 rule->freq = ICAL_MONTHLY_RECURRENCE;
87
88- QList<int> daysOfMonth = qRule.daysOfMonth().toList();
89 int c = 0;
90- for (int d=1; d < ICAL_BY_MONTHDAY_SIZE; d++) {
91- if (daysOfMonth.contains(d)) {
92- rule->by_month_day[c++] = d;
93- }
94+ Q_FOREACH(int daysOfMonth, qRule.daysOfMonth()) {
95+ rule->by_month_day[c++] = daysOfMonth;
96 }
97 for (int d = c; d < ICAL_BY_MONTHDAY_SIZE; d++) {
98 rule->by_month_day[d] = ICAL_RECURRENCE_ARRAY_MAX;
99
100=== modified file 'organizer/qorganizer-eds-source-registry.cpp'
101--- organizer/qorganizer-eds-source-registry.cpp 2015-06-18 11:39:48 +0000
102+++ organizer/qorganizer-eds-source-registry.cpp 2015-07-14 00:56:12 +0000
103@@ -1,4 +1,5 @@
104 #include "qorganizer-eds-source-registry.h"
105+#include "config.h"
106
107 #include <QtCore/QDebug>
108
109@@ -177,7 +178,8 @@
110 QOrganizerEDSCollectionEngineId *eid = m_collectionsMap[collectionId];
111 if (eid) {
112 GError *gError = 0;
113- client = e_cal_client_connect_sync(eid->m_esource, eid->m_sourceType, -1, 0, &gError);
114+
115+ client = E_CAL_CLIENT_CONNECT_SYNC(eid->m_esource, eid->m_sourceType, 0, &gError);
116 if (gError) {
117 qWarning() << "Fail to connect with client" << gError->message;
118 g_error_free(gError);
119
120=== modified file 'tests/unittest/CMakeLists.txt'
121--- tests/unittest/CMakeLists.txt 2015-05-08 20:01:32 +0000
122+++ tests/unittest/CMakeLists.txt 2015-07-14 00:56:12 +0000
123@@ -22,8 +22,8 @@
124
125 add_test(${TESTNAME}
126 ${CMAKE_CURRENT_SOURCE_DIR}/run-eds-test.sh ${DBUS_RUNNER} ${CMAKE_CURRENT_BINARY_DIR}/${TESTNAME} ${TESTNAME}
127- ${EVOLUTION_CALENDAR_FACTORY} ${EVOLUTION_SOURCE_SERVICE_NAME}
128- ${EVOLUTION_SOURCE_REGISTRY}
129+ ${EVOLUTION_CALENDAR_FACTORY} ${EVOLUTION_CALENDAR_SERVICE_NAME}
130+ ${EVOLUTION_SOURCE_REGISTRY} ${EVOLUTION_SOURCE_SERVICE_NAME}
131 ${GVFSD})
132 endmacro(declare_test testname)
133
134
135=== modified file 'tests/unittest/eds-base-test.cpp'
136--- tests/unittest/eds-base-test.cpp 2015-06-18 11:39:48 +0000
137+++ tests/unittest/eds-base-test.cpp 2015-07-14 00:56:12 +0000
138@@ -90,9 +90,8 @@
139 calendar.reset(e_source_registry_ref_source(sourceRegistry.data(),
140 collectionId.toString().toUtf8().data()));
141 }
142- GScopedPointer<EClient> client(e_cal_client_connect_sync(calendar.data(),
143+ GScopedPointer<EClient> client(E_CAL_CLIENT_CONNECT_SYNC(calendar.data(),
144 E_CAL_CLIENT_SOURCE_TYPE_EVENTS,
145- -1, /* timeout */
146 0,
147 &error));
148 if (error) {
149
150=== modified file 'tests/unittest/run-eds-test.sh'
151--- tests/unittest/run-eds-test.sh 2015-06-18 10:41:05 +0000
152+++ tests/unittest/run-eds-test.sh 2015-07-14 00:56:12 +0000
153@@ -7,8 +7,9 @@
154 echo ARG4=$4 # full executable path of evolution-calendar-factory
155 echo ARG5=$5 # bus service name of calendar factory
156 echo ARG6=$6 # full exectuable path of evolution-source-registry
157-echo ARG7=$7 # full executable path of gvfs
158-echo ARG8=$8 # config files
159+echo ARG7=$7 # bus service name of evolution-source-registry
160+echo ARG7=$8 # full executable path of gvfs
161+echo ARG8=$9 # config files
162
163 # set up the tmpdir and tell the shell to purge it when we exit
164 export TEST_TMP_DIR=$(mktemp -p "${TMPDIR:-/tmp}" -d $3-XXXXXXXXXX) || exit 1
165@@ -38,10 +39,9 @@
166
167 # run dbus-test-runner
168 $1 --keep-env --max-wait=90 \
169---task $2 --task-name $3 --wait-until-complete --wait-for=org.gnome.evolution.dataserver.Calendar7 \
170---task $4 --task-name "evolution" --wait-until-complete --wait-for=org.gnome.evolution.dataserver.Sources4 -r \
171+--task $2 --task-name $3 --wait-until-complete --wait-for=$5 \
172+--task $4 --task-name "evolution" --wait-until-complete --wait-for=$7 -r \
173 --task $6 --task-name "source-registry" -r
174-#--task $7 --task-name "gvfsd" -r
175 rv=$?
176
177 # if the test passed, blow away the tmpdir

Subscribers

People subscribed via source and target branches