Hello community, here is the log from the commit of package ktp-text-ui for openSUSE:Factory checked in at 2016-08-29 14:47:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ktp-text-ui (Old) and /work/SRC/openSUSE:Factory/.ktp-text-ui.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ktp-text-ui" Changes: -------- --- /work/SRC/openSUSE:Factory/ktp-text-ui/ktp-text-ui.changes 2016-07-15 12:44:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ktp-text-ui.new/ktp-text-ui.changes 2016-08-29 14:47:29.000000000 +0200 @@ -1,0 +2,24 @@ +Fri Aug 12 10:27:07 UTC 2016 - tittiatc...@gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Tue Aug 9 12:03:37 UTC 2016 - wba...@tmo.at + +- Don't use -a when copying the icon, it may be a symlink to + breeze-dark which would break if breeze5-icons is not installed + +------------------------------------------------------------------- +Mon Aug 8 15:30:40 UTC 2016 - tittiatc...@gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + +- Drop patch fix_desktop.diff. The right icon is in the breeze theme, + so we just need to copy it to the right place + +------------------------------------------------------------------- Old: ---- fix_desktop.diff ktp-text-ui-16.04.3.tar.xz New: ---- ktp-text-ui-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ktp-text-ui.spec ++++++ --- /var/tmp/diff_new_pack.MGET8U/_old 2016-08-29 14:47:32.000000000 +0200 +++ /var/tmp/diff_new_pack.MGET8U/_new 2016-08-29 14:47:32.000000000 +0200 @@ -17,14 +17,13 @@ Name: ktp-text-ui -Version: 16.04.3 +Version: 16.08.0 Release: 0 Summary: Telepathy chat handler for KDE License: GPL-2.0+ Group: Productivity/Networking/Instant Messenger Url: http://community.kde.org/Real-Time_Communication_and_Collaboration Source: %{name}-%{version}.tar.xz -Patch0: fix_desktop.diff BuildRequires: extra-cmake-modules >= 1.3.0 BuildRequires: fdupes BuildRequires: karchive-devel @@ -48,7 +47,7 @@ BuildRequires: kwidgetsaddons-devel BuildRequires: kwindowsystem-devel BuildRequires: kxmlgui-devel -BuildRequires: oxygen-icon-theme-large +BuildRequires: breeze5-icons BuildRequires: sonnet-devel BuildRequires: telepathy-logger-qt5-devel BuildRequires: telepathy-qt5-devel @@ -66,7 +65,6 @@ %prep %setup -q -%patch0 -p1 %build %cmake_kf5 -d build @@ -76,11 +74,8 @@ %kf5_makeinstall -C build %fdupes -s %{buildroot} -for i in {16,22,32,48}; do - mkdir -p %{buildroot}%{_kf5_iconsdir}/hicolor/"$i"x"$i"/apps - cp -a %{_kf5_iconsdir}/oxygen/"$i"x"$i"/actions/documentation.png %{buildroot}%{_kf5_iconsdir}/hicolor/"$i"x"$i"/apps/ktp-log-viewer.png \ - || cp -a %{_kf5_iconsdir}/oxygen/base/"$i"x"$i"/actions/documentation.png %{buildroot}%{_kf5_iconsdir}/hicolor/"$i"x"$i"/apps/ktp-log-viewer.png -done + mkdir -p %{buildroot}%{_kf5_iconsdir}/hicolor/scalable/apps + cp %{_kf5_iconsdir}/breeze/apps/48/kde-im-log-viewer.svg %{buildroot}%{_kf5_iconsdir}/hicolor/scalable/apps/ %files %defattr(-,root,root) @@ -96,7 +91,7 @@ %{_kf5_bindir}/ktp-log-viewer %{_kf5_applicationsdir}/*.desktop %{_kf5_sharedir}/ktp-log-viewer/ -%{_kf5_iconsdir}/hicolor/*/apps/ktp-log-viewer.png +%{_kf5_iconsdir}/hicolor/scalable/apps/kde-im-log-viewer.svg %{_kf5_plugindir}/ %{_kf5_servicesdir}/ %{_kf5_servicetypesdir}/ ++++++ ktp-text-ui-16.04.3.tar.xz -> ktp-text-ui-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-text-ui-16.04.3/CMakeLists.txt new/ktp-text-ui-16.08.0/CMakeLists.txt --- old/ktp-text-ui-16.04.3/CMakeLists.txt 2016-07-02 18:13:27.000000000 +0200 +++ new/ktp-text-ui-16.08.0/CMakeLists.txt 2016-08-10 01:26:52.000000000 +0200 @@ -4,8 +4,8 @@ # KDE Application Version, managed by release script set(KDE_APPLICATIONS_VERSION_MAJOR "16") -set(KDE_APPLICATIONS_VERSION_MINOR "04") -set(KDE_APPLICATIONS_VERSION_MICRO "3") +set(KDE_APPLICATIONS_VERSION_MINOR "08") +set(KDE_APPLICATIONS_VERSION_MICRO "0") set(KTP_TEXT_UI_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") set(KTP_MESSAGE_FILTER_FRAMEWORK_VERSION "5") set(IS_KTP_INTERNAL_MODULE TRUE) @@ -39,6 +39,7 @@ if (KF5People_FOUND) add_definitions(-DHAVE_KPEOPLE) endif () +add_definitions(-DQT_NO_URL_CAST_FROM_STRING) add_subdirectory(image-sharer) add_subdirectory(lib) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-text-ui-16.04.3/adiumxtra-protocol-handler/adiumxtra-protocol-handler.cpp new/ktp-text-ui-16.08.0/adiumxtra-protocol-handler/adiumxtra-protocol-handler.cpp --- old/ktp-text-ui-16.04.3/adiumxtra-protocol-handler/adiumxtra-protocol-handler.cpp 2016-07-02 18:13:27.000000000 +0200 +++ new/ktp-text-ui-16.08.0/adiumxtra-protocol-handler/adiumxtra-protocol-handler.cpp 2016-08-10 01:26:52.000000000 +0200 @@ -63,7 +63,7 @@ QTemporaryFile *tmpFile = new QTemporaryFile(); if (tmpFile->open()) { - KIO::Job* getJob = KIO::file_copy(url.toDisplayString(), QUrl(tmpFile->fileName()), -1, + KIO::Job* getJob = KIO::file_copy(url, QUrl::fromLocalFile(tmpFile->fileName()), -1, KIO::Overwrite | KIO::HideProgressInfo); if (getJob->exec()) { qWarning() << "Download failed"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-text-ui-16.04.3/app/chat-window.cpp new/ktp-text-ui-16.08.0/app/chat-window.cpp --- old/ktp-text-ui-16.04.3/app/chat-window.cpp 2016-07-02 18:13:27.000000000 +0200 +++ new/ktp-text-ui-16.08.0/app/chat-window.cpp 2016-08-10 01:26:52.000000000 +0200 @@ -439,7 +439,7 @@ onOtrStatusChanged(currentChatTab->otrStatus()); // Allow "Leaving" rooms only in group chat, and when persistent rooms are enabled - actionCollection()->action(QLatin1String("leave-chat"))->setEnabled(currentChatTab->isGroupChat() && TextChatConfig::instance()->dontLeaveGroupChats()); + actionCollection()->action(QLatin1String("leave-chat"))->setEnabled(currentChatTab->isGroupChat()); // No point having "Close" action with only one tab, it behaves exactly like "Quit" actionCollection()->action(QLatin1String("file_close"))->setVisible(m_tabWidget->count() > 1); @@ -1205,7 +1205,7 @@ void ChatWindow::offerDocumentToContact(const Tp::AccountPtr& account, const Tp::ContactPtr& targetContact) { - const QUrl url = QFileDialog::getOpenFileName(); + const QUrl url = QUrl::fromLocalFile(QFileDialog::getOpenFileName()); if ( ! url.isEmpty() ) { KTp::Actions::startCollaborativeEditing(account, targetContact, QList<QUrl>() << url, true); } @@ -1213,7 +1213,7 @@ void ChatWindow::offerDocumentToChatroom(const Tp::AccountPtr& account, const QString& roomName) { - const QUrl url = QFileDialog::getOpenFileName(); + const QUrl url = QUrl::fromLocalFile(QFileDialog::getOpenFileName()); if ( ! url.isEmpty() ) { KTp::Actions::startCollaborativeEditing(account, roomName, QList<QUrl>() << url, true); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-text-ui-16.04.3/image-sharer/imagebinsharer.cpp new/ktp-text-ui-16.08.0/image-sharer/imagebinsharer.cpp --- old/ktp-text-ui-16.04.3/image-sharer/imagebinsharer.cpp 2016-07-02 18:13:27.000000000 +0200 +++ new/ktp-text-ui-16.08.0/image-sharer/imagebinsharer.cpp 2016-08-10 01:26:52.000000000 +0200 @@ -48,7 +48,7 @@ QByteArray ImageBinSharer::postBody(const QByteArray& imageData) { - m_form.addFile(QLatin1String("file"), m_contentPath, imageData); + m_form.addFile(QLatin1String("file"), QUrl::fromLocalFile(m_contentPath), imageData); m_form.finish(); return m_form.formData(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-text-ui-16.04.3/image-sharer/imgursharer.cpp new/ktp-text-ui-16.08.0/image-sharer/imgursharer.cpp --- old/ktp-text-ui-16.04.3/image-sharer/imgursharer.cpp 2016-07-02 18:13:27.000000000 +0200 +++ new/ktp-text-ui-16.08.0/image-sharer/imgursharer.cpp 2016-08-10 01:26:52.000000000 +0200 @@ -46,7 +46,7 @@ QByteArray ImgurSharer::postBody(const QByteArray &imageData) { // Create the request body - m_form.addFile(QLatin1String("image"), m_contentPath, imageData); + m_form.addFile(QLatin1String("image"), QUrl::fromLocalFile(m_contentPath), imageData); m_form.finish(); return m_form.formData(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-text-ui-16.04.3/image-sharer/simplestimagehostingsharer.cpp new/ktp-text-ui-16.08.0/image-sharer/simplestimagehostingsharer.cpp --- old/ktp-text-ui-16.04.3/image-sharer/simplestimagehostingsharer.cpp 2016-07-02 18:13:27.000000000 +0200 +++ new/ktp-text-ui-16.08.0/image-sharer/simplestimagehostingsharer.cpp 2016-08-10 01:26:52.000000000 +0200 @@ -36,7 +36,7 @@ QString responseString = QLatin1String(responseData); QRegExp exp(QLatin1String("800\n(http://.+)\n")); if ( exp.indexIn(responseString) != -1) { - m_imageUrl = responseString.replace(QLatin1String("800"), QLatin1String("")).replace(QLatin1String("\n"), QLatin1String("")); + m_imageUrl = QUrl(responseString.remove(QLatin1String("800")).remove(QLatin1String("\n"))); } else { m_hasError = true; m_errorMessage = responseString; @@ -45,7 +45,7 @@ QByteArray SimplestImageHostingSharer::postBody(const QByteArray& imageData) { - m_form.addFile(QLatin1String("fileName"), m_contentPath, imageData); + m_form.addFile(QLatin1String("fileName"), QUrl::fromLocalFile(m_contentPath), imageData); m_form.finish(); return m_form.formData(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-text-ui-16.04.3/lib/chat-widget.cpp new/ktp-text-ui-16.08.0/lib/chat-widget.cpp --- old/ktp-text-ui-16.04.3/lib/chat-widget.cpp 2016-07-02 18:13:27.000000000 +0200 +++ new/ktp-text-ui-16.08.0/lib/chat-widget.cpp 2016-08-10 01:26:52.000000000 +0200 @@ -1417,14 +1417,14 @@ info.setDestinationDisplayName(otherContact->alias()); info.setDestinationName(otherContact->id()); info.setChatName(otherContact->alias()); - info.setIncomingIconPath(otherContact->avatarData().fileName); + info.setIncomingIconPath(QUrl::fromLocalFile(otherContact->avatarData().fileName)); d->ui.contactsView->hide(); } info.setSourceName(d->channel->textChannel()->connection()->protocolName()); //set up anything related to 'self' - info.setOutgoingIconPath(d->channel->textChannel()->groupSelfContact()->avatarData().fileName); + info.setOutgoingIconPath(QUrl::fromLocalFile(d->channel->textChannel()->groupSelfContact()->avatarData().fileName)); //set the message time if (!d->channel->messageQueue().isEmpty()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-text-ui-16.04.3/logviewer/entity-view.cpp new/ktp-text-ui-16.08.0/logviewer/entity-view.cpp --- old/ktp-text-ui-16.04.3/logviewer/entity-view.cpp 2016-07-02 18:13:27.000000000 +0200 +++ new/ktp-text-ui-16.08.0/logviewer/entity-view.cpp 2016-08-10 01:26:52.000000000 +0200 @@ -61,7 +61,7 @@ const QString selectedPersonaId = QCoreApplication::arguments().at(0); for (int i = start; i <= end; i++) { const QModelIndex index = model()->index(i, 0, parent); - if (index.data(KTp::PersonIdRole).toUrl() == selectedPersonaId) { + if (index.data(KTp::PersonIdRole).toUrl().toString() == selectedPersonaId) { selectedIndex = index; break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-text-ui-16.04.3/logviewer/log-viewer.cpp new/ktp-text-ui-16.08.0/logviewer/log-viewer.cpp --- old/ktp-text-ui-16.04.3/logviewer/log-viewer.cpp 2016-07-02 18:13:27.000000000 +0200 +++ new/ktp-text-ui-16.08.0/logviewer/log-viewer.cpp 2016-08-10 01:26:52.000000000 +0200 @@ -67,7 +67,7 @@ KXmlGuiWindow(parent), ui(new Ui::LogViewer) { - setWindowIcon(QIcon::fromTheme(QStringLiteral("documentation"))); + setWindowIcon(QIcon::fromTheme(QStringLiteral("kde-im-log-viewer"))); QWidget *widget = new QWidget(this); setCentralWidget(widget); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-text-ui-16.04.3/logviewer/main.cpp new/ktp-text-ui-16.08.0/logviewer/main.cpp --- old/ktp-text-ui-16.04.3/logviewer/main.cpp 2016-07-02 18:13:27.000000000 +0200 +++ new/ktp-text-ui-16.08.0/logviewer/main.cpp 2016-08-10 01:26:52.000000000 +0200 @@ -50,7 +50,6 @@ aboutData.setLicense(KAboutLicense::GPL_V2); KAboutData::setApplicationData(aboutData); - QApplication::setWindowIcon(QIcon::fromTheme(QStringLiteral("documentation"))); // register to DBus const KDBusService dbusService(KDBusService::Multiple); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-text-ui-16.04.3/logviewer/message-view.cpp new/ktp-text-ui-16.08.0/logviewer/message-view.cpp --- old/ktp-text-ui-16.04.3/logviewer/message-view.cpp 2016-07-02 18:13:27.000000000 +0200 +++ new/ktp-text-ui-16.08.0/logviewer/message-view.cpp 2016-08-10 01:26:52.000000000 +0200 @@ -126,7 +126,7 @@ headerInfo.setChatName(m_contact.isNull() ? m_entity.alias() : m_contact->alias()); headerInfo.setGroupChat(m_entity.entityType() == Tp::HandleTypeRoom); headerInfo.setSourceName(m_account->displayName()); - headerInfo.setIncomingIconPath(m_contact.isNull() ? QString() : m_contact->avatarData().fileName); + headerInfo.setIncomingIconPath(m_contact.isNull() ? QUrl() : QUrl::fromLocalFile(m_contact->avatarData().fileName)); headerInfo.setService(m_account->serviceName()); // check iconPath docs for minus sign in -KIconLoader::SizeMedium headerInfo.setServiceIconPath(KIconLoader::global()->iconPath(m_account->iconName(), -KIconLoader::SizeMedium)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-text-ui-16.04.3/logviewer/org.kde.ktplogviewer.desktop new/ktp-text-ui-16.08.0/logviewer/org.kde.ktplogviewer.desktop --- old/ktp-text-ui-16.04.3/logviewer/org.kde.ktplogviewer.desktop 2016-07-02 18:13:27.000000000 +0200 +++ new/ktp-text-ui-16.08.0/logviewer/org.kde.ktplogviewer.desktop 2016-08-10 01:26:52.000000000 +0200 @@ -141,7 +141,7 @@ Exec=ktp-log-viewer %u Type=Application Terminal=false -Icon=documentation +Icon=kde-im-log-viewer Categories=Qt;KDE;Network;InstantMessaging; X-DBUS-StartupType=Unique X-DBUS-ServiceName=org.kde.ktplogviewer
