I have made the following changes intended for : CE:MW:Shared / contactsd
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/6797 Thank You, John Brooks [This message was auto-generated] --- Request # 6797: Messages from BOSS: State: review at 2012-09-26T17:44:20 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:special:branches:CE:MW:Shared / contactsd -> CE:MW:Shared / contactsd changes files: -------------- --- contactsd.changes +++ contactsd.changes @@ -0,0 +1,4 @@ +* Wed Sep 26 2012 John Brooks <[email protected]> - 1.1.1 +- Add 0001-Fix-header-path-for-new-versions-of-telepathy-qt4.patch +- Add 0001-Use-mlocale-instead-of-meegotouch-for-birthday-plugi.patch + new: ---- 0001-Fix-header-path-for-new-versions-of-telepathy-qt4.patch 0001-Use-mlocale-instead-of-meegotouch-for-birthday-plugi.patch spec files: ----------- --- contactsd.spec +++ contactsd.spec @@ -10,6 +10,8 @@ Source1: contactsd.desktop Source2: contactsd.service Patch0: 0001-Move-tests-according-to-Mer-packaging-guidelines.patch +Patch1: 0001-Fix-header-path-for-new-versions-of-telepathy-qt4.patch +Patch2: 0001-Use-mlocale-instead-of-meegotouch-for-birthday-plugi.patch BuildRequires: pkgconfig(qmsystem2) BuildRequires: pkgconfig(QtCore) BuildRequires: pkgconfig(QtSparql) @@ -18,8 +20,9 @@ BuildRequires: pkgconfig(TelepathyQt4) BuildRequires: pkgconfig(QtContacts) BuildRequires: pkgconfig(cubi-0.1) -#TODO: try to get it working with pkgconfig(mlite) +# meegotouch required only for tests BuildRequires: pkgconfig(meegotouch) +BuildRequires: pkgconfig(mlocale) BuildRequires: pkgconfig(libmkcal) BuildRequires: pkgconfig(telepathy-glib) BuildRequires: libcubi-tracker-ontologies-devel @@ -71,6 +74,8 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build other changes: -------------- ++++++ 0001-Fix-header-path-for-new-versions-of-telepathy-qt4.patch (new) --- 0001-Fix-header-path-for-new-versions-of-telepathy-qt4.patch +++ 0001-Fix-header-path-for-new-versions-of-telepathy-qt4.patch @@ -0,0 +1,265 @@ +From 0863564c4346b97827ad391b14c69ad5317f0ad3 Mon Sep 17 00:00:00 2001 +From: John Brooks <[email protected]> +Date: Wed, 26 Sep 2012 09:40:44 -0600 +Subject: [PATCH] Fix header path for new versions of telepathy-qt4 + +--- + plugins/telepathy/cdtpaccount.cpp | 10 +++++----- + plugins/telepathy/cdtpaccount.h | 10 +++++----- + plugins/telepathy/cdtpcontact.cpp | 4 ++-- + plugins/telepathy/cdtpcontact.h | 6 +++--- + plugins/telepathy/cdtpcontroller.cpp | 18 +++++++++--------- + plugins/telepathy/cdtpcontroller.h | 2 +- + plugins/telepathy/cdtpplugin.cpp | 2 +- + plugins/telepathy/cdtpstorage.cpp | 8 ++++---- + plugins/telepathy/types.h | 2 +- + tests/ut_telepathyplugin/test-expectation.h | 2 +- + tests/ut_telepathyplugin/test-telepathy-plugin.cpp | 2 +- + tests/ut_telepathyplugin/test-telepathy-plugin.h | 2 +- + tests/ut_telepathyplugin/test.cpp | 12 ++++++------ + tests/ut_telepathyplugin/test.h | 6 +++--- + 14 files changed, 43 insertions(+), 43 deletions(-) + +diff --git a/plugins/telepathy/cdtpaccount.cpp b/plugins/telepathy/cdtpaccount.cpp +index a028a41..98c4a8d 100644 +--- a/plugins/telepathy/cdtpaccount.cpp ++++ b/plugins/telepathy/cdtpaccount.cpp +@@ -21,11 +21,11 @@ + ** conditions contained in a signed written agreement between you and Nokia. + **/ + +-#include <TelepathyQt4/ContactManager> +-#include <TelepathyQt4/PendingContacts> +-#include <TelepathyQt4/PendingOperation> +-#include <TelepathyQt4/PendingReady> +-#include <TelepathyQt4/Profile> ++#include <TelepathyQt/ContactManager> ++#include <TelepathyQt/PendingContacts> ++#include <TelepathyQt/PendingOperation> ++#include <TelepathyQt/PendingReady> ++#include <TelepathyQt/Profile> + + #include "cdtpaccount.h" + #include "cdtpaccountcacheloader.h" +diff --git a/plugins/telepathy/cdtpaccount.h b/plugins/telepathy/cdtpaccount.h +index 512ebd1..407bd75 100644 +--- a/plugins/telepathy/cdtpaccount.h ++++ b/plugins/telepathy/cdtpaccount.h +@@ -26,11 +26,11 @@ + + #include <QObject> + +-#include <TelepathyQt4/Account> +-#include <TelepathyQt4/Constants> +-#include <TelepathyQt4/Contact> +-#include <TelepathyQt4/Types> +-#include <TelepathyQt4/PendingOperation> ++#include <TelepathyQt/Account> ++#include <TelepathyQt/Constants> ++#include <TelepathyQt/Contact> ++#include <TelepathyQt/Types> ++#include <TelepathyQt/PendingOperation> + + #include "types.h" + #include "cdtpcontact.h" +diff --git a/plugins/telepathy/cdtpcontact.cpp b/plugins/telepathy/cdtpcontact.cpp +index 9298017..cf2b7b6 100644 +--- a/plugins/telepathy/cdtpcontact.cpp ++++ b/plugins/telepathy/cdtpcontact.cpp +@@ -21,8 +21,8 @@ + ** conditions contained in a signed written agreement between you and Nokia. + **/ + +-#include <TelepathyQt4/AvatarData> +-#include <TelepathyQt4/ContactCapabilities> ++#include <TelepathyQt/AvatarData> ++#include <TelepathyQt/ContactCapabilities> + + #include "cdtpaccount.h" + #include "cdtpcontact.h" +diff --git a/plugins/telepathy/cdtpcontact.h b/plugins/telepathy/cdtpcontact.h +index e0fb92a..610cd7f 100644 +--- a/plugins/telepathy/cdtpcontact.h ++++ b/plugins/telepathy/cdtpcontact.h +@@ -26,9 +26,9 @@ + + #include <QObject> + +-#include <TelepathyQt4/Contact> +-#include <TelepathyQt4/Presence> +-#include <TelepathyQt4/Types> ++#include <TelepathyQt/Contact> ++#include <TelepathyQt/Presence> ++#include <TelepathyQt/Types> + + #include "types.h" + +diff --git a/plugins/telepathy/cdtpcontroller.cpp b/plugins/telepathy/cdtpcontroller.cpp +index f929eaf..83453a4 100644 +--- a/plugins/telepathy/cdtpcontroller.cpp ++++ b/plugins/telepathy/cdtpcontroller.cpp +@@ -21,15 +21,15 @@ + ** conditions contained in a signed written agreement between you and Nokia. + **/ + +-#include <TelepathyQt4/Account> +-#include <TelepathyQt4/AccountPropertyFilter> +-#include <TelepathyQt4/AndFilter> +-#include <TelepathyQt4/NotFilter> +-#include <TelepathyQt4/AccountSet> +-#include <TelepathyQt4/AccountManager> +-#include <TelepathyQt4/PendingReady> +-#include <TelepathyQt4/ContactManager> +-#include <TelepathyQt4/PendingContacts> ++#include <TelepathyQt/Account> ++#include <TelepathyQt/AccountPropertyFilter> ++#include <TelepathyQt/AndFilter> ++#include <TelepathyQt/NotFilter> ++#include <TelepathyQt/AccountSet> ++#include <TelepathyQt/AccountManager> ++#include <TelepathyQt/PendingReady> ++#include <TelepathyQt/ContactManager> ++#include <TelepathyQt/PendingContacts> + + #include "buddymanagementadaptor.h" + #include "cdtpcontroller.h" +diff --git a/plugins/telepathy/cdtpcontroller.h b/plugins/telepathy/cdtpcontroller.h +index 9f8d613..a11223f 100644 +--- a/plugins/telepathy/cdtpcontroller.h ++++ b/plugins/telepathy/cdtpcontroller.h +@@ -28,7 +28,7 @@ + #include "cdtpcontact.h" + #include "cdtpstorage.h" + +-#include <TelepathyQt4/Types> ++#include <TelepathyQt/Types> + + #include <QList> + #include <QObject> +diff --git a/plugins/telepathy/cdtpplugin.cpp b/plugins/telepathy/cdtpplugin.cpp +index e6fee0c..786e7ce 100644 +--- a/plugins/telepathy/cdtpplugin.cpp ++++ b/plugins/telepathy/cdtpplugin.cpp +@@ -21,7 +21,7 @@ + ** conditions contained in a signed written agreement between you and Nokia. + **/ + +-#include <TelepathyQt4/Debug> ++#include <TelepathyQt/Debug> + + #include "cdtpcontroller.h" + #include "cdtpplugin.h" +diff --git a/plugins/telepathy/cdtpstorage.cpp b/plugins/telepathy/cdtpstorage.cpp +index 2074ecf..d947f46 100644 +--- a/plugins/telepathy/cdtpstorage.cpp ++++ b/plugins/telepathy/cdtpstorage.cpp +@@ -23,10 +23,10 @@ + + #include <tracker-sparql.h> + +-#include <TelepathyQt4/AvatarData> +-#include <TelepathyQt4/ContactCapabilities> +-#include <TelepathyQt4/ContactManager> +-#include <TelepathyQt4/ConnectionCapabilities> ++#include <TelepathyQt/AvatarData> ++#include <TelepathyQt/ContactCapabilities> ++#include <TelepathyQt/ContactManager> ++#include <TelepathyQt/ConnectionCapabilities> + #include <qtcontacts-tracker/phoneutils.h> + #include <qtcontacts-tracker/garbagecollector.h> + #include <ontologies.h> +diff --git a/plugins/telepathy/types.h b/plugins/telepathy/types.h +index 565987c..5c4a0ff 100644 +--- a/plugins/telepathy/types.h ++++ b/plugins/telepathy/types.h +@@ -24,7 +24,7 @@ + #ifndef TYPES_H + #define TYPES_H + +-#include <TelepathyQt4/SharedPtr> ++#include <TelepathyQt/SharedPtr> + + class CDTpAccount; + class CDTpContact; +diff --git a/tests/ut_telepathyplugin/test-expectation.h b/tests/ut_telepathyplugin/test-expectation.h +index 6c768ff..ee36dba 100644 +--- a/tests/ut_telepathyplugin/test-expectation.h ++++ b/tests/ut_telepathyplugin/test-expectation.h +@@ -29,7 +29,7 @@ + #include <QContactManager> + #include <QContact> + +-#include <TelepathyQt4/SharedPtr> ++#include <TelepathyQt/SharedPtr> + + #include <telepathy-glib/telepathy-glib.h> + #include "libtelepathy/contacts-conn.h" +diff --git a/tests/ut_telepathyplugin/test-telepathy-plugin.cpp b/tests/ut_telepathyplugin/test-telepathy-plugin.cpp +index 75c0603..4c60ae1 100644 +--- a/tests/ut_telepathyplugin/test-telepathy-plugin.cpp (66 more lines skipped) ++++++ 0001-Use-mlocale-instead-of-meegotouch-for-birthday-plugi.patch (new) --- 0001-Use-mlocale-instead-of-meegotouch-for-birthday-plugi.patch +++ 0001-Use-mlocale-instead-of-meegotouch-for-birthday-plugi.patch @@ -0,0 +1,43 @@ +From 74c80bc4fb65831e2eda9c643089337284455443 Mon Sep 17 00:00:00 2001 +From: John Brooks <[email protected]> +Date: Wed, 26 Sep 2012 10:01:39 -0600 +Subject: [PATCH] Use mlocale instead of meegotouch for birthday plugin + +--- + plugins/birthday/birthday.pro | 7 ++++++- + plugins/birthday/cdbirthdaycalendar.cpp | 1 + + 2 files changed, 7 insertions(+), 1 deletion(-) + +diff --git a/plugins/birthday/birthday.pro b/plugins/birthday/birthday.pro +index 7d9ab70..ead48ef 100644 +--- a/plugins/birthday/birthday.pro ++++ b/plugins/birthday/birthday.pro +@@ -23,7 +23,12 @@ + TEMPLATE = lib + QT -= gui + +-CONFIG += plugin qtsparql qtsparql-tracker-extensions qtcontacts_extensions_tracker cubi-0.1-tracker-0.10-ontologies meegotouch mkcal ++# Hack: mkcal adds /usr/include/meegotouch to include path, and alphabetic CONFIG ++# always puts that before mlocale, resulting in link errors. Force mlocale to be ++# first. ++INCLUDEPATH += /usr/include/mlocale ++ ++CONFIG += plugin qtsparql qtsparql-tracker-extensions qtcontacts_extensions_tracker cubi-0.1-tracker-0.10-ontologies mlocale mkcal + + CONFIG(coverage):{ + QMAKE_CXXFLAGS += -c -g --coverage -ftest-coverage -fprofile-arcs +diff --git a/plugins/birthday/cdbirthdaycalendar.cpp b/plugins/birthday/cdbirthdaycalendar.cpp +index f8b0968..9e163c6 100644 +--- a/plugins/birthday/cdbirthdaycalendar.cpp ++++ b/plugins/birthday/cdbirthdaycalendar.cpp +@@ -34,6 +34,7 @@ + #include "debug.h" + + using namespace Contactsd; ++using namespace ML10N; + + // A random ID. + const QLatin1String calNotebookId("b1376da7-5555-1111-2222-227549c4e570"); +-- +1.7.9.5 +
