Merge lp:~laney/qtorganizer5-eds/eds3.16 into lp:qtorganizer5-eds
- eds3.16
- Merge into trunk
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Renato Araujo Oliveira Filho | ||||
Approved revision: | 93 | ||||
Merged at revision: | 84 | ||||
Proposed branch: | lp:~laney/qtorganizer5-eds/eds3.16 | ||||
Merge into: | lp:qtorganizer5-eds | ||||
Diff against target: |
179 lines (+40/-26) 9 files modified
CMakeLists.txt (+11/-5) config.h.in (+13/-4) debian/control (+2/-2) 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/-1) tests/unittest/run-eds-test.sh (+5/-5) |
||||
To merge this branch: | bzr merge lp:~laney/qtorganizer5-eds/eds3.16 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Renato Araujo Oliveira Filho (community) | Approve | ||
PS Jenkins bot | continuous-integration | Needs Fixing | |
Ubuntu Phablet Team | Pending | ||
Review via email: mp+262331@code.launchpad.net |
Commit message
Adapt to API changes and new D-Bus service names in e-d-s 3.16
Description of the change
Test built in https:/
This FAILS TO BULID due to a test failure. I don't know the code well enough to fix it - could you help please?
PS Jenkins bot (ps-jenkins) wrote : | # |
Renato Araujo Oliveira Filho (renatofilho) wrote : | # |
Which ubuntu version contains this eds version?
Iain Lane (laney) wrote : | # |
On Thu, Jun 18, 2015 at 01:14:55PM -0000, Renato Araujo Oliveira Filho wrote:
> Which ubuntu version contains this eds version?
The referenced silo does: ppa:ci-
--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]
Iain Lane (laney) wrote : | # |
Hey Renato,
On Thu, Jun 18, 2015 at 01:21:26PM -0000, Iain Lane wrote:
> On Thu, Jun 18, 2015 at 01:14:55PM -0000, Renato Araujo Oliveira Filho wrote:
> > Which ubuntu version contains this eds version?
>
> The referenced silo does: ppa:ci-
Do you think there's any chance you will be able to take a look at this
soon?
Thanks :-)
Cheers,
--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]
Renato Araujo Oliveira Filho (renatofilho) wrote : | # |
Thanks for the MR, and sorry for take so long to give it a try. I am very busy right now with contacts sync.
I spent a long time debugging the problem, unfortunately I was unable to fix it yet. I am afraid that it is a evolution bug, but I will need more time to confirm that.
While I was working on it I did some changes[1] on your MR to keep it compatible vivid. (feel free to merge it on your MR if you think that is valid).
- 91. By Iain Lane
-
merge lp:~renatofilho/qtorganizer5-eds/eds3.16-vivid to stay compatible with vivid + wily
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:91
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
Renato Araujo Oliveira Filho (renatofilho) wrote : | # |
Looks good. Just a small comment. Check the inline comments
Iain Lane (laney) wrote : | # |
On Thu, Jul 23, 2015 at 01:43:25PM -0000, Renato Araujo Oliveira Filho wrote:
> > + libedataserver1
>
> Could we change that to the version present in vivid?
Yeah OK, done!
--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:92
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
Renato Araujo Oliveira Filho (renatofilho) wrote : | # |
> On Thu, Jul 23, 2015 at 01:43:25PM -0000, Renato Araujo Oliveira Filho wrote:
> > > + libedataserver1
> >
> > Could we change that to the version present in vivid?
>
> Yeah OK, done!
>
Could you do the same for: libecal1.2-dev (>= 3.16),
Iain Lane (laney) wrote : | # |
On Thu, Jul 23, 2015 at 02:06:18PM -0000, Renato Araujo Oliveira Filho wrote:
> > On Thu, Jul 23, 2015 at 01:43:25PM -0000, Renato Araujo Oliveira Filho wrote:
> > > > + libedataserver1
> > >
> > > Could we change that to the version present in vivid?
> >
> > Yeah OK, done!
> >
> Could you do the same for: libecal1.2-dev (>= 3.16),
I already did (in two commits), just triggered a build for that.
--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:93
http://
Executed test runs:
FAILURE: http://
SUCCESS: http://
deb: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:93
http://
Executed test runs:
FAILURE: http://
SUCCESS: http://
deb: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:93
http://
Executed test runs:
FAILURE: http://
SUCCESS: http://
deb: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:93
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:93
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:93
http://
Executed test runs:
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Renato Araujo Oliveira Filho (renatofilho) wrote : | # |
looks good to me.
Preview Diff
1 | === modified file 'CMakeLists.txt' |
2 | --- CMakeLists.txt 2015-03-30 17:59:13 +0000 |
3 | +++ CMakeLists.txt 2015-07-23 14:16:00 +0000 |
4 | @@ -64,13 +64,19 @@ |
5 | PATHS /usr/lib/evolution/) |
6 | find_program(GVFSD gvfsd |
7 | PATHS /usr/lib/gvfs/) |
8 | + |
9 | +if(EDATASERVER_VERSION VERSION_LESS "3.16") |
10 | + set(EVOLUTION_API_3_17 "0") |
11 | + set(EVOLUTION_SOURCE_SERVICE_NAME "org.gnome.evolution.dataserver.Sources3") |
12 | + set(EVOLUTION_CALENDAR_SERVICE_NAME "org.gnome.evolution.dataserver.Calendar4") |
13 | +else() |
14 | + set(EVOLUTION_API_3_17 "1") |
15 | + set(EVOLUTION_SOURCE_SERVICE_NAME "org.gnome.evolution.dataserver.Sources4") |
16 | + set(EVOLUTION_CALENDAR_SERVICE_NAME "org.gnome.evolution.dataserver.Calendar7") |
17 | +endif() |
18 | + |
19 | configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h) |
20 | |
21 | -OPTION(EVOLUTION_SOURCE_SERVICE_NAME "DBus name for source registry") |
22 | -if(NOT EVOLUTION_SOURCE_SERVICE_NAME) |
23 | - set(EVOLUTION_SOURCE_SERVICE_NAME "org.gnome.evolution.dataserver.Sources3") |
24 | -endif() |
25 | - |
26 | add_subdirectory(organizer) |
27 | if(DBUS_RUNNER) |
28 | if(EVOLUTION_CALENDAR_FACTORY) |
29 | |
30 | === modified file 'config.h.in' |
31 | --- config.h.in 2014-05-26 20:43:55 +0000 |
32 | +++ config.h.in 2015-07-23 14:16:00 +0000 |
33 | @@ -1,9 +1,18 @@ |
34 | #ifndef __CONFIG_H__ |
35 | #define __CONFIG_H__ |
36 | |
37 | -#define TMP_DIR "@TMP_DIR@" |
38 | -#define EVOLUTION_CALENDAR_FACTORY "@EVOLUTION_CALENDAR_FACTORY@" |
39 | -#define EVOLUTION_CALENDAR_SERVICE "org.gnome.evolution.dataserver.Calendar4" |
40 | -#define QORGANIZER_DEV_PATH "@CMAKE_BINARY_DIR@" |
41 | +#define TMP_DIR "@TMP_DIR@" |
42 | +#define EVOLUTION_CALENDAR_FACTORY "@EVOLUTION_CALENDAR_FACTORY@" |
43 | +#define EVOLUTION_CALENDAR_SERVICE_NAME "@EVOLUTION_CALENDAR_SERVICE@" |
44 | +#define QORGANIZER_DEV_PATH "@CMAKE_BINARY_DIR@" |
45 | +#define EVOLUTION_API_3_17 @EVOLUTION_API_3_17@ |
46 | + |
47 | +#if EVOLUTION_API_3_17 |
48 | + #define E_CAL_CLIENT_CONNECT_SYNC(SOURCE, SOURCE_TYPE, CANCELLABLE, ERROR) \ |
49 | + e_cal_client_connect_sync(SOURCE, SOURCE_TYPE, -1, CANCELLABLE, ERROR) |
50 | +#else |
51 | + #define E_CAL_CLIENT_CONNECT_SYNC(SOURCE, SOURCE_TYPE, CANCELLABLE, ERROR) \ |
52 | + e_cal_client_connect_sync(SOURCE, SOURCE_TYPE, CANCELLABLE, ERROR) |
53 | +#endif |
54 | |
55 | #endif |
56 | |
57 | === modified file 'debian/control' |
58 | --- debian/control 2014-09-22 14:20:47 +0000 |
59 | +++ debian/control 2015-07-23 14:16:00 +0000 |
60 | @@ -4,8 +4,8 @@ |
61 | Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> |
62 | Build-Depends: cmake (>= 2.8.9), |
63 | debhelper (>= 9), |
64 | - libecal1.2-dev, |
65 | - libedataserver1.2-dev, |
66 | + libecal1.2-dev (>= 3.12), |
67 | + libedataserver1.2-dev (>= 3.12), |
68 | qt5-default, |
69 | qt5-qmake, |
70 | qtbase5-dev, |
71 | |
72 | === modified file 'organizer/CMakeLists.txt' |
73 | --- organizer/CMakeLists.txt 2014-02-25 17:12:32 +0000 |
74 | +++ organizer/CMakeLists.txt 2015-07-23 14:16:00 +0000 |
75 | @@ -49,7 +49,7 @@ |
76 | ) |
77 | |
78 | include_directories( |
79 | - ${CMAKE_SOURCE_DIR} |
80 | + ${CMAKE_BINARY_DIR} |
81 | ${GLIB_INCLUDE_DIRS} |
82 | ${GIO_INCLUDE_DIRS} |
83 | ${ECAL_INCLUDE_DIRS} |
84 | |
85 | === modified file 'organizer/qorganizer-eds-engine.cpp' |
86 | --- organizer/qorganizer-eds-engine.cpp 2015-05-08 20:01:32 +0000 |
87 | +++ organizer/qorganizer-eds-engine.cpp 2015-07-23 14:16:00 +0000 |
88 | @@ -1944,12 +1944,9 @@ |
89 | { |
90 | rule->freq = ICAL_MONTHLY_RECURRENCE; |
91 | |
92 | - QList<int> daysOfMonth = qRule.daysOfMonth().toList(); |
93 | int c = 0; |
94 | - for (int d=1; d < ICAL_BY_MONTHDAY_SIZE; d++) { |
95 | - if (daysOfMonth.contains(d)) { |
96 | - rule->by_month_day[c++] = d; |
97 | - } |
98 | + Q_FOREACH(int daysOfMonth, qRule.daysOfMonth()) { |
99 | + rule->by_month_day[c++] = daysOfMonth; |
100 | } |
101 | for (int d = c; d < ICAL_BY_MONTHDAY_SIZE; d++) { |
102 | rule->by_month_day[d] = ICAL_RECURRENCE_ARRAY_MAX; |
103 | |
104 | === modified file 'organizer/qorganizer-eds-source-registry.cpp' |
105 | --- organizer/qorganizer-eds-source-registry.cpp 2015-04-09 15:16:39 +0000 |
106 | +++ organizer/qorganizer-eds-source-registry.cpp 2015-07-23 14:16:00 +0000 |
107 | @@ -1,4 +1,5 @@ |
108 | #include "qorganizer-eds-source-registry.h" |
109 | +#include "config.h" |
110 | |
111 | #include <QtCore/QDebug> |
112 | |
113 | @@ -177,7 +178,8 @@ |
114 | QOrganizerEDSCollectionEngineId *eid = m_collectionsMap[collectionId]; |
115 | if (eid) { |
116 | GError *gError = 0; |
117 | - client = e_cal_client_connect_sync(eid->m_esource, eid->m_sourceType, 0, &gError); |
118 | + |
119 | + client = E_CAL_CLIENT_CONNECT_SYNC(eid->m_esource, eid->m_sourceType, 0, &gError); |
120 | if (gError) { |
121 | qWarning() << "Fail to connect with client" << gError->message; |
122 | g_error_free(gError); |
123 | |
124 | === modified file 'tests/unittest/CMakeLists.txt' |
125 | --- tests/unittest/CMakeLists.txt 2015-05-08 20:01:32 +0000 |
126 | +++ tests/unittest/CMakeLists.txt 2015-07-23 14:16:00 +0000 |
127 | @@ -22,8 +22,8 @@ |
128 | |
129 | add_test(${TESTNAME} |
130 | ${CMAKE_CURRENT_SOURCE_DIR}/run-eds-test.sh ${DBUS_RUNNER} ${CMAKE_CURRENT_BINARY_DIR}/${TESTNAME} ${TESTNAME} |
131 | - ${EVOLUTION_CALENDAR_FACTORY} ${EVOLUTION_SOURCE_SERVICE_NAME} |
132 | - ${EVOLUTION_SOURCE_REGISTRY} |
133 | + ${EVOLUTION_CALENDAR_FACTORY} ${EVOLUTION_CALENDAR_SERVICE_NAME} |
134 | + ${EVOLUTION_SOURCE_REGISTRY} ${EVOLUTION_SOURCE_SERVICE_NAME} |
135 | ${GVFSD}) |
136 | endmacro(declare_test testname) |
137 | |
138 | |
139 | === modified file 'tests/unittest/eds-base-test.cpp' |
140 | --- tests/unittest/eds-base-test.cpp 2015-04-09 14:00:57 +0000 |
141 | +++ tests/unittest/eds-base-test.cpp 2015-07-23 14:16:00 +0000 |
142 | @@ -90,7 +90,7 @@ |
143 | calendar.reset(e_source_registry_ref_source(sourceRegistry.data(), |
144 | collectionId.toString().toUtf8().data())); |
145 | } |
146 | - GScopedPointer<EClient> client(e_cal_client_connect_sync(calendar.data(), |
147 | + GScopedPointer<EClient> client(E_CAL_CLIENT_CONNECT_SYNC(calendar.data(), |
148 | E_CAL_CLIENT_SOURCE_TYPE_EVENTS, |
149 | 0, |
150 | &error)); |
151 | |
152 | === modified file 'tests/unittest/run-eds-test.sh' |
153 | --- tests/unittest/run-eds-test.sh 2015-04-09 19:05:11 +0000 |
154 | +++ tests/unittest/run-eds-test.sh 2015-07-23 14:16:00 +0000 |
155 | @@ -7,8 +7,9 @@ |
156 | echo ARG4=$4 # full executable path of evolution-calendar-factory |
157 | echo ARG5=$5 # bus service name of calendar factory |
158 | echo ARG6=$6 # full exectuable path of evolution-source-registry |
159 | -echo ARG7=$7 # full executable path of gvfs |
160 | -echo ARG8=$8 # config files |
161 | +echo ARG7=$7 # bus service name of evolution-source-registry |
162 | +echo ARG7=$8 # full executable path of gvfs |
163 | +echo ARG8=$9 # config files |
164 | |
165 | # set up the tmpdir and tell the shell to purge it when we exit |
166 | export TEST_TMP_DIR=$(mktemp -p "${TMPDIR:-/tmp}" -d $3-XXXXXXXXXX) || exit 1 |
167 | @@ -38,10 +39,9 @@ |
168 | |
169 | # run dbus-test-runner |
170 | $1 --keep-env --max-wait=90 \ |
171 | ---task $2 --task-name $3 --wait-until-complete --wait-for=org.gnome.evolution.dataserver.Calendar4 \ |
172 | ---task $4 --task-name "evolution" --wait-until-complete --wait-for=org.gnome.evolution.dataserver.Sources3 -r \ |
173 | +--task $2 --task-name $3 --wait-until-complete --wait-for=$5 \ |
174 | +--task $4 --task-name "evolution" --wait-until-complete --wait-for=$7 -r \ |
175 | --task $6 --task-name "source-registry" -r |
176 | -#--task $7 --task-name "gvfsd" -r |
177 | rv=$? |
178 | |
179 | # if the test passed, blow away the tmpdir |
FAILED: Continuous integration, rev:90 jenkins. qa.ubuntu. com/job/ qtorganizer5- eds-ci/ 222/ jenkins. qa.ubuntu. com/job/ qtorganizer5- eds-vivid- amd64-ci/ 29/console jenkins. qa.ubuntu. com/job/ qtorganizer5- eds-vivid- armhf-ci/ 29/console jenkins. qa.ubuntu. com/job/ qtorganizer5- eds-vivid- i386-ci/ 29/console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/qtorganizer 5-eds-ci/ 222/rebuild
http://