Update telepathy to 0.8.0

Merge area51's commits 10180, 10181, 10314, 10315, 10485, 10491, 10492,
10500, 10502, 10503 and 10504. Individual revisions can be reviewed at
http://src.mouf.net/area51/log

This commit is based on a patch originally sent to the kde@ mailing list by
T.C.Berner <tcberner@gmail.com>, and introduces a new port for
ktp-desktop-applets.

Approved by:		rakuco (mentor)
Differential Revision:	https://reviews.freebsd.org/D1264

4 files changed, 27 insertions, 136 deletions

diff --git a/net-im/ktp-text-ui/Makefile b/net-im/ktp-text-ui/Makefile
index 49a5f12bd818..1e5037a04341 100644
--- a/net-im/ktp-text-ui/Makefile
+++ b/net-im/ktp-text-ui/Makefile
@@ -2,10 +2,10 @@
 
 PORTNAME=	ktp-text-ui
 PORTVERSION=	${KTP_VERSION}
-PORTREVISION=	3
 CATEGORIES=	net-im kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
+WRKSRC=          ${WRKDIR}/${PORTNAME}-${PORTVERSION}.1
 
 MAINTAINER=	avilla@FreeBSD.org
 COMMENT=	KDE chat window application
@@ -15,8 +15,7 @@ LIB_DEPENDS=	libtelepathy-qt4.so:${PORTSDIR}/net-im/telepathy-qt4 \
 		libktpcommoninternalsprivate.so:${PORTSDIR}/net-im/ktp-common-internals
 RUN_DEPENDS=	${KDE4_PREFIX}/bin/ktp-contactlist:${PORTSDIR}/net-im/ktp-contact-list
 
-USE_KDE4=	kdehier kdeprefix kdelibs automoc4
-#USE_KDE4+=	kdepimlibs
+USE_KDE4=	kdeprefix automoc4
 USE_QT4=	corelib webkit xml \
 		moc_build qmake_build rcc_build uic_build
 USES=		cmake gettext tar:bzip2
