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

[Iain Lane]

Adapt to API changes and new D-Bus service names in e-d-s 3.16

Test built in https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/landing-028/+packages

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)]

FAILED: Continuous integration, rev:90
http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-ci/222/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-amd64-ci/29/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-armhf-ci/29/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-i386-ci/29/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtorganizer5-eds-ci/222/rebuild

review: Needs Fixing (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

Which ubuntu version contains this eds version?

[Iain Lane (laney)]

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-train-ppa-service/landing-028

--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]

[Iain Lane (laney)]

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-train-ppa-service/landing-028

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)]

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).

[lp:~laney/qtorganizer5-eds/eds3.16]

91. By Iain Lane on 2015-07-20

merge lp:~renatofilho/qtorganizer5-eds/eds3.16-vivid to stay compatible with vivid + wily

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:91
http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-ci/223/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-amd64-ci/30/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-armhf-ci/30/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-i386-ci/30/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtorganizer5-eds-ci/223/rebuild

review: Needs Fixing (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

Looks good. Just a small comment. Check the inline comments

[lp:~laney/qtorganizer5-eds/eds3.16]

92. By Iain Lane on 2015-07-23

Build with e-d-s 3.12 too

[Iain Lane (laney)]

On Thu, Jul 23, 2015 at 01:43:25PM -0000, Renato Araujo Oliveira Filho wrote:
> > + libedataserver1.2-dev (>= 3.16),
>
> 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)]

FAILED: Continuous integration, rev:92
http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-ci/224/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-amd64-ci/31/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-armhf-ci/31/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-i386-ci/31/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtorganizer5-eds-ci/224/rebuild

review: Needs Fixing (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

> On Thu, Jul 23, 2015 at 01:43:25PM -0000, Renato Araujo Oliveira Filho wrote:
> > > + libedataserver1.2-dev (>= 3.16),
> >
> > Could we change that to the version present in vivid?
>
> Yeah OK, done!
>
Could you do the same for: libecal1.2-dev (>= 3.16),

[lp:~laney/qtorganizer5-eds/eds3.16]

93. By Iain Lane on 2015-07-23

And for libecal

[Iain Lane (laney)]

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.2-dev (>= 3.16),
> > >
> > > 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)]

FAILED: Continuous integration, rev:93
http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-ci/225/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-amd64-ci/32/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-armhf-ci/32
        deb: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-armhf-ci/32/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-i386-ci/32/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtorganizer5-eds-ci/225/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:93
http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-ci/226/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-amd64-ci/33/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-armhf-ci/33
        deb: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-armhf-ci/33/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-i386-ci/33/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtorganizer5-eds-ci/226/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:93
http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-ci/227/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-amd64-ci/34/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-armhf-ci/34
        deb: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-armhf-ci/34/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-i386-ci/34/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtorganizer5-eds-ci/227/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:93
http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-ci/228/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-amd64-ci/35/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-armhf-ci/35/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-i386-ci/35/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtorganizer5-eds-ci/228/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:93
http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-ci/229/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-amd64-ci/36/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-armhf-ci/36/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-i386-ci/36/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtorganizer5-eds-ci/229/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:93
http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-ci/230/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-amd64-ci/37/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-armhf-ci/37
        deb: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-armhf-ci/37/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-i386-ci/37

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtorganizer5-eds-ci/230/rebuild

review: Needs Fixing (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

looks good to me.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-03-30 17:59:13 +0000
+++ CMakeLists.txt	2015-07-23 14:16:00 +0000
@@ -64,13 +64,19 @@
              PATHS /usr/lib/evolution/)
 find_program(GVFSD gvfsd
              PATHS /usr/lib/gvfs/)
+
+if(EDATASERVER_VERSION VERSION_LESS "3.16")
+    set(EVOLUTION_API_3_17 "0")
+    set(EVOLUTION_SOURCE_SERVICE_NAME "org.gnome.evolution.dataserver.Sources3")
+    set(EVOLUTION_CALENDAR_SERVICE_NAME "org.gnome.evolution.dataserver.Calendar4")
+else()
+    set(EVOLUTION_API_3_17 "1")
+    set(EVOLUTION_SOURCE_SERVICE_NAME "org.gnome.evolution.dataserver.Sources4")
+    set(EVOLUTION_CALENDAR_SERVICE_NAME "org.gnome.evolution.dataserver.Calendar7")
+endif()
+
 configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 
