4 files changed, 19 insertions, 49 deletions

diff --git a/net-im/ktp-common-internals/Makefile b/net-im/ktp-common-internals/Makefile
index e65c11d79b88..4c66affd9888 100644
--- a/net-im/ktp-common-internals/Makefile
+++ b/net-im/ktp-common-internals/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	ktp-common-internals
 PORTVERSION=	${KTP_VERSION}
-PORTREVISION=	1
 CATEGORIES=	net-im kde
 MASTER_SITES=	KDE/${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
 
@@ -16,7 +15,7 @@ RUN_DEPENDS=	${LOCALBASE}/libexec/mission-control-5:${PORTSDIR}/net-im/telepathy
 USE_KDE4=	kdeprefix kdelibs pimlibs automoc4
 USE_QT4=	declarative script \
 		moc_build qmake_build rcc_build uic_build
-USES=		cmake gettext tar:bzip2
+USES=		cmake compiler:c++11-lang gettext tar:bzip2
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	KTP_VERSION=${KTP_VERSION}
diff --git a/net-im/ktp-common-internals/distinfo b/net-im/ktp-common-internals/distinfo
index 6516edf15ae6..5a16f1e73ade 100644
--- a/net-im/ktp-common-internals/distinfo
+++ b/net-im/ktp-common-internals/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ktp-common-internals-0.8.0.tar.bz2) = bd8eedb9b5753ad204322e1453a2a7f157643519d2cbbd04759b6da69eb12114
-SIZE (ktp-common-internals-0.8.0.tar.bz2) = 387961
+SHA256 (ktp-common-internals-0.9.0.tar.bz2) = b358d134345225dacddffb2e61177a4819093c55f2ca15c4c3481e1a6e9f9443
+SIZE (ktp-common-internals-0.9.0.tar.bz2) = 439404
diff --git a/net-im/ktp-common-internals/files/patch-KTp__Logger__plugins__tplogger__pending-tp-logger-logs.cpp b/net-im/ktp-common-internals/files/patch-KTp__Logger__plugins__tplogger__pending-tp-logger-logs.cpp
deleted file mode 100644
index 4a9bc1f2263a..000000000000
--- a/net-im/ktp-common-internals/files/patch-KTp__Logger__plugins__tplogger__pending-tp-logger-logs.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-commit 60452d2718f1b5a910dad64d6360d600d4107642
-Author: Dan Vrátil <dvratil@redhat.com>
-Date:   Thu Apr 10 21:08:59 2014 +0200
-
-    Fix build (sorry!)
-
-commit ccd4d133ba4becb7c8662eb3e57612e8aa9773e4
-Author: Dan Vrátil <dvratil@redhat.com>
-Date:   Thu Apr 10 20:58:47 2014 +0200
-
-    Don't crash when TelepathyLoggerQt4 returns a null TextEvent
-
-    Tpl::PendingEvents sometimes returns a list of events that includes a null
-        event, which leads to a crash when we try to dereference it (either by
-            hitting an assert in QtGlib, or by calling methods on a null pointer).
-
-    BUG: 331104
-        FIXED-IN: 0.8.1
---- KTp/Logger/plugins/tplogger/pending-tp-logger-logs.cpp
-+++ KTp/Logger/plugins/tplogger/pending-tp-logger-logs.cpp
-@@ -28,6 +28,8 @@
- 
- #include <KTp/message-processor.h>
- 
-+#include <KDebug>
-+
- PendingTpLoggerLogs::PendingTpLoggerLogs(const Tp::AccountPtr &account,
-                                          const KTp::LogEntity &entity,
-                                          const QDate &date,
-@@ -60,6 +62,11 @@ void PendingTpLoggerLogs::logsRetrieved(Tpl::PendingOperation *op)
-     QList<KTp::LogMessage> logs;
-     Q_FOREACH (const Tpl::EventPtr &event, events) {
-         const Tpl::TextEventPtr textEvent = event.dynamicCast<Tpl::TextEvent>();
-+        if (textEvent.isNull()) {
-+            kDebug() << "Received a null TextEvent!";
-+            continue;
-+        }
-+
-         logs << KTp::LogMessage(Utils::fromTplEntity(event->sender()),
-                                 account(), event->timestamp(), textEvent->message(),
-                                 textEvent->messageToken());
diff --git a/net-im/ktp-common-internals/pkg-plist b/net-im/ktp-common-internals/pkg-plist
index d49a0f3ce84c..c60763bcc8f7 100644
--- a/net-im/ktp-common-internals/pkg-plist
+++ b/net-im/ktp-common-internals/pkg-plist
@@ -17,8 +17,15 @@ include/kde4/KTp/Models/contacts-filter-model.h
 include/kde4/KTp/Models/contacts-list-model.h
 include/kde4/KTp/Models/contacts-model.h
 include/kde4/KTp/Models/groups-tree-proxy-model.h
+include/kde4/KTp/Models/presence-model.h
 include/kde4/KTp/Models/rooms-model.h
 include/kde4/KTp/Models/text-channel-watcher-proxy-model.h
+include/kde4/KTp/OTR/channel-adapter.h
+include/kde4/KTp/OTR/channel-proxy-interface.h
+include/kde4/KTp/OTR/constants.h
+include/kde4/KTp/OTR/proxy-service-interface.h
+include/kde4/KTp/OTR/types.h
+include/kde4/KTp/OTR/utils.h
 include/kde4/KTp/Widgets/accounts-combo-box.h
 include/kde4/KTp/Widgets/add-contact-dialog.h
 include/kde4/KTp/Widgets/contact-grid-dialog.h
@@ -26,6 +33,7 @@ include/kde4/KTp/Widgets/contact-grid-widget.h
 include/kde4/KTp/Widgets/contact-view-widget.h
 include/kde4/KTp/Widgets/join-chat-room-dialog.h
 include/kde4/KTp/Widgets/notification-config-dialog.h
+include/kde4/KTp/Widgets/settings-kcm-dialog.h
 include/kde4/KTp/Widgets/start-chat-dialog.h
 include/kde4/KTp/abstract-message-filter.h
 include/kde4/KTp/actions.h
@@ -59,16 +67,19 @@ lib/kde4/imports/org/kde/telepathy/qmldir
 lib/kde4/ktploggerplugin_tplogger.so
 lib/libktpcommoninternalsprivate.so
 lib/libktpcommoninternalsprivate.so.%%KTP_VERSION%%
-lib/libktpcommoninternalsprivate.so.7
+lib/libktpcommoninternalsprivate.so.8
 lib/libktploggerprivate.so
 lib/libktploggerprivate.so.%%KTP_VERSION%%
-lib/libktploggerprivate.so.7
+lib/libktploggerprivate.so.8
 lib/libktpmodelsprivate.so
 lib/libktpmodelsprivate.so.%%KTP_VERSION%%
-lib/libktpmodelsprivate.so.7
+lib/libktpmodelsprivate.so.8
+lib/libktpotrprivate.so
+lib/libktpotrprivate.so.%%KTP_VERSION%%
+lib/libktpotrprivate.so.8
 lib/libktpwidgetsprivate.so
 lib/libktpwidgetsprivate.so.%%KTP_VERSION%%
-lib/libktpwidgetsprivate.so.7
+lib/libktpwidgetsprivate.so.8
 share/apps/katepart/syntax/ktpdebugoutput.xml
 share/apps/ktelepathy/ktelepathy.notifyrc
 share/icons/hicolor/128x128/apps/telepathy-kde.png
@@ -130,6 +141,7 @@ share/locale/cs/LC_MESSAGES/ktp-common-internals.mo
 share/locale/da/LC_MESSAGES/ktp-common-internals.mo
 share/locale/de/LC_MESSAGES/ktp-common-internals.mo
 share/locale/el/LC_MESSAGES/ktp-common-internals.mo
+share/locale/en_GB/LC_MESSAGES/ktp-common-internals.mo
 share/locale/es/LC_MESSAGES/ktp-common-internals.mo
 share/locale/et/LC_MESSAGES/ktp-common-internals.mo
 share/locale/fi/LC_MESSAGES/ktp-common-internals.mo