Index: Mk/bsd.kde4.mk =================================================================== --- Mk/bsd.kde4.mk +++ Mk/bsd.kde4.mk @@ -79,7 +79,7 @@ KDE4_ACTIVITES_VERSION= 4.13.3 KDE4_WORKSPACE_VERSION= 4.11.13 KDE4_BRANCH?= stable -KTP_VERSION?= 0.6.1 +KTP_VERSION?= 0.8.0 KTP_BRANCH?= stable CALLIGRA_VERSION?= 2.7.5 CALLIGRA_BRANCH?= stable Index: net-im/ktp-accounts-kcm/Makefile =================================================================== --- net-im/ktp-accounts-kcm/Makefile +++ net-im/ktp-accounts-kcm/Makefile @@ -2,7 +2,6 @@ PORTNAME= ktp-accounts-kcm PORTVERSION= ${KTP_VERSION} -PORTREVISION= 3 CATEGORIES= net-im kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src @@ -15,7 +14,7 @@ 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= kdeprefix kdelibs automoc4 USE_QT4= corelib moc_build qmake_build rcc_build uic_build USES= cmake gettext tar:bzip2 USE_LDCONFIG= yes Index: net-im/ktp-accounts-kcm/distinfo =================================================================== --- net-im/ktp-accounts-kcm/distinfo +++ net-im/ktp-accounts-kcm/distinfo @@ -1,2 +1,2 @@ -SHA256 (ktp-accounts-kcm-0.6.1.tar.bz2) = 33acccf4b495eb646aff75e26fa932a4947f40c12d2f571ed1b121ee4c457018 -SIZE (ktp-accounts-kcm-0.6.1.tar.bz2) = 240111 +SHA256 (ktp-accounts-kcm-0.8.0.tar.bz2) = da9d42ed1dda00066a2dc4cfd9b00087557c765d467a6dd010f695a1f93e0b31 +SIZE (ktp-accounts-kcm-0.8.0.tar.bz2) = 256666 Index: net-im/ktp-accounts-kcm/pkg-plist =================================================================== --- net-im/ktp-accounts-kcm/pkg-plist +++ net-im/ktp-accounts-kcm/pkg-plist @@ -5,10 +5,11 @@ lib/kde4/ktpaccountskcm_plugin_idle.so lib/kde4/ktpaccountskcm_plugin_rakia.so lib/kde4/ktpaccountskcm_plugin_salut.so +lib/kde4/ktpaccountskcm_plugin_sipe.so lib/kde4/ktpaccountskcm_plugin_sunshine.so lib/libktpaccountskcminternal.so lib/libktpaccountskcminternal.so.4 -lib/libktpaccountskcminternal.so.%%KDE4_GENERIC_LIB_VERSION%% +lib/libktpaccountskcminternal.so.%%KDE4_VERSION%% share/kde4/services/kcm_ktp_accounts.desktop share/kde4/services/ktpaccountskcm_plugin_butterfly.desktop share/kde4/services/ktpaccountskcm_plugin_gabble.desktop @@ -16,6 +17,7 @@ share/kde4/services/ktpaccountskcm_plugin_idle.desktop share/kde4/services/ktpaccountskcm_plugin_rakia.desktop share/kde4/services/ktpaccountskcm_plugin_salut.desktop +share/kde4/services/ktpaccountskcm_plugin_sipe.desktop share/kde4/services/ktpaccountskcm_plugin_sunshine.desktop share/kde4/services/settings-im-and-voip.desktop share/kde4/servicetypes/ktpaccountskcminternal-accountuiplugin.desktop @@ -173,6 +175,14 @@ share/locale/km/LC_MESSAGES/kcmtelepathyaccounts_plugin_rakia.mo share/locale/km/LC_MESSAGES/kcmtelepathyaccounts_plugin_salut.mo share/locale/km/LC_MESSAGES/kcmtelepathyaccounts_plugin_sunshine.mo +share/locale/ko/LC_MESSAGES/kcm_ktp_accounts.mo +share/locale/ko/LC_MESSAGES/kcmtelepathyaccounts_plugin_butterfly.mo +share/locale/ko/LC_MESSAGES/kcmtelepathyaccounts_plugin_gabble.mo +share/locale/ko/LC_MESSAGES/kcmtelepathyaccounts_plugin_haze.mo +share/locale/ko/LC_MESSAGES/kcmtelepathyaccounts_plugin_idle.mo +share/locale/ko/LC_MESSAGES/kcmtelepathyaccounts_plugin_rakia.mo +share/locale/ko/LC_MESSAGES/kcmtelepathyaccounts_plugin_salut.mo +share/locale/ko/LC_MESSAGES/kcmtelepathyaccounts_plugin_sunshine.mo share/locale/lt/LC_MESSAGES/kcm_ktp_accounts.mo share/locale/lt/LC_MESSAGES/kcmtelepathyaccounts_plugin_butterfly.mo share/locale/lt/LC_MESSAGES/kcmtelepathyaccounts_plugin_gabble.mo @@ -369,4 +379,7 @@ share/telepathy/profiles/local-xmpp.profile share/telepathy/profiles/msn-xmpp.profile share/telepathy/profiles/msn.profile +share/telepathy/profiles/sipe-haze.profile +share/telepathy/profiles/sms.profile share/telepathy/profiles/sofiasip-sip.profile +share/telepathy/profiles/steam.profile Index: net-im/ktp-approver/Makefile =================================================================== --- net-im/ktp-approver/Makefile +++ net-im/ktp-approver/Makefile @@ -2,7 +2,6 @@ PORTNAME= ktp-approver PORTVERSION= ${KTP_VERSION} -PORTREVISION= 3 CATEGORIES= net-im kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src @@ -14,7 +13,7 @@ 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= kdeprefix kdelibs automoc4 USE_QT4= corelib moc_build qmake_build rcc_build uic_build USES= cmake gettext tar:bzip2 Index: net-im/ktp-approver/distinfo =================================================================== --- net-im/ktp-approver/distinfo +++ net-im/ktp-approver/distinfo @@ -1,2 +1,2 @@ -SHA256 (ktp-approver-0.6.1.tar.bz2) = b9aa215f01713e043d2d4ec4b0db3a1c24a61c82ef71ba3be0e5df72e247a97e -SIZE (ktp-approver-0.6.1.tar.bz2) = 35394 +SHA256 (ktp-approver-0.8.0.tar.bz2) = 50a1ded6c9fecc184c0772e7b78eff2b4ff2afc17d1897172c173b327be98eb7 +SIZE (ktp-approver-0.8.0.tar.bz2) = 36464 Index: net-im/ktp-approver/pkg-plist =================================================================== --- net-im/ktp-approver/pkg-plist +++ net-im/ktp-approver/pkg-plist @@ -2,7 +2,7 @@ share/config/ktp_approverrc share/dbus-1/services/org.freedesktop.Telepathy.Client.KTp.Approver.service share/kde4/services/kded/ktp_approver.desktop -share/kde4/servicetypes/ktp-approver.service +share/kde4/servicetypes/ktp-approver.desktop share/locale/bs/LC_MESSAGES/kded_ktp_approver.mo share/locale/ca/LC_MESSAGES/kded_ktp_approver.mo share/locale/ca@valencia/LC_MESSAGES/kded_ktp_approver.mo @@ -22,6 +22,7 @@ share/locale/ja/LC_MESSAGES/kded_ktp_approver.mo share/locale/kk/LC_MESSAGES/kded_ktp_approver.mo share/locale/km/LC_MESSAGES/kded_ktp_approver.mo +share/locale/ko/LC_MESSAGES/kded_ktp_approver.mo share/locale/lt/LC_MESSAGES/kded_ktp_approver.mo share/locale/mr/LC_MESSAGES/kded_ktp_approver.mo share/locale/nb/LC_MESSAGES/kded_ktp_approver.mo Index: net-im/ktp-auth-handler/Makefile =================================================================== --- net-im/ktp-auth-handler/Makefile +++ net-im/ktp-auth-handler/Makefile @@ -2,7 +2,6 @@ PORTNAME= ktp-auth-handler PORTVERSION= ${KTP_VERSION} -PORTREVISION= 3 CATEGORIES= net-im kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src @@ -15,7 +14,7 @@ libtelepathy-qt4.so:${PORTSDIR}/net-im/telepathy-qt4 \ libktpcommoninternalsprivate.so:${PORTSDIR}/net-im/ktp-common-internals -USE_KDE4= kdehier kdeprefix kdelibs automoc4 +USE_KDE4= kdeprefix kdelibs automoc4 USE_QT4= corelib dbus gui xml webkit \ moc_build qmake_build rcc_build uic_build USES= cmake gettext tar:bzip2 Index: net-im/ktp-auth-handler/distinfo =================================================================== --- net-im/ktp-auth-handler/distinfo +++ net-im/ktp-auth-handler/distinfo @@ -1,2 +1,2 @@ -SHA256 (ktp-auth-handler-0.6.1.tar.bz2) = f743dcc230e72155ed04da21dd6b5e2d74feb042b408df3f8c3c6fbf3f9b5826 -SIZE (ktp-auth-handler-0.6.1.tar.bz2) = 42973 +SHA256 (ktp-auth-handler-0.8.0.tar.bz2) = fb47f565b445ccaf965120ee0a9da8895be57489f02c656465421866dd60ac5b +SIZE (ktp-auth-handler-0.8.0.tar.bz2) = 48471 Index: net-im/ktp-auth-handler/pkg-plist =================================================================== --- net-im/ktp-auth-handler/pkg-plist +++ net-im/ktp-auth-handler/pkg-plist @@ -21,6 +21,7 @@ share/locale/ja/LC_MESSAGES/ktp-auth-handler.mo share/locale/kk/LC_MESSAGES/ktp-auth-handler.mo share/locale/km/LC_MESSAGES/ktp-auth-handler.mo +share/locale/ko/LC_MESSAGES/ktp-auth-handler.mo share/locale/lt/LC_MESSAGES/ktp-auth-handler.mo share/locale/mr/LC_MESSAGES/ktp-auth-handler.mo share/locale/nb/LC_MESSAGES/ktp-auth-handler.mo Index: net-im/ktp-common-internals/Makefile =================================================================== --- net-im/ktp-common-internals/Makefile +++ net-im/ktp-common-internals/Makefile @@ -2,7 +2,6 @@ PORTNAME= ktp-common-internals PORTVERSION= ${KTP_VERSION} -PORTREVISION= 4 CATEGORIES= net-im kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src @@ -14,10 +13,12 @@ libtelepathy-logger-qt4.so:${PORTSDIR}/net-im/telepathy-logger-qt4 RUN_DEPENDS= ${LOCALBASE}/libexec/mission-control-5:${PORTSDIR}/net-im/telepathy-mission-control -USE_KDE4= kdehier kdeprefix kdelibs automoc4 +USE_KDE4= kdeprefix kdelibs pimlibs automoc4 USE_QT4= declarative script \ moc_build qmake_build rcc_build uic_build USES= cmake gettext tar:bzip2 USE_LDCONFIG= yes +PLIST_SUB= KTP_VERSION=${KTP_VERSION} + .include Index: net-im/ktp-common-internals/distinfo =================================================================== --- net-im/ktp-common-internals/distinfo +++ net-im/ktp-common-internals/distinfo @@ -1,2 +1,2 @@ -SHA256 (ktp-common-internals-0.6.1.tar.bz2) = d1c5c3952912ed2244b2e4d1a4c6bf19a73972fea744c78d29b56558effcd138 -SIZE (ktp-common-internals-0.6.1.tar.bz2) = 340239 +SHA256 (ktp-common-internals-0.8.0.tar.bz2) = bd8eedb9b5753ad204322e1453a2a7f157643519d2cbbd04759b6da69eb12114 +SIZE (ktp-common-internals-0.8.0.tar.bz2) = 387961 Index: net-im/ktp-common-internals/files/patch-KTp__Logger__plugins__tplogger__pending-tp-logger-logs.cpp =================================================================== --- net-im/ktp-common-internals/files/patch-KTp__Logger__plugins__tplogger__pending-tp-logger-logs.cpp +++ net-im/ktp-common-internals/files/patch-KTp__Logger__plugins__tplogger__pending-tp-logger-logs.cpp @@ -0,0 +1,41 @@ +commit 60452d2718f1b5a910dad64d6360d600d4107642 +Author: Dan Vrátil +Date: Thu Apr 10 21:08:59 2014 +0200 + + Fix build (sorry!) + +commit ccd4d133ba4becb7c8662eb3e57612e8aa9773e4 +Author: Dan Vrátil +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 + ++#include ++ + PendingTpLoggerLogs::PendingTpLoggerLogs(const Tp::AccountPtr &account, + const KTp::LogEntity &entity, + const QDate &date, +@@ -60,6 +62,11 @@ void PendingTpLoggerLogs::logsRetrieved(Tpl::PendingOperation *op) + QList logs; + Q_FOREACH (const Tpl::EventPtr &event, events) { + const Tpl::TextEventPtr textEvent = event.dynamicCast(); ++ if (textEvent.isNull()) { ++ kDebug() << "Received a null TextEvent!"; ++ continue; ++ } ++ + logs << KTp::LogMessage(Utils::fromTplEntity(event->sender()), + account(), event->timestamp(), textEvent->message(), + textEvent->messageToken()); Index: net-im/ktp-common-internals/pkg-plist =================================================================== --- net-im/ktp-common-internals/pkg-plist +++ net-im/ktp-common-internals/pkg-plist @@ -1,4 +1,15 @@ bin/ktp-debugger +include/KTp/Logger/abstract-logger-plugin.h +include/KTp/Logger/log-entity.h +include/KTp/Logger/log-manager.h +include/KTp/Logger/log-message.h +include/KTp/Logger/log-search-hit.h +include/KTp/Logger/pending-logger-dates.h +include/KTp/Logger/pending-logger-entities.h +include/KTp/Logger/pending-logger-logs.h +include/KTp/Logger/pending-logger-operation.h +include/KTp/Logger/pending-logger-search.h +include/KTp/Logger/scrollback-manager.h include/KTp/Models/abstract-grouping-proxy-model.h include/KTp/Models/accounts-list-model.h include/KTp/Models/accounts-tree-proxy-model.h @@ -12,8 +23,10 @@ include/KTp/Widgets/add-contact-dialog.h include/KTp/Widgets/contact-grid-dialog.h include/KTp/Widgets/contact-grid-widget.h +include/KTp/Widgets/contact-view-widget.h include/KTp/Widgets/join-chat-room-dialog.h -include/KTp/Widgets/notificationconfigdialog.h +include/KTp/Widgets/notification-config-dialog.h +include/KTp/Widgets/start-chat-dialog.h include/KTp/abstract-message-filter.h include/KTp/actions.h include/KTp/circular-countdown.h @@ -20,6 +33,7 @@ include/KTp/contact-factory.h include/KTp/contact-info-dialog.h include/KTp/contact.h +include/KTp/core.h include/KTp/debug.h include/KTp/error-dictionary.h include/KTp/global-contact-manager.h @@ -42,15 +56,20 @@ include/KTp/wallet-utils.h lib/kde4/imports/org/kde/telepathy/libktpqmlplugin.so lib/kde4/imports/org/kde/telepathy/qmldir +lib/kde4/ktploggerplugin_tplogger.so lib/libktpcommoninternalsprivate.so -lib/libktpcommoninternalsprivate.so.0.6.1 -lib/libktpcommoninternalsprivate.so.5 +lib/libktpcommoninternalsprivate.so.%%KTP_VERSION%% +lib/libktpcommoninternalsprivate.so.7 +lib/libktploggerprivate.so +lib/libktploggerprivate.so.%%KTP_VERSION%% +lib/libktploggerprivate.so.7 lib/libktpmodelsprivate.so -lib/libktpmodelsprivate.so.0.6.1 -lib/libktpmodelsprivate.so.5 +lib/libktpmodelsprivate.so.%%KTP_VERSION%% +lib/libktpmodelsprivate.so.7 lib/libktpwidgetsprivate.so -lib/libktpwidgetsprivate.so.0.6.1 -lib/libktpwidgetsprivate.so.5 +lib/libktpwidgetsprivate.so.%%KTP_VERSION%% +lib/libktpwidgetsprivate.so.7 +share/apps/katepart/syntax/ktpdebugoutput.xml share/apps/ktelepathy/ktelepathy.notifyrc share/icons/hicolor/128x128/apps/telepathy-kde.png share/icons/hicolor/16x16/actions/im-groupwise.png @@ -69,6 +88,7 @@ share/icons/hicolor/22x22/actions/im-qq.png share/icons/hicolor/22x22/actions/im-skype.png share/icons/hicolor/22x22/actions/im-yahoo.png +share/icons/hicolor/22x22/actions/show-offline.png share/icons/hicolor/22x22/actions/sort-name.png share/icons/hicolor/22x22/actions/sort-presence.png share/icons/hicolor/22x22/apps/telepathy-kde.png @@ -101,6 +121,8 @@ share/icons/hicolor/48x48/apps/telepathy-kde.png share/icons/hicolor/64x64/apps/telepathy-kde.png share/icons/hicolor/scalable/apps/telepathy-kde.svgz +share/kde4/services/ktploggerplugin_tplogger.desktop +share/kde4/servicetypes/ktp_logger_plugin.desktop share/locale/bs/LC_MESSAGES/ktp-common-internals.mo share/locale/ca/LC_MESSAGES/ktp-common-internals.mo share/locale/ca@valencia/LC_MESSAGES/ktp-common-internals.mo @@ -119,6 +141,7 @@ share/locale/it/LC_MESSAGES/ktp-common-internals.mo share/locale/ja/LC_MESSAGES/ktp-common-internals.mo share/locale/kk/LC_MESSAGES/ktp-common-internals.mo +share/locale/ko/LC_MESSAGES/ktp-common-internals.mo share/locale/lt/LC_MESSAGES/ktp-common-internals.mo share/locale/mr/LC_MESSAGES/ktp-common-internals.mo share/locale/nb/LC_MESSAGES/ktp-common-internals.mo Index: net-im/ktp-contact-list/Makefile =================================================================== --- net-im/ktp-contact-list/Makefile +++ net-im/ktp-contact-list/Makefile @@ -2,7 +2,6 @@ PORTNAME= ktp-contact-list PORTVERSION= ${KTP_VERSION} -PORTREVISION= 3 CATEGORIES= net-im kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src @@ -14,7 +13,7 @@ libtelepathy-logger-qt4.so:${PORTSDIR}/net-im/telepathy-logger-qt4 \ libktpcommoninternalsprivate.so:${PORTSDIR}/net-im/ktp-common-internals -USE_KDE4= kdehier kdeprefix kdelibs automoc4 +USE_KDE4= kdeprefix kdelibs automoc4 USE_QT4= corelib moc_build qmake_build rcc_build uic_build USES= cmake gettext tar:bzip2 Index: net-im/ktp-contact-list/distinfo =================================================================== --- net-im/ktp-contact-list/distinfo +++ net-im/ktp-contact-list/distinfo @@ -1,2 +1,2 @@ -SHA256 (ktp-contact-list-0.6.1.tar.bz2) = eea39dd233d3b58ef5d05948792fc5c2df8a0a39c4194c792eecf6906518455d -SIZE (ktp-contact-list-0.6.1.tar.bz2) = 130810 +SHA256 (ktp-contact-list-0.8.0.tar.bz2) = d4d20bdf5435baa3581b7f12b6e5a3dcbb7997825275efd5024ea467311fc858 +SIZE (ktp-contact-list-0.8.0.tar.bz2) = 135142 Index: net-im/ktp-contact-list/pkg-plist =================================================================== --- net-im/ktp-contact-list/pkg-plist +++ net-im/ktp-contact-list/pkg-plist @@ -19,6 +19,7 @@ share/locale/ja/LC_MESSAGES/ktp-contactlist.mo share/locale/kk/LC_MESSAGES/ktp-contactlist.mo share/locale/km/LC_MESSAGES/ktp-contactlist.mo +share/locale/ko/LC_MESSAGES/ktp-contactlist.mo share/locale/lt/LC_MESSAGES/ktp-contactlist.mo share/locale/mr/LC_MESSAGES/ktp-contactlist.mo share/locale/nb/LC_MESSAGES/ktp-contactlist.mo Index: net-im/ktp-contact-runner/Makefile =================================================================== --- net-im/ktp-contact-runner/Makefile +++ net-im/ktp-contact-runner/Makefile @@ -2,7 +2,6 @@ PORTNAME= ktp-contact-runner PORTVERSION= ${KTP_VERSION} -PORTREVISION= 3 CATEGORIES= net-im kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src @@ -13,7 +12,7 @@ LIB_DEPENDS= libtelepathy-qt4.so:${PORTSDIR}/net-im/telepathy-qt4 \ libktpcommoninternalsprivate.so:${PORTSDIR}/net-im/ktp-common-internals -USE_KDE4= kdehier kdeprefix kdelibs automoc4 +USE_KDE4= kdeprefix kdelibs automoc4 USE_QT4= corelib moc_build qmake_build rcc_build uic_build USES= cmake gettext tar:bzip2 Index: net-im/ktp-contact-runner/distinfo =================================================================== --- net-im/ktp-contact-runner/distinfo +++ net-im/ktp-contact-runner/distinfo @@ -1,2 +1,2 @@ -SHA256 (ktp-contact-runner-0.6.1.tar.bz2) = 3f287bff886f90c8cbd121e0fb619558203fdb995417c196a814626ad5db5207 -SIZE (ktp-contact-runner-0.6.1.tar.bz2) = 39856 +SHA256 (ktp-contact-runner-0.8.0.tar.bz2) = 11f89cecec08f7e6bd54fd22ae8d4c12f6688551db393f07e4ac55db345cb535 +SIZE (ktp-contact-runner-0.8.0.tar.bz2) = 41364 Index: net-im/ktp-contact-runner/pkg-plist =================================================================== --- net-im/ktp-contact-runner/pkg-plist +++ net-im/ktp-contact-runner/pkg-plist @@ -18,6 +18,7 @@ share/locale/it/LC_MESSAGES/plasma_runner_ktp_contacts.mo share/locale/kk/LC_MESSAGES/plasma_runner_ktp_contacts.mo share/locale/km/LC_MESSAGES/plasma_runner_ktp_contacts.mo +share/locale/ko/LC_MESSAGES/plasma_runner_ktp_contacts.mo share/locale/lt/LC_MESSAGES/plasma_runner_ktp_contacts.mo share/locale/mr/LC_MESSAGES/plasma_runner_ktp_contacts.mo share/locale/nb/LC_MESSAGES/plasma_runner_ktp_contacts.mo Index: net-im/ktp-desktop-applets/Makefile =================================================================== --- net-im/ktp-desktop-applets/Makefile +++ net-im/ktp-desktop-applets/Makefile @@ -0,0 +1,18 @@ +# $FreeBSD$ + +PORTNAME= ktp-desktop-applets +PORTVERSION= ${KTP_VERSION} +CATEGORIES= net-im kde +MASTER_SITES= ${MASTER_SITE_KDE} +MASTER_SITE_SUBDIR= ${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src + +MAINTAINER= avilla@FreeBSD.org +COMMENT= KDE instant messaging plasma widgets + +LIB_DEPENDS= libktpcommoninternalsprivate.so:${PORTSDIR}/net-im/ktp-common-internals + +USE_KDE4= kdeprefix kdelibs automoc4 +USE_QT4= corelib moc_build qmake_build rcc_build uic_build +USES= cmake gettext tar:bzip2 + +.include Index: net-im/ktp-desktop-applets/distinfo =================================================================== --- net-im/ktp-desktop-applets/distinfo +++ net-im/ktp-desktop-applets/distinfo @@ -0,0 +1,2 @@ +SHA256 (ktp-desktop-applets-0.8.0.tar.bz2) = 022a35317003dabed7ccefb24977419f6aa0d3c3daeb151a722299d9acf35ce7 +SIZE (ktp-desktop-applets-0.8.0.tar.bz2) = 64326 Index: net-im/ktp-desktop-applets/pkg-descr =================================================================== --- net-im/ktp-desktop-applets/pkg-descr +++ net-im/ktp-desktop-applets/pkg-descr @@ -0,0 +1,7 @@ +The KDE Telepathy project aims to integrate real time communication +deeply into KDE Workspaces, and to provide an infrastructure to aid +development of collaborative features for KDE Applications. + +This application provides plasmoid widgets (simplified contact list...) + +WWW: http://community.kde.org/KTp Index: net-im/ktp-desktop-applets/pkg-plist =================================================================== --- net-im/ktp-desktop-applets/pkg-plist +++ net-im/ktp-desktop-applets/pkg-plist @@ -0,0 +1,114 @@ +lib/kde4/plasma_applet_ktp_contact.so +lib/kde4/plasma_applet_ktp_presence.so +share/apps/plasma-desktop/updates/50-renameKTpApplets.js +share/apps/plasma/plasmoids/org.kde.ktp-chat/contents/config/main.xml +share/apps/plasma/plasmoids/org.kde.ktp-chat/contents/ui/ActionDelegate.qml +share/apps/plasma/plasmoids/org.kde.ktp-chat/contents/ui/ChatWidget.qml +share/apps/plasma/plasmoids/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml +share/apps/plasma/plasmoids/org.kde.ktp-chat/contents/ui/ConversationDelegateButton.qml +share/apps/plasma/plasmoids/org.kde.ktp-chat/contents/ui/OutgoingDelegate.qml +share/apps/plasma/plasmoids/org.kde.ktp-chat/contents/ui/TextDelegate.qml +share/apps/plasma/plasmoids/org.kde.ktp-chat/contents/ui/main.qml +share/apps/plasma/plasmoids/org.kde.ktp-chat/metadata.desktop +share/apps/plasma/plasmoids/org.kde.ktp-contact/contents/frames/away.png +share/apps/plasma/plasmoids/org.kde.ktp-contact/contents/frames/busy.png +share/apps/plasma/plasmoids/org.kde.ktp-contact/contents/frames/offline.png +share/apps/plasma/plasmoids/org.kde.ktp-contact/contents/frames/online.png +share/apps/plasma/plasmoids/org.kde.ktp-contact/contents/ui/Avatar.qml +share/apps/plasma/plasmoids/org.kde.ktp-contact/contents/ui/Contact.qml +share/apps/plasma/plasmoids/org.kde.ktp-contact/contents/ui/DropDownMenu.qml +share/apps/plasma/plasmoids/org.kde.ktp-contact/contents/ui/main.qml +share/apps/plasma/plasmoids/org.kde.ktp-contactlist/contents/ui/ContactList.qml +share/apps/plasma/plasmoids/org.kde.ktp-contactlist/contents/ui/ExternalLabel.qml +share/apps/plasma/plasmoids/org.kde.ktp-contactlist/contents/ui/ListContactDelegate.qml +share/apps/plasma/plasmoids/org.kde.ktp-contactlist/contents/ui/main.qml +share/apps/plasma/plasmoids/org.kde.ktp-contactlist/metadata.desktop +share/kde4/services/plasma-applet-ktp-chat.desktop +share/kde4/services/plasma-applet-ktp-contact.desktop +share/kde4/services/plasma-applet-ktp-contactlist.desktop +share/kde4/services/plasma-applet-ktp-presence.desktop +share/locale/bs/LC_MESSAGES/plasma_applet_org.kde.ktp-contact.mo +share/locale/bs/LC_MESSAGES/plasma_applet_org.kde.ktp-presence.mo +share/locale/ca/LC_MESSAGES/plasma_applet_org.kde.ktp-contact.mo +share/locale/ca/LC_MESSAGES/plasma_applet_org.kde.ktp-presence.mo +share/locale/ca@valencia/LC_MESSAGES/plasma_applet_org.kde.ktp-contact.mo +share/locale/ca@valencia/LC_MESSAGES/plasma_applet_org.kde.ktp-presence.mo +share/locale/cs/LC_MESSAGES/plasma_applet_org.kde.ktp-contact.mo +share/locale/cs/LC_MESSAGES/plasma_applet_org.kde.ktp-presence.mo +share/locale/da/LC_MESSAGES/plasma_applet_org.kde.ktp-contact.mo +share/locale/da/LC_MESSAGES/plasma_applet_org.kde.ktp-presence.mo +share/locale/de/LC_MESSAGES/plasma_applet_org.kde.ktp-contact.mo +share/locale/de/LC_MESSAGES/plasma_applet_org.kde.ktp-presence.mo +share/locale/el/LC_MESSAGES/plasma_applet_org.kde.ktp-contact.mo +share/locale/el/LC_MESSAGES/plasma_applet_org.kde.ktp-presence.mo +share/locale/es/LC_MESSAGES/plasma_applet_org.kde.ktp-contact.mo +share/locale/es/LC_MESSAGES/plasma_applet_org.kde.ktp-presence.mo +share/locale/et/LC_MESSAGES/plasma_applet_org.kde.ktp-contact.mo +share/locale/et/LC_MESSAGES/plasma_applet_org.kde.ktp-presence.mo +share/locale/fi/LC_MESSAGES/plasma_applet_org.kde.ktp-contact.mo +share/locale/fi/LC_MESSAGES/plasma_applet_org.kde.ktp-presence.mo +share/locale/fr/LC_MESSAGES/plasma_applet_org.kde.ktp-contact.mo +share/locale/fr/LC_MESSAGES/plasma_applet_org.kde.ktp-presence.mo +share/locale/ga/LC_MESSAGES/plasma_applet_org.kde.ktp-contact.mo +share/locale/ga/LC_MESSAGES/plasma_applet_org.kde.ktp-presence.mo +share/locale/gl/LC_MESSAGES/plasma_applet_org.kde.ktp-contact.mo +share/locale/gl/LC_MESSAGES/plasma_applet_org.kde.ktp-presence.mo +share/locale/hu/LC_MESSAGES/plasma_applet_org.kde.ktp-contact.mo +share/locale/hu/LC_MESSAGES/plasma_applet_org.kde.ktp-presence.mo +share/locale/ia/LC_MESSAGES/plasma_applet_org.kde.ktp-contact.mo +share/locale/ia/LC_MESSAGES/plasma_applet_org.kde.ktp-presence.mo +share/locale/it/LC_MESSAGES/plasma_applet_org.kde.ktp-contact.mo +share/locale/it/LC_MESSAGES/plasma_applet_org.kde.ktp-presence.mo +share/locale/ja/LC_MESSAGES/plasma_applet_org.kde.ktp-contact.mo +share/locale/ja/LC_MESSAGES/plasma_applet_org.kde.ktp-presence.mo +share/locale/kk/LC_MESSAGES/plasma_applet_org.kde.ktp-contact.mo +share/locale/kk/LC_MESSAGES/plasma_applet_org.kde.ktp-presence.mo +share/locale/km/LC_MESSAGES/plasma_applet_org.kde.ktp-contact.mo +share/locale/km/LC_MESSAGES/plasma_applet_org.kde.ktp-presence.mo +share/locale/ko/LC_MESSAGES/plasma_applet_org.kde.ktp-contact.mo +share/locale/ko/LC_MESSAGES/plasma_applet_org.kde.ktp-presence.mo +share/locale/lt/LC_MESSAGES/plasma_applet_org.kde.ktp-contact.mo +share/locale/lt/LC_MESSAGES/plasma_applet_org.kde.ktp-presence.mo +share/locale/mr/LC_MESSAGES/plasma_applet_org.kde.ktp-contact.mo +share/locale/mr/LC_MESSAGES/plasma_applet_org.kde.ktp-presence.mo +share/locale/nb/LC_MESSAGES/plasma_applet_org.kde.ktp-contact.mo +share/locale/nb/LC_MESSAGES/plasma_applet_org.kde.ktp-presence.mo +share/locale/nds/LC_MESSAGES/plasma_applet_org.kde.ktp-contact.mo +share/locale/nds/LC_MESSAGES/plasma_applet_org.kde.ktp-presence.mo +share/locale/nl/LC_MESSAGES/plasma_applet_org.kde.ktp-contact.mo +share/locale/nl/LC_MESSAGES/plasma_applet_org.kde.ktp-presence.mo +share/locale/pl/LC_MESSAGES/plasma_applet_org.kde.ktp-contact.mo +share/locale/pl/LC_MESSAGES/plasma_applet_org.kde.ktp-presence.mo +share/locale/pt/LC_MESSAGES/plasma_applet_org.kde.ktp-contact.mo +share/locale/pt/LC_MESSAGES/plasma_applet_org.kde.ktp-presence.mo +share/locale/pt_BR/LC_MESSAGES/plasma_applet_org.kde.ktp-contact.mo +share/locale/pt_BR/LC_MESSAGES/plasma_applet_org.kde.ktp-presence.mo +share/locale/ro/LC_MESSAGES/plasma_applet_org.kde.ktp-contact.mo +share/locale/ro/LC_MESSAGES/plasma_applet_org.kde.ktp-presence.mo +share/locale/ru/LC_MESSAGES/plasma_applet_org.kde.ktp-contact.mo +share/locale/ru/LC_MESSAGES/plasma_applet_org.kde.ktp-presence.mo +share/locale/sk/LC_MESSAGES/plasma_applet_org.kde.ktp-contact.mo +share/locale/sk/LC_MESSAGES/plasma_applet_org.kde.ktp-presence.mo +share/locale/sl/LC_MESSAGES/plasma_applet_org.kde.ktp-contact.mo +share/locale/sl/LC_MESSAGES/plasma_applet_org.kde.ktp-presence.mo +share/locale/sr/LC_MESSAGES/plasma_applet_org.kde.ktp-contact.mo +share/locale/sr/LC_MESSAGES/plasma_applet_org.kde.ktp-presence.mo +share/locale/sr@ijekavian/LC_MESSAGES/plasma_applet_org.kde.ktp-contact.mo +share/locale/sr@ijekavian/LC_MESSAGES/plasma_applet_org.kde.ktp-presence.mo +share/locale/sr@ijekavianlatin/LC_MESSAGES/plasma_applet_org.kde.ktp-contact.mo +share/locale/sr@ijekavianlatin/LC_MESSAGES/plasma_applet_org.kde.ktp-presence.mo +share/locale/sr@latin/LC_MESSAGES/plasma_applet_org.kde.ktp-contact.mo +share/locale/sr@latin/LC_MESSAGES/plasma_applet_org.kde.ktp-presence.mo +share/locale/sv/LC_MESSAGES/plasma_applet_org.kde.ktp-contact.mo +share/locale/sv/LC_MESSAGES/plasma_applet_org.kde.ktp-presence.mo +share/locale/tr/LC_MESSAGES/plasma_applet_org.kde.ktp-contact.mo +share/locale/tr/LC_MESSAGES/plasma_applet_org.kde.ktp-presence.mo +share/locale/uk/LC_MESSAGES/plasma_applet_org.kde.ktp-contact.mo +share/locale/uk/LC_MESSAGES/plasma_applet_org.kde.ktp-presence.mo +share/locale/vi/LC_MESSAGES/plasma_applet_org.kde.ktp-contact.mo +share/locale/vi/LC_MESSAGES/plasma_applet_org.kde.ktp-presence.mo +share/locale/wa/LC_MESSAGES/plasma_applet_org.kde.ktp-contact.mo +share/locale/zh_CN/LC_MESSAGES/plasma_applet_org.kde.ktp-contact.mo +share/locale/zh_CN/LC_MESSAGES/plasma_applet_org.kde.ktp-presence.mo +share/locale/zh_TW/LC_MESSAGES/plasma_applet_org.kde.ktp-contact.mo +share/locale/zh_TW/LC_MESSAGES/plasma_applet_org.kde.ktp-presence.mo Index: net-im/ktp-filetransfer-handler/Makefile =================================================================== --- net-im/ktp-filetransfer-handler/Makefile +++ net-im/ktp-filetransfer-handler/Makefile @@ -2,7 +2,6 @@ PORTNAME= ktp-filetransfer-handler PORTVERSION= ${KTP_VERSION} -PORTREVISION= 3 CATEGORIES= net-im kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src @@ -13,7 +12,7 @@ LIB_DEPENDS= libtelepathy-qt4.so:${PORTSDIR}/net-im/telepathy-qt4 \ libktpcommoninternalsprivate.so:${PORTSDIR}/net-im/ktp-common-internals -USE_KDE4= kdehier kdeprefix kdelibs automoc4 +USE_KDE4= kdeprefix kdelibs automoc4 USE_QT4= corelib moc_build qmake_build rcc_build uic_build USES= cmake gettext tar:bzip2 Index: net-im/ktp-filetransfer-handler/distinfo =================================================================== --- net-im/ktp-filetransfer-handler/distinfo +++ net-im/ktp-filetransfer-handler/distinfo @@ -1,2 +1,2 @@ -SHA256 (ktp-filetransfer-handler-0.6.1.tar.bz2) = 7be5a82ff77e26fc24d9acf664fee737ea4385972457116ef52340ec9760905b -SIZE (ktp-filetransfer-handler-0.6.1.tar.bz2) = 45938 +SHA256 (ktp-filetransfer-handler-0.8.0.tar.bz2) = 8cf06bd8a7a50498985bd5b51a263db1233770aeb4ea4d5c196191f4f785f453 +SIZE (ktp-filetransfer-handler-0.8.0.tar.bz2) = 47510 Index: net-im/ktp-filetransfer-handler/pkg-plist =================================================================== --- net-im/ktp-filetransfer-handler/pkg-plist +++ net-im/ktp-filetransfer-handler/pkg-plist @@ -18,6 +18,7 @@ share/locale/it/LC_MESSAGES/ktp-filetransfer-handler.mo share/locale/ja/LC_MESSAGES/ktp-filetransfer-handler.mo share/locale/kk/LC_MESSAGES/ktp-filetransfer-handler.mo +share/locale/ko/LC_MESSAGES/ktp-filetransfer-handler.mo share/locale/lt/LC_MESSAGES/ktp-filetransfer-handler.mo share/locale/mr/LC_MESSAGES/ktp-filetransfer-handler.mo share/locale/nb/LC_MESSAGES/ktp-filetransfer-handler.mo Index: net-im/ktp-kded-integration-module/Makefile =================================================================== --- net-im/ktp-kded-integration-module/Makefile +++ net-im/ktp-kded-integration-module/Makefile @@ -2,7 +2,6 @@ PORTNAME= ktp-kded-integration-module PORTVERSION= ${KTP_VERSION} -PORTREVISION= 3 CATEGORIES= net-im kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src @@ -13,7 +12,7 @@ LIB_DEPENDS= libtelepathy-qt4.so:${PORTSDIR}/net-im/telepathy-qt4 \ libktpcommoninternalsprivate.so:${PORTSDIR}/net-im/ktp-common-internals -USE_KDE4= kdehier kdeprefix kdelibs automoc4 +USE_KDE4= kdeprefix kdelibs automoc4 USE_QT4= corelib moc_build qmake_build rcc_build uic_build USES= cmake gettext tar:bzip2 Index: net-im/ktp-kded-integration-module/distinfo =================================================================== --- net-im/ktp-kded-integration-module/distinfo +++ net-im/ktp-kded-integration-module/distinfo @@ -1,2 +1,2 @@ -SHA256 (ktp-kded-integration-module-0.6.1.tar.bz2) = de26d4865cea9851d088d812b17034f320f59b76aa1c89a2c4ca89e585df1ad2 -SIZE (ktp-kded-integration-module-0.6.1.tar.bz2) = 67554 +SHA256 (ktp-kded-integration-module-0.8.0.tar.bz2) = 2b801eb4e19713b2dbfe28f79421aa4c9e0fa298383ca0f8a604fa1f557de233 +SIZE (ktp-kded-integration-module-0.8.0.tar.bz2) = 76893 Index: net-im/ktp-kded-integration-module/pkg-plist =================================================================== --- net-im/ktp-kded-integration-module/pkg-plist +++ net-im/ktp-kded-integration-module/pkg-plist @@ -22,6 +22,7 @@ share/locale/ja/LC_MESSAGES/kded_ktp_integration_module.mo share/locale/kk/LC_MESSAGES/kded_ktp_integration_module.mo share/locale/km/LC_MESSAGES/kded_ktp_integration_module.mo +share/locale/ko/LC_MESSAGES/kded_ktp_integration_module.mo share/locale/lt/LC_MESSAGES/kded_ktp_integration_module.mo share/locale/mr/LC_MESSAGES/kded_ktp_integration_module.mo share/locale/nb/LC_MESSAGES/kded_ktp_integration_module.mo Index: net-im/ktp-send-file/Makefile =================================================================== --- net-im/ktp-send-file/Makefile +++ net-im/ktp-send-file/Makefile @@ -2,7 +2,6 @@ PORTNAME= ktp-send-file PORTVERSION= ${KTP_VERSION} -PORTREVISION= 3 CATEGORIES= net-im kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src @@ -15,7 +14,7 @@ RUN_DEPENDS= ${KDE4_PREFIX}/lib/kde4/libexec/ktp-filetransfer-handler:${PORTSDIR}/net-im/ktp-filetransfer-handler \ ${KDE4_PREFIX}/bin/ktp-contactlist:${PORTSDIR}/net-im/ktp-contact-list -USE_KDE4= kdehier kdeprefix kdelibs automoc4 +USE_KDE4= kdeprefix kdelibs automoc4 USE_QT4= corelib moc_build qmake_build rcc_build uic_build USES= cmake gettext tar:bzip2 Index: net-im/ktp-send-file/distinfo =================================================================== --- net-im/ktp-send-file/distinfo +++ net-im/ktp-send-file/distinfo @@ -1,2 +1,2 @@ -SHA256 (ktp-send-file-0.6.1.tar.bz2) = 9523781e5f6a476591c12aa10e788dd1181c014ffab21a4828c3c879da6a9f2a -SIZE (ktp-send-file-0.6.1.tar.bz2) = 28904 +SHA256 (ktp-send-file-0.8.0.tar.bz2) = 999fd217fe2b049aca470e6acc09c6d0f539472622b98623cdbb36b2e6bf9034 +SIZE (ktp-send-file-0.8.0.tar.bz2) = 29485 Index: net-im/ktp-send-file/pkg-plist =================================================================== --- net-im/ktp-send-file/pkg-plist +++ net-im/ktp-send-file/pkg-plist @@ -19,6 +19,7 @@ share/locale/ja/LC_MESSAGES/ktp-send-file.mo share/locale/kk/LC_MESSAGES/ktp-send-file.mo share/locale/km/LC_MESSAGES/ktp-send-file.mo +share/locale/ko/LC_MESSAGES/ktp-send-file.mo share/locale/lt/LC_MESSAGES/ktp-send-file.mo share/locale/mr/LC_MESSAGES/ktp-send-file.mo share/locale/nb/LC_MESSAGES/ktp-send-file.mo Index: net-im/ktp-text-ui/Makefile =================================================================== --- net-im/ktp-text-ui/Makefile +++ 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 @@ 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 Index: net-im/ktp-text-ui/distinfo =================================================================== --- net-im/ktp-text-ui/distinfo +++ 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 Index: net-im/ktp-text-ui/files/patch-config__appearance-config-tab.cpp =================================================================== --- net-im/ktp-text-ui/files/patch-config__appearance-config-tab.cpp +++ net-im/ktp-text-ui/files/patch-config__appearance-config-tab.cpp @@ -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 " - "" - "here!")); -@@ -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")); Index: net-im/ktp-text-ui/pkg-plist =================================================================== --- net-im/ktp-text-ui/pkg-plist +++ net-im/ktp-text-ui/pkg-plist @@ -1,35 +1,18 @@ 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 @@ -36,6 +19,8 @@ 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/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@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/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/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/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/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/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/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 Index: net-im/plasma-applet-ktp/Makefile =================================================================== --- net-im/plasma-applet-ktp/Makefile +++ net-im/plasma-applet-ktp/Makefile @@ -2,7 +2,6 @@ PORTNAME= ktp PORTVERSION= ${KTP_VERSION} -PORTREVISION= 4 CATEGORIES= net-im kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src @@ -15,7 +14,7 @@ LIB_DEPENDS= libtelepathy-qt4.so:${PORTSDIR}/net-im/telepathy-qt4 \ libktpcommoninternalsprivate.so:${PORTSDIR}/net-im/ktp-common-internals -USE_KDE4= kdehier kdeprefix kdelibs automoc4 +USE_KDE4= kdeprefix kdelibs automoc4 USE_QT4= corelib declarative \ moc_build qmake_build rcc_build uic_build USES= cmake gettext tar:bzip2 Index: net-im/telepathy-logger-qt4/Makefile =================================================================== --- net-im/telepathy-logger-qt4/Makefile +++ net-im/telepathy-logger-qt4/Makefile @@ -1,11 +1,10 @@ # $FreeBSD$ PORTNAME= telepathy-logger-qt4 -PORTVERSION= 0.6.0 -PORTREVISION= 2 +PORTVERSION= ${KTP_VERSION} CATEGORIES= net-im MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/kde-telepathy/${PORTVERSION}/src +MASTER_SITE_SUBDIR= stable/${PORTNAME:C/4$//}/${PORTVERSION}/src DISTNAME= ${PORTNAME:C/4$//}-${PORTVERSION} MAINTAINER= avilla@FreeBSD.org Index: net-im/telepathy-logger-qt4/distinfo =================================================================== --- net-im/telepathy-logger-qt4/distinfo +++ net-im/telepathy-logger-qt4/distinfo @@ -1,2 +1,2 @@ -SHA256 (telepathy-logger-qt-0.6.0.tar.bz2) = 3dee0e49725ee0f40bc137322c2dd2a9499de0506d056091f80d0ee416f3b104 -SIZE (telepathy-logger-qt-0.6.0.tar.bz2) = 105254 +SHA256 (telepathy-logger-qt-0.8.0.tar.bz2) = 6d674ee72e7b6efbfb912d5741c1e1b8a55f78f83e2754588f800582a128ec08 +SIZE (telepathy-logger-qt-0.8.0.tar.bz2) = 108403 Index: net-im/telepathy-logger-qt4/pkg-plist =================================================================== --- net-im/telepathy-logger-qt4/pkg-plist +++ net-im/telepathy-logger-qt4/pkg-plist @@ -4,6 +4,7 @@ include/telepathy-logger-0.2/TelepathyLoggerQt4/Global include/telepathy-logger-0.2/TelepathyLoggerQt4/Init include/telepathy-logger-0.2/TelepathyLoggerQt4/LogManager +include/telepathy-logger-0.2/TelepathyLoggerQt4/LogWalker include/telepathy-logger-0.2/TelepathyLoggerQt4/PendingDates include/telepathy-logger-0.2/TelepathyLoggerQt4/PendingEntities include/telepathy-logger-0.2/TelepathyLoggerQt4/PendingEvents @@ -21,6 +22,7 @@ include/telepathy-logger-0.2/TelepathyLoggerQt4/global.h include/telepathy-logger-0.2/TelepathyLoggerQt4/init.h include/telepathy-logger-0.2/TelepathyLoggerQt4/log-manager.h +include/telepathy-logger-0.2/TelepathyLoggerQt4/log-walker.h include/telepathy-logger-0.2/TelepathyLoggerQt4/pending-dates.h include/telepathy-logger-0.2/TelepathyLoggerQt4/pending-entities.h include/telepathy-logger-0.2/TelepathyLoggerQt4/pending-events.h @@ -35,5 +37,5 @@ lib/cmake/TelepathyLoggerQt4/TelepathyLoggerQt4Targets.cmake lib/libtelepathy-logger-qt4.so lib/libtelepathy-logger-qt4.so.1 -lib/libtelepathy-logger-qt4.so.1.0.5.60 +lib/libtelepathy-logger-qt4.so.1.0.8.0 libdata/pkgconfig/TelepathyLoggerQt4.pc