Hello community, here is the log from the commit of package kemoticons for openSUSE:Factory checked in at 2018-01-22 16:00:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kemoticons (Old) and /work/SRC/openSUSE:Factory/.kemoticons.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kemoticons" Mon Jan 22 16:00:05 2018 rev:48 rq:566675 version:5.42.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kemoticons/kemoticons.changes 2018-01-09 14:41:51.539689138 +0100 +++ /work/SRC/openSUSE:Factory/.kemoticons.new/kemoticons.changes 2018-01-22 16:00:07.785555112 +0100 @@ -1,0 +2,17 @@ +Tue Jan 16 22:50:17 CET 2018 - [email protected] + +- Update to 5.42.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.42.0.php +- Changes since 5.41.0: + * Remove obsolete reviewboardrc file + * Const'ify + * Fix multi arg + * not necessary to include this moc + * it was split + * Const'ify, remove unused variables + * Add scheme (file://). It's necessary when we use it in qml and we added all + * Remove double lookups + +------------------------------------------------------------------- Old: ---- kemoticons-5.41.0.tar.xz New: ---- kemoticons-5.42.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kemoticons.spec ++++++ --- /var/tmp/diff_new_pack.oGy1jF/_old 2018-01-22 16:00:09.133492030 +0100 +++ /var/tmp/diff_new_pack.oGy1jF/_new 2018-01-22 16:00:09.133492030 +0100 @@ -1,7 +1,7 @@ # # spec file for package kemoticons # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,13 +17,13 @@ %define lname libKF5Emoticons5 -%define _tar_path 5.41 +%define _tar_path 5.42 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} Name: kemoticons -Version: 5.41.0 +Version: 5.42.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 3.0 ++++++ kemoticons-5.41.0.tar.xz -> kemoticons-5.42.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.41.0/.reviewboardrc new/kemoticons-5.42.0/.reviewboardrc --- old/kemoticons-5.41.0/.reviewboardrc 2017-12-02 11:12:45.000000000 +0100 +++ new/kemoticons-5.42.0/.reviewboardrc 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -REVIEWBOARD_URL = "https://git.reviewboard.kde.org"; -REPOSITORY = 'git://anongit.kde.org/kemoticons' -BRANCH = 'master' -TARGET_GROUPS = 'kdeframeworks' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.41.0/CMakeLists.txt new/kemoticons-5.42.0/CMakeLists.txt --- old/kemoticons-5.41.0/CMakeLists.txt 2017-12-02 11:12:45.000000000 +0100 +++ new/kemoticons-5.42.0/CMakeLists.txt 2018-01-06 00:41:33.000000000 +0100 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.41.0") # handled by release scripts -set(KF5_DEP_VERSION "5.41.0") # handled by release scripts +set(KF5_VERSION "5.42.0") # handled by release scripts +set(KF5_DEP_VERSION "5.42.0") # handled by release scripts project(KEmoticons VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.41.0 NO_MODULE) +find_package(ECM 5.42.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -78,7 +78,5 @@ COMPONENT Devel ) -if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}") - feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) -endif() +feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.41.0/autotests/kemoticontest.cpp new/kemoticons-5.42.0/autotests/kemoticontest.cpp --- old/kemoticons-5.41.0/autotests/kemoticontest.cpp 2017-12-02 11:12:45.000000000 +0100 +++ new/kemoticons-5.42.0/autotests/kemoticontest.cpp 2018-01-06 00:41:33.000000000 +0100 @@ -123,7 +123,7 @@ QString result = emo.parseEmoticons(inputData, KEmoticonsTheme::RelaxedParse | KEmoticonsTheme::SkipHTML); - result.replace(themePath + themeName + QLatin1Char('/'), QString()); + result.replace(QStringLiteral("file://") + themePath + themeName + QLatin1Char('/'), QString()); if (xfail) { QEXPECT_FAIL("", "Checking known-broken testcase", Continue); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.41.0/autotests/ktexttohtmlplugintest.cpp new/kemoticons-5.42.0/autotests/ktexttohtmlplugintest.cpp --- old/kemoticons-5.41.0/autotests/ktexttohtmlplugintest.cpp 2017-12-02 11:12:45.000000000 +0100 +++ new/kemoticons-5.42.0/autotests/ktexttohtmlplugintest.cpp 2018-01-06 00:41:33.000000000 +0100 @@ -63,7 +63,7 @@ QString KTextToHTMLPluginTest::htmlForSmiley(const QString &emoticon, const QString &name) const { - return QStringLiteral("<img align=\"center\" title=\"%1\" alt=\"%1\" src=\"%2/%3.png\" width=\"22\" height=\"22\" />") + return QStringLiteral("<img align=\"center\" title=\"%1\" alt=\"%1\" src=\"file://%2/%3.png\" width=\"22\" height=\"22\" />") .arg(emoticon, mEmoticonsThemePath, name); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.41.0/src/core/kemoticons.cpp new/kemoticons-5.42.0/src/core/kemoticons.cpp --- old/kemoticons-5.41.0/src/core/kemoticons.cpp 2017-12-02 11:12:45.000000000 +0100 +++ new/kemoticons-5.42.0/src/core/kemoticons.cpp 2018-01-06 00:41:33.000000000 +0100 @@ -173,8 +173,9 @@ KEmoticonsTheme KEmoticons::theme(const QString &name) const { - if (d->m_themes.contains(name)) { - return d->m_themes.value(name); + KEmoticonsTheme theme = d->m_themes.value(name); + if (!theme.isNull()) { + return theme; } return d->loadTheme(name); @@ -241,7 +242,7 @@ KArchiveDirectory *currentDir = nullptr; KArchive *archive = nullptr; - QString localThemesDir(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QStringLiteral("/emoticons")); + const QString localThemesDir(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QStringLiteral("/emoticons")); if (localThemesDir.isEmpty()) { qCritical() << "Could not find a suitable place in which to install the emoticon theme"; @@ -346,4 +347,3 @@ } #include "moc_kemoticons.cpp" -#include "kemoticons.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.41.0/src/core/kemoticonsprovider.cpp new/kemoticons-5.42.0/src/core/kemoticonsprovider.cpp --- old/kemoticons-5.41.0/src/core/kemoticonsprovider.cpp 2017-12-02 11:12:45.000000000 +0100 +++ new/kemoticons-5.42.0/src/core/kemoticonsprovider.cpp 2018-01-06 00:41:33.000000000 +0100 @@ -19,8 +19,8 @@ #include "kemoticonsprovider.h" #include "kemoticons.h" -#include <QtCore/QFileInfo> -#include <QtCore/QDir> +#include <QFileInfo> +#include <QDir> #include <QUrl> #include <QPixmap> #include <QDebug> @@ -140,7 +140,7 @@ void KEmoticonsProvider::addIndexItem(const QString &path, const QStringList &emoList) { - foreach (const QString &s, emoList) { + for (const QString &s : emoList) { KEmoticonsProvider::Emoticon e; QPixmap p; @@ -152,7 +152,7 @@ const int preferredHeight = hasPreferredSize ? d->m_preferredSize.height() : p.height(); const int preferredWidth = hasPreferredSize ? d->m_preferredSize.width() : p.width(); - e.picHTMLCode = QStringLiteral("<img align=\"center\" title=\"%1\" alt=\"%1\" src=\"%2\" width=\"%3\" height=\"%4\" />").arg(escaped, path).arg(preferredWidth).arg(preferredHeight); + e.picHTMLCode = QStringLiteral("<img align=\"center\" title=\"%1\" alt=\"%1\" src=\"file://%2\" width=\"%3\" height=\"%4\" />").arg(escaped, path, QString::number(preferredWidth), QString::number(preferredHeight)); e.matchTextEscaped = escaped; e.matchText = s; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.41.0/src/core/kemoticonstheme.cpp new/kemoticons-5.42.0/src/core/kemoticonstheme.cpp --- old/kemoticons-5.41.0/src/core/kemoticonstheme.cpp 2017-12-02 11:12:45.000000000 +0100 +++ new/kemoticons-5.42.0/src/core/kemoticonstheme.cpp 2018-01-06 00:41:33.000000000 +0100 @@ -29,12 +29,11 @@ public: KEmoticonsThemeData(); ~KEmoticonsThemeData(); - KEmoticonsProvider *provider; + KEmoticonsProvider *provider = nullptr; }; KEmoticonsTheme::KEmoticonsThemeData::KEmoticonsThemeData() { - provider = nullptr; } KEmoticonsTheme::KEmoticonsThemeData::~KEmoticonsThemeData() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.41.0/src/providers/adium/adium_emoticons.cpp new/kemoticons-5.42.0/src/providers/adium/adium_emoticons.cpp --- old/kemoticons-5.41.0/src/providers/adium/adium_emoticons.cpp 2017-12-02 11:12:45.000000000 +0100 +++ new/kemoticons-5.42.0/src/providers/adium/adium_emoticons.cpp 2018-01-06 00:41:33.000000000 +0100 @@ -18,10 +18,10 @@ #include "adium_emoticons.h" -#include <QtCore/QFile> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QStandardPaths> +#include <QFile> +#include <QDir> +#include <QFileInfo> +#include <QStandardPaths> #include <QDebug> #include <kpluginfactory.h> @@ -36,14 +36,14 @@ bool AdiumEmoticons::removeEmoticon(const QString &emo) { - QString emoticon = QFileInfo(emoticonsMap().key(emo.split(QLatin1Char(' ')))).fileName(); + const QString emoticon = QFileInfo(emoticonsMap().key(emo.split(QLatin1Char(' ')))).fileName(); QDomElement fce = m_themeXml.firstChildElement(QStringLiteral("plist")).firstChildElement(QStringLiteral("dict")).firstChildElement(QStringLiteral("dict")); if (fce.isNull()) { return false; } - QDomNodeList nl = fce.childNodes(); + const QDomNodeList nl = fce.childNodes(); for (int i = 0; i < nl.length(); i++) { QDomElement de = nl.item(i).toElement(); if (!de.isNull() && de.tagName() == QLatin1String("key") && (de.text() == emoticon)) { @@ -166,7 +166,7 @@ return false; } - QDomNodeList nl = fce.childNodes(); + const QDomNodeList nl = fce.childNodes(); clearEmoticonsMap(); QString name; @@ -178,7 +178,7 @@ continue; } else if (!de.isNull() && de.tagName() == QLatin1String("dict")) { QDomElement arr = de.firstChildElement(QStringLiteral("array")); - QDomNodeList snl = arr.childNodes(); + const QDomNodeList snl = arr.childNodes(); QStringList sl; for (int k = 0; k < snl.length(); k++) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.41.0/src/providers/kde/kde_emoticons.cpp new/kemoticons-5.42.0/src/providers/kde/kde_emoticons.cpp --- old/kemoticons-5.41.0/src/providers/kde/kde_emoticons.cpp 2017-12-02 11:12:45.000000000 +0100 +++ new/kemoticons-5.42.0/src/providers/kde/kde_emoticons.cpp 2018-01-06 00:41:33.000000000 +0100 @@ -18,11 +18,11 @@ #include "kde_emoticons.h" -#include <QtCore/QFile> -#include <QtCore/QDir> -#include <QtCore/QDebug> -#include <QtCore/QFileInfo> -#include <QtCore/QStandardPaths> +#include <QFile> +#include <QDir> +#include <QDebug> +#include <QFileInfo> +#include <QStandardPaths> #include <QImageReader> #include <kpluginfactory.h> @@ -37,7 +37,7 @@ bool KdeEmoticons::removeEmoticon(const QString &emo) { - QString emoticon = QFileInfo(emoticonsMap().key(emo.split(QLatin1Char(' ')))).fileName(); + const QString emoticon = QFileInfo(emoticonsMap().key(emo.split(QLatin1Char(' ')))).fileName(); QDomElement fce = m_themeXml.firstChildElement(QStringLiteral("messaging-emoticon-map")); if (fce.isNull()) { @@ -142,7 +142,7 @@ return false; } - QDomNodeList nl = fce.childNodes(); + const QDomNodeList nl = fce.childNodes(); clearEmoticonsMap(); @@ -190,7 +190,7 @@ void KdeEmoticons::newTheme() { - QString path = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QStringLiteral("/emoticons/") + themeName(); + const QString path = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QStringLiteral("/emoticons/") + themeName(); QDir().mkpath(path); QFile fp(path + QLatin1Char('/') + QStringLiteral("emoticons.xml")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.41.0/src/providers/pidgin/pidgin_emoticons.cpp new/kemoticons-5.42.0/src/providers/pidgin/pidgin_emoticons.cpp --- old/kemoticons-5.41.0/src/providers/pidgin/pidgin_emoticons.cpp 2017-12-02 11:12:45.000000000 +0100 +++ new/kemoticons-5.42.0/src/providers/pidgin/pidgin_emoticons.cpp 2018-01-06 00:41:33.000000000 +0100 @@ -19,11 +19,11 @@ #include "pidgin_emoticons.h" #include "kemoticonsprovider.h" -#include <QtCore/QFile> -#include <QtCore/QDir> -#include <QtCore/QDebug> -#include <QtCore/QFileInfo> -#include <QtCore/QStandardPaths> +#include <QFile> +#include <QDir> +#include <QDebug> +#include <QFileInfo> +#include <QStandardPaths> #include <kpluginfactory.h> @@ -62,7 +62,7 @@ continue; } - QStringList splitted = line.split(QLatin1Char(' ')); + const QStringList splitted = line.split(QLatin1Char(' ')); QString emoName; if (splitted.at(0) == QLatin1String("!")) { @@ -98,7 +98,7 @@ return false; } - QString emoticon = QStringLiteral("%1 %2").arg(QFileInfo(emo).fileName(), + const QString emoticon = QStringLiteral("%1 %2").arg(QFileInfo(emo).fileName(), text); m_text.insert(i + 1, emoticon); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.41.0/src/providers/xmpp/xmpp_emoticons.cpp new/kemoticons-5.42.0/src/providers/xmpp/xmpp_emoticons.cpp --- old/kemoticons-5.41.0/src/providers/xmpp/xmpp_emoticons.cpp 2017-12-02 11:12:45.000000000 +0100 +++ new/kemoticons-5.42.0/src/providers/xmpp/xmpp_emoticons.cpp 2018-01-06 00:41:33.000000000 +0100 @@ -18,11 +18,11 @@ #include "xmpp_emoticons.h" -#include <QtCore/QFile> -#include <QtCore/QDir> -#include <QtCore/QDebug> -#include <QtCore/QFileInfo> -#include <QtCore/QStandardPaths> +#include <QFile> +#include <QDir> +#include <QDebug> +#include <QFileInfo> +#include <QStandardPaths> #include <QImageReader> #include <QMimeDatabase> @@ -38,20 +38,18 @@ bool XmppEmoticons::removeEmoticon(const QString &emo) { - QString emoticon = QFileInfo(emoticonsMap().key(emo.split(QLatin1Char(' ')))).fileName(); + const QString emoticon = QFileInfo(emoticonsMap().key(emo.split(QLatin1Char(' ')))).fileName(); QDomElement fce = m_themeXml.firstChildElement(QStringLiteral("icondef")); if (fce.isNull()) { return false; } - QDomNodeList nl = fce.childNodes(); + const QDomNodeList nl = fce.childNodes(); for (int i = 0; i < nl.length(); i++) { QDomElement de = nl.item(i).toElement(); if (!de.isNull() && de.tagName() == QLatin1String("icon")) { QDomNodeList snl = de.childNodes(); - QStringList sl; - QStringList mime; for (int k = 0; k < snl.length(); k++) { QDomElement sde = snl.item(k).toElement(); @@ -91,7 +89,7 @@ for (constIterator = splitted.begin(); constIterator != splitted.end(); ++constIterator) { QDomElement emotext = m_themeXml.createElement(QStringLiteral("text")); - QDomText txt = m_themeXml.createTextNode((*constIterator).trimmed()); + const QDomText txt = m_themeXml.createTextNode((*constIterator).trimmed()); emotext.appendChild(txt); emoticon.appendChild(emotext); } @@ -100,7 +98,7 @@ QMimeDatabase db; QMimeType mime = db.mimeTypeForFile(emo, QMimeDatabase::MatchExtension); emoElement.setAttribute(QStringLiteral("mime"), mime.name()); - QDomText txt = m_themeXml.createTextNode(QFileInfo(emo).fileName()); + const QDomText txt = m_themeXml.createTextNode(QFileInfo(emo).fileName()); emoElement.appendChild(txt); emoticon.appendChild(emoElement); @@ -162,7 +160,7 @@ return false; } - QDomNodeList nl = fce.childNodes(); + const QDomNodeList nl = fce.childNodes(); clearEmoticonsMap(); @@ -202,7 +200,7 @@ void XmppEmoticons::newTheme() { - QString path = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QStringLiteral("/emoticons/") + themeName(); + const QString path = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QStringLiteral("/emoticons/") + themeName(); QDir().mkpath(path); QFile fp(path + QLatin1Char('/') + QStringLiteral("icondef.xml"));