-OPTION(EVOLUTION_SOURCE_SERVICE_NAME "DBus name for source registry")
-if(NOT EVOLUTION_SOURCE_SERVICE_NAME)
-    set(EVOLUTION_SOURCE_SERVICE_NAME "org.gnome.evolution.dataserver.Sources3")
-endif()
-
 add_subdirectory(organizer)
 if(DBUS_RUNNER)
     if(EVOLUTION_CALENDAR_FACTORY)
 
=== modified file 'config.h.in'
--- config.h.in	2014-05-26 20:43:55 +0000
+++ config.h.in	2015-07-23 14:16:00 +0000
@@ -1,9 +1,18 @@
 #ifndef __CONFIG_H__
 #define __CONFIG_H__
 
-#define TMP_DIR                     "@TMP_DIR@"
-#define EVOLUTION_CALENDAR_FACTORY  "@EVOLUTION_CALENDAR_FACTORY@"
-#define EVOLUTION_CALENDAR_SERVICE  "org.gnome.evolution.dataserver.Calendar4"
-#define QORGANIZER_DEV_PATH         "@CMAKE_BINARY_DIR@"
+#define TMP_DIR                         "@TMP_DIR@"
+#define EVOLUTION_CALENDAR_FACTORY      "@EVOLUTION_CALENDAR_FACTORY@"
+#define EVOLUTION_CALENDAR_SERVICE_NAME "@EVOLUTION_CALENDAR_SERVICE@"
+#define QORGANIZER_DEV_PATH             "@CMAKE_BINARY_DIR@"
+#define EVOLUTION_API_3_17               @EVOLUTION_API_3_17@
+
+#if EVOLUTION_API_3_17
+    #define E_CAL_CLIENT_CONNECT_SYNC(SOURCE, SOURCE_TYPE, CANCELLABLE, ERROR) \
+            e_cal_client_connect_sync(SOURCE, SOURCE_TYPE, -1, CANCELLABLE, ERROR)
+#else
+    #define E_CAL_CLIENT_CONNECT_SYNC(SOURCE, SOURCE_TYPE, CANCELLABLE, ERROR) \
+            e_cal_client_connect_sync(SOURCE, SOURCE_TYPE, CANCELLABLE, ERROR)
+#endif
 
 #endif
 
=== modified file 'debian/control'
--- debian/control	2014-09-22 14:20:47 +0000
+++ debian/control	2015-07-23 14:16:00 +0000
@@ -4,8 +4,8 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: cmake (>= 2.8.9),
                debhelper (>= 9),
-               libecal1.2-dev,
-               libedataserver1.2-dev,
+               libecal1.2-dev (>= 3.12),
+               libedataserver1.2-dev (>= 3.12),
                qt5-default,
                qt5-qmake,
                qtbase5-dev,
 