diff --git a/net-im/ktp-text-ui/distinfo b/net-im/ktp-text-ui/distinfo
index aaa777b52365..1c83f3717468 100644
--- a/net-im/ktp-text-ui/distinfo
+++ b/net-im/ktp-text-ui/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ktp-text-ui-0.6.1.tar.bz2) = c829ebe741b024758e544a5990d63752e28c27e5f6375aba6e7ab2aa7e3df0a7
-SIZE (ktp-text-ui-0.6.1.tar.bz2) = 276607
+SHA256 (ktp-text-ui-0.8.0.tar.bz2) = 3e954e3f85f1764ff4cf49d537a8876365236997021abdb71a622055de926db9
+SIZE (ktp-text-ui-0.8.0.tar.bz2) = 314141
diff --git a/net-im/ktp-text-ui/files/patch-config__appearance-config-tab.cpp b/net-im/ktp-text-ui/files/patch-config__appearance-config-tab.cpp
deleted file mode 100644
index d43b07286c07..000000000000
--- a/net-im/ktp-text-ui/files/patch-config__appearance-config-tab.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
---- ./config/appearance-config-tab.cpp.orig	2013-04-01 11:36:44.000000000 -0700
-+++ ./config/appearance-config-tab.cpp	2013-04-02 17:02:32.193641735 -0700
-@@ -174,7 +174,8 @@
-     message.setTime(QDateTime::currentDateTime());
-     ui->chatView->addContentMessage(message);
- 
--    message = AdiumThemeContentInfo(AdiumThemeMessageInfo::HistoryRemoteToLocal);
-+    AdiumThemeContentInfo message2(AdiumThemeMessageInfo::HistoryRemoteToLocal);
-+    message = message2;
-     message.setMessage(i18nc("Example message in preview conversation","Bye Bye"));
-     message.setSenderDisplayName(i18nc("Example email", "larry@example.com"));
-     message.setSenderScreenName(i18nc("Example name", "Larry Demo"));
-@@ -182,7 +183,8 @@
-     message.setTime(QDateTime::currentDateTime());
-     ui->chatView->addContentMessage(message);
- 
--    message = AdiumThemeContentInfo(AdiumThemeMessageInfo::HistoryLocalToRemote);
-+    AdiumThemeContentInfo message3(AdiumThemeMessageInfo::HistoryLocalToRemote);
-+    message = message3;
-     message.setMessage(i18nc("Example message in preview conversation","Have fun!"));
-     message.setSenderDisplayName(i18nc("Example email", "ted@example.com"));
-     message.setSenderScreenName(i18nc("Example name", "Ted Example"));
-@@ -190,7 +192,8 @@
-     message.setTime(QDateTime::currentDateTime());
-     ui->chatView->addContentMessage(message);
- 
--    message = AdiumThemeContentInfo(AdiumThemeMessageInfo::HistoryLocalToRemote);
-+    AdiumThemeContentInfo message4(AdiumThemeMessageInfo::HistoryLocalToRemote);
-+    message = message4;
-     message.setMessage(i18nc("Example message in preview conversation","cya"));
-     message.setSenderDisplayName(i18nc("Example email", "ted@example.com"));
-     message.setSenderScreenName(i18nc("Example name", "Ted Example"));
-@@ -204,14 +207,16 @@
-     statusMessage.setService(i18n("Jabber"));
-     ui->chatView->addStatusMessage(statusMessage);
- 
--    statusMessage = AdiumThemeStatusInfo(true);
-+    AdiumThemeStatusInfo statusMessage2(true);
-+    statusMessage = statusMessage2;
-     statusMessage.setMessage(i18nc("Example message in preview conversation","Ted Example has left the chat.")); //FIXME sync this with chat text logic.
-     statusMessage.setTime(QDateTime::currentDateTime());
-     statusMessage.setService(i18n("Jabber"));
-     statusMessage.setStatus(QLatin1String("away"));
-     ui->chatView->addStatusMessage(statusMessage);
- 
--    message = AdiumThemeContentInfo(AdiumThemeMessageInfo::RemoteToLocal);
-+    AdiumThemeContentInfo message5(AdiumThemeMessageInfo::RemoteToLocal);
-+    message = message5;
-     message.setMessage(i18nc("Example message in preview conversation","Hello Ted"));
-     message.setSenderDisplayName(i18nc("Example email", "larry@example.com"));
-     message.setSenderScreenName(i18nc("Example name", "Larry Demo"));
-@@ -220,7 +225,8 @@
-     message.setTime(QDateTime::currentDateTime());
-     ui->chatView->addContentMessage(message);
- 
--    message = AdiumThemeContentInfo(AdiumThemeMessageInfo::RemoteToLocal);
-+    AdiumThemeContentInfo message6(AdiumThemeMessageInfo::RemoteToLocal);
-+    message = message6;
-     message.setMessage(i18nc("Example message in preview conversation","What's up?"));
-     message.setSenderDisplayName(i18nc("Example email", "larry@example.com"));
-     message.setSenderScreenName(i18nc("Example name", "Larry Demo"));
-@@ -228,7 +234,8 @@
-     message.setTime(QDateTime::currentDateTime());
-     ui->chatView->addContentMessage(message);
- 
--    message = AdiumThemeContentInfo(AdiumThemeMessageInfo::LocalToRemote);
-+    AdiumThemeContentInfo message7(AdiumThemeMessageInfo::LocalToRemote);
-+    message = message7;
-     message.setMessage(i18nc("Example message in preview conversation","Check out which cool adium themes work "
-                             "<a href=\"http://community.kde.org/KTp/Components/Chat_Window/Themes\">"
-                             "here</a>!"));
-@@ -239,7 +246,8 @@
-     ui->chatView->addContentMessage(message);
- 
-     if ( m_groupChat == true) {
--        message = AdiumThemeContentInfo(AdiumThemeMessageInfo::RemoteToLocal);
-+        AdiumThemeContentInfo message8(AdiumThemeMessageInfo::RemoteToLocal);
-+        message = message8;
-         message.setMessage(i18nc("Example message in preview conversation","Hello"));
-         message.setSenderDisplayName(i18nc("Example email", "bob@example.com"));
-         message.setSenderScreenName(i18nc("Example name", "Bob Example"));
-@@ -248,7 +256,8 @@
-         ui->chatView->addContentMessage(message);
-     }
- 
--    message = AdiumThemeContentInfo(AdiumThemeMessageInfo::LocalToRemote);
-+    AdiumThemeContentInfo message9(AdiumThemeMessageInfo::LocalToRemote);
-+    message = message9;
-     message.setMessage(i18nc("Example message in preview conversation","A different example message"));
-     message.setSenderDisplayName(i18nc("Example email", "ted@example.com"));
-     message.setSenderScreenName(i18nc("Example name", "Ted Example"));
-@@ -257,14 +266,16 @@
-     ui->chatView->addContentMessage(message);
- 
-     if (ui->chatView->showPresenceChanges()) {
--        statusMessage = AdiumThemeStatusInfo();
-+        AdiumThemeStatusInfo statusMessage3;
-+	statusMessage = statusMessage3;
-         statusMessage.setMessage(i18nc("Example message in preview conversation","Ted Example is now Away.")); //FIXME sync this with chat text logic.
-         statusMessage.setTime(QDateTime::currentDateTime());
-         statusMessage.setService(i18n("Jabber"));
-         statusMessage.setStatus(QLatin1String("away"));
-         ui->chatView->addStatusMessage(statusMessage);
- 
--        statusMessage = AdiumThemeStatusInfo();
-+        AdiumThemeStatusInfo statusMessage4;
-+	statusMessage = statusMessage4;
-         statusMessage.setMessage(i18nc("Example message in preview conversations","Ted Example has left the chat.")); //FIXME sync this with chat text logic.
-         statusMessage.setTime(QDateTime::currentDateTime());
-         statusMessage.setService(i18n("Jabber"));
diff --git a/net-im/ktp-text-ui/pkg-plist b/net-im/ktp-text-ui/pkg-plist
index c10d05de9a56..9dd4d70061ee 100644
--- a/net-im/ktp-text-ui/pkg-plist
+++ b/net-im/ktp-text-ui/pkg-plist
@@ -1,41 +1,26 @@
 bin/ktp-log-viewer
-include/KTp/AdiumThemeContentInfo
-include/KTp/AdiumThemeHeaderInfo
-include/KTp/AdiumThemeMessageInfo
-include/KTp/AdiumThemeStatusInfo
-include/KTp/AdiumThemeView
-include/KTp/ChatStylePlistFileReader
-include/KTp/ChatWidget
-include/KTp/ChatWindowStyle
-include/KTp/ChatWindowStyleManager
-include/KTp/TextChatConfig
-include/KTp/adium-theme-content-info.h
-include/KTp/adium-theme-header-info.h
-include/KTp/adium-theme-message-info.h
-include/KTp/adium-theme-status-info.h
-include/KTp/adium-theme-view.h
-include/KTp/chat-style-plist-file-reader.h
-include/KTp/chat-widget.h
-include/KTp/chat-window-style-manager.h
-include/KTp/chat-window-style.h
-include/KTp/ktpchat_export.h
-include/KTp/text-chat-config.h
 lib/kde4/kcm_ktp_chat_appearance.so
 lib/kde4/kcm_ktp_chat_behavior.so
 lib/kde4/kcm_ktp_chat_messages.so
+lib/kde4/kcm_ktp_logviewer_behavior.so
+lib/kde4/kcm_ktptextui_message_filter_latex.so
 lib/kde4/ktptextui_message_filter_bugzilla.so
 lib/kde4/ktptextui_message_filter_emoticons.so
 lib/kde4/ktptextui_message_filter_formatting.so
 lib/kde4/ktptextui_message_filter_highlight.so
 lib/kde4/ktptextui_message_filter_images.so
+lib/kde4/ktptextui_message_filter_latex.so
 lib/kde4/ktptextui_message_filter_searchexpansion.so
 lib/kde4/ktptextui_message_filter_tts.so
+lib/kde4/ktptextui_message_filter_urlexpansion.so
 lib/kde4/ktptextui_message_filter_youtube.so
 lib/kde4/libexec/ktp-adiumxtra-protocol-handler
 lib/kde4/libexec/ktp-text-ui
 lib/libktpchat.so
 share/applications/kde4/ktp-log-viewer.desktop
 share/apps/ktelepathy/Template.html
+share/apps/ktelepathy/longurl.js
+share/apps/ktelepathy/longurlServices.json
 share/apps/ktelepathy/showBugzillaInfo.js
 share/apps/ktelepathy/styles/SimKete.AdiumMessageStyle/Contents/Info.plist
 share/apps/ktelepathy/styles/SimKete.AdiumMessageStyle/Contents/README
@@ -209,13 +194,17 @@ share/kde4/services/adiumxtra.protocol
 share/kde4/services/kcm_ktp_chat_appearance.desktop
 share/kde4/services/kcm_ktp_chat_behavior.desktop
 share/kde4/services/kcm_ktp_chat_messages.desktop
+share/kde4/services/kcm_ktp_logviewer_behavior.desktop
+share/kde4/services/kcm_ktptextui_message_filter_latex.desktop
 share/kde4/services/ktptextui_message_filter_bugzilla.desktop
 share/kde4/services/ktptextui_message_filter_emoticons.desktop
 share/kde4/services/ktptextui_message_filter_formatting.desktop
 share/kde4/services/ktptextui_message_filter_highlight.desktop
 share/kde4/services/ktptextui_message_filter_images.desktop
+share/kde4/services/ktptextui_message_filter_latex.desktop
 share/kde4/services/ktptextui_message_filter_searchexpansion.desktop
 share/kde4/services/ktptextui_message_filter_tts.desktop
+share/kde4/services/ktptextui_message_filter_urlexpansion.desktop
 share/kde4/services/ktptextui_message_filter_youtube.desktop
 share/kde4/servicetypes/ktptxtui_message_filter.desktop
 share/locale/bs/LC_MESSAGES/kcm_ktp_chat_appearance.mo
@@ -233,6 +222,7 @@ share/locale/ca/LC_MESSAGES/ktpchat.mo
 share/locale/ca@valencia/LC_MESSAGES/kcm_ktp_chat_appearance.mo
 share/locale/ca@valencia/LC_MESSAGES/kcm_ktp_chat_behavior.mo
 share/locale/ca@valencia/LC_MESSAGES/ktp-adiumxtra-protocol-handler.mo
+share/locale/ca@valencia/LC_MESSAGES/ktp-filters.mo
 share/locale/ca@valencia/LC_MESSAGES/ktp-text-ui.mo
 share/locale/ca@valencia/LC_MESSAGES/ktpchat.mo
 share/locale/cs/LC_MESSAGES/kcm_ktp_chat_appearance.mo
@@ -279,6 +269,7 @@ share/locale/fi/LC_MESSAGES/ktpchat.mo
 share/locale/fr/LC_MESSAGES/kcm_ktp_chat_appearance.mo
 share/locale/fr/LC_MESSAGES/kcm_ktp_chat_behavior.mo
 share/locale/fr/LC_MESSAGES/ktp-adiumxtra-protocol-handler.mo
+share/locale/fr/LC_MESSAGES/ktp-filters.mo
 share/locale/fr/LC_MESSAGES/ktp-text-ui.mo
 share/locale/fr/LC_MESSAGES/ktpchat.mo
 share/locale/ga/LC_MESSAGES/kcm_ktp_chat_appearance.mo
@@ -289,11 +280,13 @@ share/locale/ga/LC_MESSAGES/ktpchat.mo
 share/locale/gl/LC_MESSAGES/kcm_ktp_chat_appearance.mo
 share/locale/gl/LC_MESSAGES/kcm_ktp_chat_behavior.mo
 share/locale/gl/LC_MESSAGES/ktp-adiumxtra-protocol-handler.mo
+share/locale/gl/LC_MESSAGES/ktp-filters.mo
 share/locale/gl/LC_MESSAGES/ktp-text-ui.mo
 share/locale/gl/LC_MESSAGES/ktpchat.mo
 share/locale/hu/LC_MESSAGES/kcm_ktp_chat_appearance.mo
 share/locale/hu/LC_MESSAGES/kcm_ktp_chat_behavior.mo
 share/locale/hu/LC_MESSAGES/ktp-adiumxtra-protocol-handler.mo
+share/locale/hu/LC_MESSAGES/ktp-filters.mo
 share/locale/hu/LC_MESSAGES/ktp-text-ui.mo
 share/locale/hu/LC_MESSAGES/ktpchat.mo
 share/locale/ia/LC_MESSAGES/kcm_ktp_chat_appearance.mo
@@ -324,6 +317,12 @@ share/locale/km/LC_MESSAGES/kcm_ktp_chat_behavior.mo
 share/locale/km/LC_MESSAGES/ktp-adiumxtra-protocol-handler.mo
 share/locale/km/LC_MESSAGES/ktp-text-ui.mo
 share/locale/km/LC_MESSAGES/ktpchat.mo
+share/locale/ko/LC_MESSAGES/kcm_ktp_chat_appearance.mo
+share/locale/ko/LC_MESSAGES/kcm_ktp_chat_behavior.mo
+share/locale/ko/LC_MESSAGES/ktp-adiumxtra-protocol-handler.mo
+share/locale/ko/LC_MESSAGES/ktp-filters.mo
+share/locale/ko/LC_MESSAGES/ktp-text-ui.mo
+share/locale/ko/LC_MESSAGES/ktpchat.mo
 share/locale/lt/LC_MESSAGES/kcm_ktp_chat_appearance.mo
 share/locale/lt/LC_MESSAGES/kcm_ktp_chat_behavior.mo
 share/locale/lt/LC_MESSAGES/ktp-adiumxtra-protocol-handler.mo
@@ -338,6 +337,7 @@ share/locale/mr/LC_MESSAGES/ktpchat.mo
 share/locale/nb/LC_MESSAGES/kcm_ktp_chat_appearance.mo
 share/locale/nb/LC_MESSAGES/kcm_ktp_chat_behavior.mo
 share/locale/nb/LC_MESSAGES/ktp-adiumxtra-protocol-handler.mo
+share/locale/nb/LC_MESSAGES/ktp-filters.mo
 share/locale/nb/LC_MESSAGES/ktp-text-ui.mo
 share/locale/nb/LC_MESSAGES/ktpchat.mo
 share/locale/nds/LC_MESSAGES/kcm_ktp_chat_appearance.mo
@@ -377,6 +377,7 @@ share/locale/ro/LC_MESSAGES/ktpchat.mo
 share/locale/ru/LC_MESSAGES/kcm_ktp_chat_appearance.mo
 share/locale/ru/LC_MESSAGES/kcm_ktp_chat_behavior.mo
 share/locale/ru/LC_MESSAGES/ktp-adiumxtra-protocol-handler.mo
+share/locale/ru/LC_MESSAGES/ktp-filters.mo
 share/locale/ru/LC_MESSAGES/ktp-text-ui.mo
 share/locale/ru/LC_MESSAGES/ktpchat.mo
 share/locale/sk/LC_MESSAGES/kcm_ktp_chat_appearance.mo
@@ -388,6 +389,7 @@ share/locale/sk/LC_MESSAGES/ktpchat.mo
 share/locale/sl/LC_MESSAGES/kcm_ktp_chat_appearance.mo
 share/locale/sl/LC_MESSAGES/kcm_ktp_chat_behavior.mo
 share/locale/sl/LC_MESSAGES/ktp-adiumxtra-protocol-handler.mo
+share/locale/sl/LC_MESSAGES/ktp-filters.mo
 share/locale/sl/LC_MESSAGES/ktp-text-ui.mo
 share/locale/sl/LC_MESSAGES/ktpchat.mo
 share/locale/sr/LC_MESSAGES/kcm_ktp_chat_appearance.mo