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/7401 Thank You, John Brooks [This message was auto-generated] --- Request # 7401: Messages from BOSS: State: review at 2012-11-16T23:47: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 @@ +* Fri Nov 16 2012 John Brooks <[email protected]> - 1.1.1 +- Add 0001-Replace-meegotouch-with-mlite-in-unit-tests.patch +- Remove meegotouch build dependency + new: ---- 0001-Replace-meegotouch-with-mlite-and-mlocale-in-unit-te.patch spec files: ----------- --- contactsd.spec +++ contactsd.spec @@ -13,6 +13,7 @@ Patch1: 0001-Fix-header-path-for-new-versions-of-telepathy-qt4.patch Patch2: 0001-Use-mlocale-instead-of-meegotouch-for-birthday-plugi.patch Patch3: 0001-compile-against-tracker-0-14.patch +Patch4: 0001-Replace-meegotouch-with-mlite-and-mlocale-in-unit-te.patch BuildRequires: pkgconfig(qmsystem2) BuildRequires: pkgconfig(QtCore) BuildRequires: pkgconfig(QtSparql) @@ -21,8 +22,8 @@ BuildRequires: pkgconfig(TelepathyQt4) BuildRequires: pkgconfig(QtContacts) BuildRequires: pkgconfig(cubi-0.1) -# meegotouch required only for tests -BuildRequires: pkgconfig(meegotouch) +# mlite required only for tests +BuildRequires: pkgconfig(mlite) BuildRequires: pkgconfig(mlocale) BuildRequires: pkgconfig(libmkcal) BuildRequires: pkgconfig(telepathy-glib) @@ -78,6 +79,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build ./configure --bindir %{_bindir} --libdir %{_libdir} --includedir %{_includedir} other changes: -------------- ++++++ 0001-Replace-meegotouch-with-mlite-and-mlocale-in-unit-te.patch (new) --- 0001-Replace-meegotouch-with-mlite-and-mlocale-in-unit-te.patch +++ 0001-Replace-meegotouch-with-mlite-and-mlocale-in-unit-te.patch @@ -0,0 +1,68 @@ +From 64fefc84b3c605236d81d7d5526ca2b547fa63ab Mon Sep 17 00:00:00 2001 +From: John Brooks <[email protected]> +Date: Fri, 16 Nov 2012 16:25:57 -0700 +Subject: [PATCH] Replace meegotouch with mlite and mlocale in unit tests + +--- + tests/ut_birthdayplugin/test-birthday-plugin.cpp | 11 ++++++----- + tests/ut_birthdayplugin/ut_birthdayplugin.pro | 3 ++- + 2 files changed, 8 insertions(+), 6 deletions(-) + +diff --git a/tests/ut_birthdayplugin/test-birthday-plugin.cpp b/tests/ut_birthdayplugin/test-birthday-plugin.cpp +index 7e95a0a..f66b99f 100644 +--- a/tests/ut_birthdayplugin/test-birthday-plugin.cpp ++++ b/tests/ut_birthdayplugin/test-birthday-plugin.cpp +@@ -28,12 +28,14 @@ + #include <extendedstorage.h> + #include <extendedcalendar.h> + +-#include <MGConfDataStore> ++#include <MGConfItem> + #include <MLocale> + + #include <QContactBirthday> + #include <QContactName> + ++using namespace ML10N; ++ + // A random ID, from plugins/birthday/cdbirthdaycalendar.cpp. + const QLatin1String calNotebookId("b1376da7-5555-1111-2222-227549c4e570"); + +@@ -217,9 +219,8 @@ void TestBirthdayPlugin::testChangeName() + + void TestBirthdayPlugin::testLocaleChange() + { +- MGConfDataStore store(QLatin1String("/meegotouch/i18n")); +- +- store.setValue(QLatin1String("language"), QLatin1String("en")); ++ MGConfItem store(QLatin1String("/meegotouch/i18n/language")); ++ store.set(QLatin1String("en")); + + // Leave the time to react to locale change + loopWait(1000); +@@ -249,7 +250,7 @@ void TestBirthdayPlugin::testLocaleChange() + QCOMPARE(storage->notebook(calNotebookId)->name(), cLocaleCalendarName); + + // Change locale and check name again. +- store.setValue(QLatin1String("language"), QLatin1String("fi")); ++ store.set(QLatin1String("fi")); + + loopWait(calendarTimeout); + +diff --git a/tests/ut_birthdayplugin/ut_birthdayplugin.pro b/tests/ut_birthdayplugin/ut_birthdayplugin.pro +index ec6179b..2f1e5ad 100644 +--- a/tests/ut_birthdayplugin/ut_birthdayplugin.pro ++++ b/tests/ut_birthdayplugin/ut_birthdayplugin.pro +@@ -27,7 +27,8 @@ include(check.pri) + include(tests.pri) + include(../common/test-common.pri) + +-CONFIG += test qtsparql mobility mkcal meegotouch ++CONFIG += test qtsparql mobility mlocale mkcal link_pkgconfig ++PKGCONFIG += mlite + + QT -= gui + QT += testlib +-- +1.7.9.5 +