=== modified file 'organizer/CMakeLists.txt'
--- organizer/CMakeLists.txt	2014-02-25 17:12:32 +0000
+++ organizer/CMakeLists.txt	2015-07-23 14:16:00 +0000
@@ -49,7 +49,7 @@
 )
 
 include_directories(
-    ${CMAKE_SOURCE_DIR}
+    ${CMAKE_BINARY_DIR}
     ${GLIB_INCLUDE_DIRS}
     ${GIO_INCLUDE_DIRS}
     ${ECAL_INCLUDE_DIRS}
 
=== modified file 'organizer/qorganizer-eds-engine.cpp'
--- organizer/qorganizer-eds-engine.cpp	2015-05-08 20:01:32 +0000
+++ organizer/qorganizer-eds-engine.cpp	2015-07-23 14:16:00 +0000
@@ -1944,12 +1944,9 @@
 {
     rule->freq = ICAL_MONTHLY_RECURRENCE;
 
-    QList<int> daysOfMonth = qRule.daysOfMonth().toList();
     int c = 0;
-    for (int d=1; d < ICAL_BY_MONTHDAY_SIZE; d++) {
-        if (daysOfMonth.contains(d)) {
-            rule->by_month_day[c++] = d;
-        }
+    Q_FOREACH(int daysOfMonth, qRule.daysOfMonth()) {
+        rule->by_month_day[c++] = daysOfMonth;
     }
     for (int d = c; d < ICAL_BY_MONTHDAY_SIZE; d++) {
         rule->by_month_day[d] = ICAL_RECURRENCE_ARRAY_MAX;
 
=== modified file 'organizer/qorganizer-eds-source-registry.cpp'
--- organizer/qorganizer-eds-source-registry.cpp	2015-04-09 15:16:39 +0000
+++ organizer/qorganizer-eds-source-registry.cpp	2015-07-23 14:16:00 +0000
@@ -1,4 +1,5 @@
 #include "qorganizer-eds-source-registry.h"
+#include "config.h"
 
 #include <QtCore/QDebug>
 
@@ -177,7 +178,8 @@
         QOrganizerEDSCollectionEngineId *eid = m_collectionsMap[collectionId];
         if (eid) {
             GError *gError = 0;
-            client = e_cal_client_connect_sync(eid->m_esource, eid->m_sourceType, 0, &gError);
+
+            client = E_CAL_CLIENT_CONNECT_SYNC(eid->m_esource, eid->m_sourceType, 0, &gError);
             if (gError) {
                 qWarning() << "Fail to connect with client" << gError->message;
                 g_error_free(gError);
 
=== modified file 'tests/unittest/CMakeLists.txt'
--- tests/unittest/CMakeLists.txt	2015-05-08 20:01:32 +0000
+++ tests/unittest/CMakeLists.txt	2015-07-23 14:16:00 +0000
@@ -22,8 +22,8 @@
 
     add_test(${TESTNAME}
              ${CMAKE_CURRENT_SOURCE_DIR}/run-eds-test.sh ${DBUS_RUNNER} ${CMAKE_CURRENT_BINARY_DIR}/${TESTNAME} ${TESTNAME}
-             ${EVOLUTION_CALENDAR_FACTORY} ${EVOLUTION_SOURCE_SERVICE_NAME}
-             ${EVOLUTION_SOURCE_REGISTRY}
+             ${EVOLUTION_CALENDAR_FACTORY} ${EVOLUTION_CALENDAR_SERVICE_NAME}
+             ${EVOLUTION_SOURCE_REGISTRY}  ${EVOLUTION_SOURCE_SERVICE_NAME}
              ${GVFSD})
 endmacro(declare_test testname)
 
 
=== modified file 'tests/unittest/eds-base-test.cpp'
--- tests/unittest/eds-base-test.cpp	2015-04-09 14:00:57 +0000
+++ tests/unittest/eds-base-test.cpp	2015-07-23 14:16:00 +0000
@@ -90,7 +90,7 @@
         calendar.reset(e_source_registry_ref_source(sourceRegistry.data(),
                                                     collectionId.toString().toUtf8().data()));
     }
-    GScopedPointer<EClient> client(e_cal_client_connect_sync(calendar.data(),
+    GScopedPointer<EClient> client(E_CAL_CLIENT_CONNECT_SYNC(calendar.data(),
                                                              E_CAL_CLIENT_SOURCE_TYPE_EVENTS,
                                                              0,
                                                              &error));
 
=== modified file 'tests/unittest/run-eds-test.sh'
--- tests/unittest/run-eds-test.sh	2015-04-09 19:05:11 +0000
+++ tests/unittest/run-eds-test.sh	2015-07-23 14:16:00 +0000
@@ -7,8 +7,9 @@
 echo ARG4=$4 # full executable path of evolution-calendar-factory
 echo ARG5=$5 # bus service name of calendar factory
 echo ARG6=$6 # full exectuable path of evolution-source-registry
-echo ARG7=$7 # full executable path of gvfs
-echo ARG8=$8 # config files
+echo ARG7=$7 # bus service name of evolution-source-registry
+echo ARG7=$8 # full executable path of gvfs
+echo ARG8=$9 # config files
 
 # set up the tmpdir and tell the shell to purge it when we exit
 export TEST_TMP_DIR=$(mktemp -p "${TMPDIR:-/tmp}" -d $3-XXXXXXXXXX) || exit 1
@@ -38,10 +39,9 @@
 
 # run dbus-test-runner
 $1 --keep-env --max-wait=90 \
---task $2 --task-name $3 --wait-until-complete --wait-for=org.gnome.evolution.dataserver.Calendar4 \
---task $4 --task-name "evolution" --wait-until-complete --wait-for=org.gnome.evolution.dataserver.Sources3 -r \
+--task $2 --task-name $3 --wait-until-complete --wait-for=$5 \
+--task $4 --task-name "evolution" --wait-until-complete --wait-for=$7 -r \
 --task $6 --task-name "source-registry" -r
-#--task $7 --task-name "gvfsd" -r
 rv=$?
 
 # if the test passed, blow away the tmpdir