I have made the following changes intended for : CE:MW:Shared / commhistory-daemon
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/6786 Thank You, John Brooks [This message was auto-generated] --- Request # 6786: Messages from BOSS: State: review at 2012-09-25T16:22:03 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 / commhistory-daemon -> CE:MW:Shared / commhistory-daemon changes files: -------------- --- commhistory-daemon.changes +++ commhistory-daemon.changes @@ -0,0 +1,3 @@ +* Mon Sep 24 2012 John Brooks <[email protected]> - 0.4.0 +- Use TelepathyQt/ instead of TelepathyQt4/ for headers + new: ---- 0001-Use-TelepathyQt-instead-of-TelepathyQt4-for-headers.patch 0002-Rename-TelepathyQt4-TelepathyQt-in-tests.patch spec files: ----------- --- commhistory-daemon.spec +++ commhistory-daemon.spec @@ -6,6 +6,8 @@ License: LGPL URL: http://gitorious.org/commhistory/commhistory-daemon Source0: %{name}-%{version}.tar.bz2 +Patch0: 0001-Use-TelepathyQt-instead-of-TelepathyQt4-for-headers.patch +Patch1: 0002-Rename-TelepathyQt4-TelepathyQt-in-tests.patch BuildRequires: pkgconfig(QtCore) >= 4.7.0 BuildRequires: pkgconfig(QtContacts) BuildRequires: pkgconfig(commhistory) @@ -33,6 +35,9 @@ %prep %setup -q -n %{name} +%patch0 -p1 +%patch1 -p1 + %build unset LD_AS_NEEDED %qmake other changes: -------------- ++++++ 0001-Use-TelepathyQt-instead-of-TelepathyQt4-for-headers.patch (new) --- 0001-Use-TelepathyQt-instead-of-TelepathyQt4-for-headers.patch +++ 0001-Use-TelepathyQt-instead-of-TelepathyQt4-for-headers.patch @@ -0,0 +1,384 @@ +From 79e0ea79724d6c4adad19b456e7c8bc9fbf4a9f2 Mon Sep 17 00:00:00 2001 +From: John Brooks <[email protected]> +Date: Mon, 24 Sep 2012 10:20:59 -0600 +Subject: [PATCH 1/2] Use TelepathyQt/ instead of TelepathyQt4/ for headers + +This is required for newer versions of telepathy-qt. +--- + src/accountoperationsobserver.cpp | 2 +- + src/accountoperationsobserver.h | 6 +++--- + src/channellistener.cpp | 16 ++++++++-------- + src/channellistener.h | 6 +++--- + src/connectionutils.cpp | 4 ++-- + src/connectionutils.h | 8 ++++---- + src/contactauthorizationlistener.cpp | 6 +++--- + src/contactauthorizationlistener.h | 4 ++-- + src/contactauthorizer.cpp | 10 +++++----- + src/contactauthorizer.h | 8 ++++---- + src/logger.cpp | 8 ++++---- + src/logger.h | 2 +- + src/loggerclientobserver.cpp | 2 +- + src/loggerclientobserver.h | 4 ++-- + src/messagereviver.h | 2 +- + src/notificationmanager.cpp | 2 +- + src/src.pro | 2 +- + src/streamchannellistener.cpp | 2 +- + src/streamchannellistener.h | 2 +- + src/textchannellistener.cpp | 18 +++++++++--------- + tools/qt4-client-gen.py | 6 +++--- + 21 files changed, 60 insertions(+), 60 deletions(-) + +diff --git a/src/accountoperationsobserver.cpp b/src/accountoperationsobserver.cpp +index f7233f2..63198b7 100644 +--- a/src/accountoperationsobserver.cpp ++++ b/src/accountoperationsobserver.cpp +@@ -24,7 +24,7 @@ + #include "accountoperationsobserver.h" + #include "notificationmanager.h" + +-#include <TelepathyQt4/PendingReady> ++#include <TelepathyQt/PendingReady> + + #include <CommHistory/GroupModel> + #include <CommHistory/CallModel> +diff --git a/src/accountoperationsobserver.h b/src/accountoperationsobserver.h +index 2b1ca86..5f1b66f 100644 +--- a/src/accountoperationsobserver.h ++++ b/src/accountoperationsobserver.h +@@ -23,9 +23,9 @@ + #ifndef ACCOUNTOPERATIONSOBSERVER_H + #define ACCOUNTOPERATIONSOBSERVER_H + +-#include <TelepathyQt4/AccountManager> +-#include <TelepathyQt4/Account> +-#include <TelepathyQt4/PendingOperation> ++#include <TelepathyQt/AccountManager> ++#include <TelepathyQt/Account> ++#include <TelepathyQt/PendingOperation> + + namespace CommHistory + { +diff --git a/src/channellistener.cpp b/src/channellistener.cpp +index 03c723d..dddab53 100644 +--- a/src/channellistener.cpp ++++ b/src/channellistener.cpp +@@ -26,14 +26,14 @@ + #include <QDebug> + #include <CommHistory/EventModel> + +-#include <TelepathyQt4/PendingReady> +-#include <TelepathyQt4/TextChannel> +-#include <TelepathyQt4/StreamedMediaChannel> +-#include <TelepathyQt4/Channel> +-#include <TelepathyQt4/ContactManager> +-#include <TelepathyQt4/PendingContacts> +-#include <TelepathyQt4/Types> +-#include <TelepathyQt4/Contact> ++#include <TelepathyQt/PendingReady> ++#include <TelepathyQt/TextChannel> ++#include <TelepathyQt/StreamedMediaChannel> ++#include <TelepathyQt/Channel> ++#include <TelepathyQt/ContactManager> ++#include <TelepathyQt/PendingContacts> ++#include <TelepathyQt/Types> ++#include <TelepathyQt/Contact> + + using namespace RTComLogger; + +diff --git a/src/channellistener.h b/src/channellistener.h +index f094f85..96828bf 100644 +--- a/src/channellistener.h ++++ b/src/channellistener.h +@@ -24,9 +24,9 @@ + #define CHANNEL_LISTENER_H + + #include <CommHistory/Event> +-#include <TelepathyQt4/Types> +-#include <TelepathyQt4/Channel> +-#include <TelepathyQt4/Account> ++#include <TelepathyQt/Types> ++#include <TelepathyQt/Channel> ++#include <TelepathyQt/Account> + + namespace CommHistory { + class EventModel; +diff --git a/src/connectionutils.cpp b/src/connectionutils.cpp +index edba6f6..237e678 100644 +--- a/src/connectionutils.cpp ++++ b/src/connectionutils.cpp +@@ -23,8 +23,8 @@ + #include "connectionutils.h" + + // Tp +-#include <TelepathyQt4/PendingReady> +-#include <TelepathyQt4/AccountSet> ++#include <TelepathyQt/PendingReady> ++#include <TelepathyQt/AccountSet> + + using namespace RTComLogger; + +diff --git a/src/connectionutils.h b/src/connectionutils.h +index fb12d57..5e4d9e2 100644 +--- a/src/connectionutils.h ++++ b/src/connectionutils.h +@@ -26,10 +26,10 @@ + #include <QObject> + + // Tp includes +-#include <TelepathyQt4/Connection> +-#include <TelepathyQt4/AccountManager> +-#include <TelepathyQt4/Account> +-#include <TelepathyQt4/PendingOperation> ++#include <TelepathyQt/Connection> ++#include <TelepathyQt/AccountManager> ++#include <TelepathyQt/Account> ++#include <TelepathyQt/PendingOperation> + + namespace RTComLogger + { +diff --git a/src/contactauthorizationlistener.cpp b/src/contactauthorizationlistener.cpp +index 6760780..3116219 100644 +--- a/src/contactauthorizationlistener.cpp ++++ b/src/contactauthorizationlistener.cpp +@@ -26,9 +26,9 @@ + #include "constants.h" + + // Tp +-#include <TelepathyQt4/PendingReady> +-#include <TelepathyQt4/AccountManager> +-#include <TelepathyQt4/AccountSet> ++#include <TelepathyQt/PendingReady> ++#include <TelepathyQt/AccountManager> ++#include <TelepathyQt/AccountSet> + + // Meego + #include <MNotification> +diff --git a/src/contactauthorizationlistener.h b/src/contactauthorizationlistener.h +index 9c874b3..e55c72a 100644 +--- a/src/contactauthorizationlistener.h ++++ b/src/contactauthorizationlistener.h +@@ -27,8 +27,8 @@ + #include <QStringList> + + // Tp +-#include <TelepathyQt4/Connection> +-#include <TelepathyQt4/AccountManager> ++#include <TelepathyQt/Connection> ++#include <TelepathyQt/AccountManager> + + #include "contactauthorizer.h" + +diff --git a/src/contactauthorizer.cpp b/src/contactauthorizer.cpp +index c4b7f4c..ce53382 100644 +--- a/src/contactauthorizer.cpp ++++ b/src/contactauthorizer.cpp +@@ -35,11 +35,11 @@ + #include <MRemoteAction> + + // Tp +-#include <TelepathyQt4/AvatarData> +-#include <TelepathyQt4/ContactManager> +-#include <TelepathyQt4/PendingReady> +-#include <TelepathyQt4/PendingContacts> +-#include <TelepathyQt4/Contact> ++#include <TelepathyQt/AvatarData> ++#include <TelepathyQt/ContactManager> ++#include <TelepathyQt/PendingReady> ++#include <TelepathyQt/PendingContacts> ++#include <TelepathyQt/Contact> + + // constants + static const char* AuthorizationNotificationType = "x-nokia.messaging.authorizationrequest"; +diff --git a/src/contactauthorizer.h b/src/contactauthorizer.h +index 3fb9a8c..60d79a0 100644 +--- a/src/contactauthorizer.h ++++ b/src/contactauthorizer.h +@@ -28,10 +28,10 @@ + #include <QHash> + + // Tp (185 more lines skipped) ++++++ 0002-Rename-TelepathyQt4-TelepathyQt-in-tests.patch (new) --- 0002-Rename-TelepathyQt4-TelepathyQt-in-tests.patch +++ 0002-Rename-TelepathyQt4-TelepathyQt-in-tests.patch @@ -0,0 +1,18767 @@ +From bff9f2be3bc5b49834f8d7f44d925d856b8b1a94 Mon Sep 17 00:00:00 2001 +From: John Brooks <[email protected]> +Date: Mon, 24 Sep 2012 10:27:29 -0600 +Subject: [PATCH 2/2] Rename TelepathyQt4 -> TelepathyQt in tests + +I hope this is correct, but I don't claim to understand the tests +being used here. +--- + tests/stubs/TelepathyQt/AbstractInterface | 13 + + tests/stubs/TelepathyQt/Account | 7 + + tests/stubs/TelepathyQt/AccountManager | 8 + + tests/stubs/TelepathyQt/AccountSet | 7 + + tests/stubs/TelepathyQt/Channel | 13 + + tests/stubs/TelepathyQt/Connection | 7 + + tests/stubs/TelepathyQt/Constants | 7 + + tests/stubs/TelepathyQt/Contact | 13 + + tests/stubs/TelepathyQt/ContactManager | 13 + + tests/stubs/TelepathyQt/DBusProxy | 13 + + tests/stubs/TelepathyQt/Global | 7 + + tests/stubs/TelepathyQt/Message | 13 + + tests/stubs/TelepathyQt/MethodInvocationContext | 13 + + tests/stubs/TelepathyQt/PendingContacts | 7 + + tests/stubs/TelepathyQt/PendingOperation | 7 + + tests/stubs/TelepathyQt/PendingReady | 7 + + tests/stubs/TelepathyQt/Presence | 13 + + tests/stubs/TelepathyQt/Properties | 8 + + tests/stubs/TelepathyQt/ReadyObject | 13 + + tests/stubs/TelepathyQt/ReferencedHandles | 12 + + tests/stubs/TelepathyQt/StreamedMediaChannel | 7 + + tests/stubs/TelepathyQt/TextChannel | 9 + + tests/stubs/TelepathyQt/Types | 7 + + tests/stubs/TelepathyQt/abstract-interface.h | 68 + + tests/stubs/TelepathyQt/account-manager.cpp | 45 + + tests/stubs/TelepathyQt/account-manager.h | 36 + + tests/stubs/TelepathyQt/account-set.cpp | 37 + + tests/stubs/TelepathyQt/account-set.h | 48 + + tests/stubs/TelepathyQt/account.cpp | 59 + + tests/stubs/TelepathyQt/account.h | 47 + + tests/stubs/TelepathyQt/channel.cpp | 142 + + tests/stubs/TelepathyQt/channel.h | 206 + + tests/stubs/TelepathyQt/cli-properties.cpp | 20 + + tests/stubs/TelepathyQt/cli-properties.h | 139 + + tests/stubs/TelepathyQt/connection.cpp | 58 + + tests/stubs/TelepathyQt/connection.h | 121 + + tests/stubs/TelepathyQt/constants.h | 4803 ++++++++++++++++++++ + tests/stubs/TelepathyQt/contact-manager.cpp | 44 + + tests/stubs/TelepathyQt/contact-manager.h | 76 + + tests/stubs/TelepathyQt/contact.cpp | 89 + + tests/stubs/TelepathyQt/contact.h | 96 + + tests/stubs/TelepathyQt/dbus-proxy.cpp | 5 + + tests/stubs/TelepathyQt/dbus-proxy.h | 89 + + tests/stubs/TelepathyQt/global.h | 102 + + tests/stubs/TelepathyQt/message.cpp | 428 ++ + tests/stubs/TelepathyQt/message.h | 109 + + tests/stubs/TelepathyQt/pending-contacts.cpp | 20 + + tests/stubs/TelepathyQt/pending-contacts.h | 25 + + tests/stubs/TelepathyQt/pending-operation.cpp | 33 + + tests/stubs/TelepathyQt/pending-operation.h | 27 + + tests/stubs/TelepathyQt/pending-ready.cpp | 33 + + tests/stubs/TelepathyQt/pending-ready.h | 28 + + tests/stubs/TelepathyQt/presence.cpp | 61 + + tests/stubs/TelepathyQt/presence.h | 66 + + tests/stubs/TelepathyQt/ready-object.cpp | 40 + + tests/stubs/TelepathyQt/ready-object.h | 64 + + tests/stubs/TelepathyQt/referenced-handles.cpp | 227 + + tests/stubs/TelepathyQt/referenced-handles.h | 256 ++ + tests/stubs/TelepathyQt/streamed-media-channel.cpp | 45 + + tests/stubs/TelepathyQt/streamed-media-channel.h | 120 + + tests/stubs/TelepathyQt/text-channel.cpp | 61 + + tests/stubs/TelepathyQt/text-channel.h | 80 + + tests/stubs/TelepathyQt/types.cpp | 38 + + tests/stubs/TelepathyQt/types.h | 457 ++ + tests/stubs/TelepathyQt4/AbstractInterface | 13 - + tests/stubs/TelepathyQt4/Account | 7 - + tests/stubs/TelepathyQt4/AccountManager | 8 - + tests/stubs/TelepathyQt4/AccountSet | 7 - + tests/stubs/TelepathyQt4/Channel | 13 - + tests/stubs/TelepathyQt4/Connection | 7 - + tests/stubs/TelepathyQt4/Constants | 7 - + tests/stubs/TelepathyQt4/Contact | 13 - + tests/stubs/TelepathyQt4/ContactManager | 13 - + tests/stubs/TelepathyQt4/DBusProxy | 13 - + tests/stubs/TelepathyQt4/Global | 7 - + tests/stubs/TelepathyQt4/Message | 13 - + tests/stubs/TelepathyQt4/MethodInvocationContext | 13 - + tests/stubs/TelepathyQt4/PendingContacts | 7 - + tests/stubs/TelepathyQt4/PendingOperation | 7 - + tests/stubs/TelepathyQt4/PendingReady | 7 - + tests/stubs/TelepathyQt4/Presence | 13 - + tests/stubs/TelepathyQt4/Properties | 8 - + tests/stubs/TelepathyQt4/ReadyObject | 13 - + tests/stubs/TelepathyQt4/ReferencedHandles | 12 - + tests/stubs/TelepathyQt4/StreamedMediaChannel | 7 - + tests/stubs/TelepathyQt4/TextChannel | 9 - + tests/stubs/TelepathyQt4/Types | 7 - + tests/stubs/TelepathyQt4/abstract-interface.h | 68 - + tests/stubs/TelepathyQt4/account-manager.cpp | 45 - + tests/stubs/TelepathyQt4/account-manager.h | 36 - + tests/stubs/TelepathyQt4/account-set.cpp | 37 - + tests/stubs/TelepathyQt4/account-set.h | 48 - + tests/stubs/TelepathyQt4/account.cpp | 59 - + tests/stubs/TelepathyQt4/account.h | 47 - + tests/stubs/TelepathyQt4/channel.cpp | 142 - + tests/stubs/TelepathyQt4/channel.h | 206 - + tests/stubs/TelepathyQt4/cli-properties.cpp | 20 - + tests/stubs/TelepathyQt4/cli-properties.h | 139 - + tests/stubs/TelepathyQt4/connection.cpp | 58 - + tests/stubs/TelepathyQt4/connection.h | 121 - + tests/stubs/TelepathyQt4/constants.h | 4803 -------------------- + tests/stubs/TelepathyQt4/contact-manager.cpp | 44 - + tests/stubs/TelepathyQt4/contact-manager.h | 76 - + tests/stubs/TelepathyQt4/contact.cpp | 89 - + tests/stubs/TelepathyQt4/contact.h | 96 - + tests/stubs/TelepathyQt4/dbus-proxy.cpp | 5 - + tests/stubs/TelepathyQt4/dbus-proxy.h | 89 - + tests/stubs/TelepathyQt4/global.h | 102 - + tests/stubs/TelepathyQt4/message.cpp | 428 -- + tests/stubs/TelepathyQt4/message.h | 109 - + tests/stubs/TelepathyQt4/pending-contacts.cpp | 20 - + tests/stubs/TelepathyQt4/pending-contacts.h | 25 - + tests/stubs/TelepathyQt4/pending-operation.cpp | 33 - + tests/stubs/TelepathyQt4/pending-operation.h | 27 - + tests/stubs/TelepathyQt4/pending-ready.cpp | 33 - + tests/stubs/TelepathyQt4/pending-ready.h | 28 - + tests/stubs/TelepathyQt4/presence.cpp | 61 - + tests/stubs/TelepathyQt4/presence.h | 66 - + tests/stubs/TelepathyQt4/ready-object.cpp | 40 - + tests/stubs/TelepathyQt4/ready-object.h | 64 - + tests/stubs/TelepathyQt4/referenced-handles.cpp | 227 - + tests/stubs/TelepathyQt4/referenced-handles.h | 256 -- + .../stubs/TelepathyQt4/streamed-media-channel.cpp | 45 - + tests/stubs/TelepathyQt4/streamed-media-channel.h | 120 - + tests/stubs/TelepathyQt4/text-channel.cpp | 61 - + tests/stubs/TelepathyQt4/text-channel.h | 80 - + tests/stubs/TelepathyQt4/types.cpp | 38 - + tests/stubs/TelepathyQt4/types.h | 457 -- + tests/stubs/TpExtensions/cli-connection.h | 6 +- + tests/stubs/stubs.pri | 80 +- + tests/ut_messagereviver/ut_messagereviver.cpp | 6 +- + .../ut_streamchannellistener.cpp | 14 +- + .../ut_textchannellistener.cpp | 12 +- + 133 files changed, 8831 insertions(+), 8831 deletions(-) + create mode 100644 tests/stubs/TelepathyQt/AbstractInterface + create mode 100644 tests/stubs/TelepathyQt/Account + create mode 100644 tests/stubs/TelepathyQt/AccountManager + create mode 100644 tests/stubs/TelepathyQt/AccountSet + create mode 100644 tests/stubs/TelepathyQt/Channel + create mode 100644 tests/stubs/TelepathyQt/Connection + create mode 100644 tests/stubs/TelepathyQt/Constants + create mode 100644 tests/stubs/TelepathyQt/Contact + create mode 100644 tests/stubs/TelepathyQt/ContactManager + create mode 100644 tests/stubs/TelepathyQt/DBusProxy + create mode 100644 tests/stubs/TelepathyQt/Global + create mode 100644 tests/stubs/TelepathyQt/Message + create mode 100644 tests/stubs/TelepathyQt/MethodInvocationContext + create mode 100644 tests/stubs/TelepathyQt/PendingContacts + create mode 100644 tests/stubs/TelepathyQt/PendingOperation + create mode 100644 tests/stubs/TelepathyQt/PendingReady + create mode 100644 tests/stubs/TelepathyQt/Presence + create mode 100644 tests/stubs/TelepathyQt/Properties + create mode 100644 tests/stubs/TelepathyQt/ReadyObject + create mode 100644 tests/stubs/TelepathyQt/ReferencedHandles + create mode 100644 tests/stubs/TelepathyQt/StreamedMediaChannel + create mode 100644 tests/stubs/TelepathyQt/TextChannel + create mode 100644 tests/stubs/TelepathyQt/Types + create mode 100644 tests/stubs/TelepathyQt/abstract-interface.h + create mode 100644 tests/stubs/TelepathyQt/account-manager.cpp + create mode 100644 tests/stubs/TelepathyQt/account-manager.h + create mode 100644 tests/stubs/TelepathyQt/account-set.cpp + create mode 100644 tests/stubs/TelepathyQt/account-set.h + create mode 100644 tests/stubs/TelepathyQt/account.cpp + create mode 100644 tests/stubs/TelepathyQt/account.h + create mode 100644 tests/stubs/TelepathyQt/channel.cpp + create mode 100644 tests/stubs/TelepathyQt/channel.h + create mode 100644 tests/stubs/TelepathyQt/cli-properties.cpp + create mode 100644 tests/stubs/TelepathyQt/cli-properties.h + create mode 100644 tests/stubs/TelepathyQt/connection.cpp + create mode 100644 tests/stubs/TelepathyQt/connection.h + create mode 100644 tests/stubs/TelepathyQt/constants.h + create mode 100644 tests/stubs/TelepathyQt/contact-manager.cpp + create mode 100644 tests/stubs/TelepathyQt/contact-manager.h + create mode 100644 tests/stubs/TelepathyQt/contact.cpp + create mode 100644 tests/stubs/TelepathyQt/contact.h + create mode 100644 tests/stubs/TelepathyQt/dbus-proxy.cpp + create mode 100644 tests/stubs/TelepathyQt/dbus-proxy.h + create mode 100644 tests/stubs/TelepathyQt/global.h + create mode 100644 tests/stubs/TelepathyQt/message.cpp + create mode 100644 tests/stubs/TelepathyQt/message.h + create mode 100644 tests/stubs/TelepathyQt/pending-contacts.cpp + create mode 100644 tests/stubs/TelepathyQt/pending-contacts.h + create mode 100644 tests/stubs/TelepathyQt/pending-operation.cpp + create mode 100644 tests/stubs/TelepathyQt/pending-operation.h + create mode 100644 tests/stubs/TelepathyQt/pending-ready.cpp + create mode 100644 tests/stubs/TelepathyQt/pending-ready.h + create mode 100644 tests/stubs/TelepathyQt/presence.cpp + create mode 100644 tests/stubs/TelepathyQt/presence.h + create mode 100644 tests/stubs/TelepathyQt/ready-object.cpp + create mode 100644 tests/stubs/TelepathyQt/ready-object.h + create mode 100644 tests/stubs/TelepathyQt/referenced-handles.cpp (18568 more lines skipped)
