diff -Nru ktp-text-ui-15.12.3/debian/changelog ktp-text-ui-15.12.3/debian/changelog --- ktp-text-ui-15.12.3/debian/changelog 2016-04-14 23:12:23.000000000 +0000 +++ ktp-text-ui-15.12.3/debian/changelog 2016-06-20 13:12:14.000000000 +0000 @@ -1,7 +1,13 @@ +ktp-text-ui (4:15.12.3-0ubuntu2) xenial; urgency=medium + + * Fixing "empty ktp-text-uid" crashes. (LP: #1556653) + + -- Rafael David Tinoco Mon, 20 Jun 2016 12:41:10 +0000 + ktp-text-ui (4:15.12.3-0ubuntu1) xenial; urgency=medium * New upstream bugfix release - * Add missing epoch libktp-dev. + * Add missing epoch libktp-dev. * New upstream bugfix release -- Scarlett Clark Thu, 14 Apr 2016 16:12:23 -0700 @@ -34,8 +40,8 @@ ktp-text-ui (4:15.08.1-0ubuntu1) wily; urgency=medium [ Scarlett Clark ] - * Fix random crash (LP #1493704) and KDE #347313 by - adding runtime dependency to libkf5emonticons-bin. + * Fix random crash (LP #1493704) and KDE #347313 by + adding runtime dependency to libkf5emonticons-bin. [ Clive Johnston ] * New upstream release (15.08.1) diff -Nru ktp-text-ui-15.12.3/debian/patches/instantiate-qapplication-before-calling-session-bus.patch ktp-text-ui-15.12.3/debian/patches/instantiate-qapplication-before-calling-session-bus.patch --- ktp-text-ui-15.12.3/debian/patches/instantiate-qapplication-before-calling-session-bus.patch 1970-01-01 00:00:00.000000000 +0000 +++ ktp-text-ui-15.12.3/debian/patches/instantiate-qapplication-before-calling-session-bus.patch 2016-06-20 12:50:36.000000000 +0000 @@ -0,0 +1,35 @@ +Description: Instantiate QApplication before calling sessionBus() + +Instantiate QApplication before calling sessionBus() + +Otherwise, the names can be available on the bus before the objects +are registered with QtDBus. This causes the text-ui to be empty when +started from ktp-contact-list with qt 5.6. + +REVIEW: 127493 + +Origin: upstream, 5015460c6fbd9696bf482e53e7cb94b64097db12 +Bug: https://bugs.kde.org/show_bug.cgi?id=361459 +Bug-Ubuntu: https://launchpad.net/bugs/1556653 +Reviewed-By: Rafael David Tinoco +Last-Update: 2016-06-20 + +--- ktp-text-ui-15.12.3.orig/app/main.cpp ++++ ktp-text-ui-15.12.3/app/main.cpp +@@ -51,6 +51,8 @@ int main(int argc, char *argv[]) + Tp::registerTypes(); + KTp::registerOtrTypes(); + ++ Tp::SharedPtr app(new TelepathyChatUi(argc, argv)); ++ + Tp::ChannelFactoryPtr channelFactory = Tp::ChannelFactory::create(QDBusConnection::sessionBus()); + channelFactory->addCommonFeatures(Tp::Channel::FeatureCore); + +@@ -64,7 +66,6 @@ int main(int argc, char *argv[]) + + Tp::ClientRegistrarPtr registrar = Tp::ClientRegistrar::create(KTp::accountFactory(), KTp::connectionFactory(), channelFactory, KTp::contactFactory()); + +- Tp::SharedPtr app(new TelepathyChatUi(argc, argv)); + Tp::AbstractClientPtr handler = Tp::AbstractClientPtr(app); + registrar->registerClient(handler, QLatin1String(KTP_TEXTUI_CLIENT_NAME)); + diff -Nru ktp-text-ui-15.12.3/debian/patches/series ktp-text-ui-15.12.3/debian/patches/series --- ktp-text-ui-15.12.3/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ ktp-text-ui-15.12.3/debian/patches/series 2016-06-20 12:48:31.000000000 +0000 @@ -0,0 +1 @@ +instantiate-qapplication-before-calling-session-bus.patch