Hello community, here is the log from the commit of package kemoticons for openSUSE:Factory checked in at 2015-07-14 17:23:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kemoticons (Old) and /work/SRC/openSUSE:Factory/.kemoticons.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kemoticons" Changes: -------- --- /work/SRC/openSUSE:Factory/kemoticons/kemoticons.changes 2015-06-23 12:08:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kemoticons.new/kemoticons.changes 2015-07-14 17:23:41.000000000 +0200 @@ -1,0 +2,7 @@ +Sun Jul 5 18:45:01 UTC 2015 - [email protected] + +- Update to 5.12.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.12.0.php + +------------------------------------------------------------------- Old: ---- kemoticons-5.11.0.tar.xz New: ---- kemoticons-5.12.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kemoticons.spec ++++++ --- /var/tmp/diff_new_pack.2IEyiJ/_old 2015-07-14 17:23:41.000000000 +0200 +++ /var/tmp/diff_new_pack.2IEyiJ/_new 2015-07-14 17:23:41.000000000 +0200 @@ -17,9 +17,9 @@ %define lname libKF5Emoticons5 -%define _tar_path 5.11 +%define _tar_path 5.12 Name: kemoticons -Version: 5.11.0 +Version: 5.12.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 ++++++ kemoticons-5.11.0.tar.xz -> kemoticons-5.12.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.11.0/CMakeLists.txt new/kemoticons-5.12.0/CMakeLists.txt --- old/kemoticons-5.11.0/CMakeLists.txt 2015-06-06 11:26:40.000000000 +0200 +++ new/kemoticons-5.12.0/CMakeLists.txt 2015-07-04 22:34:44.000000000 +0200 @@ -3,7 +3,7 @@ project(KEmoticons) include(FeatureSummary) -find_package(ECM 5.11.0 NO_MODULE) +find_package(ECM 5.12.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) @@ -23,8 +23,8 @@ include(ECMGenerateHeaders) include(ECMPackageConfigHelpers) -set(KF5_VERSION "5.11.0") # handled by release scripts -set(KF5_DEP_VERSION "5.11.0") # handled by release scripts +set(KF5_VERSION "5.12.0") # handled by release scripts +set(KF5_DEP_VERSION "5.12.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KEMOTICONS VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kemoticons_version.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.11.0/autotests/emoticon-parser-testcases/xmpp-1.input new/kemoticons-5.12.0/autotests/emoticon-parser-testcases/xmpp-1.input --- old/kemoticons-5.11.0/autotests/emoticon-parser-testcases/xmpp-1.input 1970-01-01 01:00:00.000000000 +0100 +++ new/kemoticons-5.12.0/autotests/emoticon-parser-testcases/xmpp-1.input 2015-07-04 22:34:44.000000000 +0200 @@ -0,0 +1 @@ +an xmpp emoticon (%) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.11.0/autotests/emoticon-parser-testcases/xmpp-1.output new/kemoticons-5.12.0/autotests/emoticon-parser-testcases/xmpp-1.output --- old/kemoticons-5.11.0/autotests/emoticon-parser-testcases/xmpp-1.output 1970-01-01 01:00:00.000000000 +0100 +++ new/kemoticons-5.12.0/autotests/emoticon-parser-testcases/xmpp-1.output 2015-07-04 22:34:44.000000000 +0200 @@ -0,0 +1 @@ +an xmpp emoticon <img align="center" title="(%)" alt="(%)" src="cuffs.png" width="16" height="16" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.11.0/autotests/kemoticontest.cpp new/kemoticons-5.12.0/autotests/kemoticontest.cpp --- old/kemoticons-5.11.0/autotests/kemoticontest.cpp 2015-06-06 11:26:40.000000000 +0200 +++ new/kemoticons-5.12.0/autotests/kemoticontest.cpp 2015-07-04 22:34:44.000000000 +0200 @@ -42,41 +42,57 @@ { Q_OBJECT +private: + bool copyTheme(const QString &dir, const QDir &baseThemeDir, const QString &themeName) + { + QDir sourceThemeDir(dir); + if (!sourceThemeDir.exists()) { + return false; + } + QDir themeDir(baseThemeDir.absolutePath() + '/' + themeName); + themeDir.removeRecursively(); + themeDir.mkpath("."); + + foreach (const QString &fileName, sourceThemeDir.entryList(QDir::Files)) { + if (!QFile::copy(sourceThemeDir.filePath(fileName), + themeDir.filePath(fileName))) { + qWarning() << "couldn't copy" << dir << "/" << fileName; + return false; + } + } + return true; + } + private Q_SLOTS: void initTestCase() { QStandardPaths::setTestModeEnabled(true); QString dataPath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation); - QString destThemePath = dataPath + QLatin1String("/emoticons/") + QLatin1String(default_theme); + QString destThemePath = dataPath + QLatin1String("/emoticons/"); QDir themeDir(destThemePath); if (themeDir.exists()) { QVERIFY(themeDir.removeRecursively()); } QVERIFY(themeDir.mkpath(".")); - QDir sourceThemeDir(QFile::decodeName(LOCAL_THEMES_DIR) + QLatin1String("/") + default_theme); - QVERIFY(sourceThemeDir.exists()); - - foreach (QString fileName, sourceThemeDir.entryList(QDir::Files)) { - QVERIFY(QFile::copy(sourceThemeDir.filePath(fileName), - themeDir.filePath(fileName))); - } + QVERIFY(copyTheme(QFile::decodeName(LOCAL_THEMES_DIR) + QLatin1String("/") + default_theme, themeDir, default_theme)); // check it can actually be found themePath = QStandardPaths::locate( QStandardPaths::GenericDataLocation, - QString::fromLatin1("emoticons/") + default_theme, + QString::fromLatin1("emoticons/"), QStandardPaths::LocateDirectory); QVERIFY2(!themePath.isEmpty(), qPrintable(themePath)); - // testEmoticonParser() wants a trailing / - themePath += "/"; + + // also copy the xmpp theme + QVERIFY(copyTheme(QFINDTESTDATA("xmpp-testtheme"), themeDir, "xmpp-testtheme")); } void cleanupTestCase() { QString dataPath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation); - QString themePath = dataPath + QLatin1String("/emoticons/") + QLatin1String(default_theme); + const QString themePath = dataPath + QLatin1String("/emoticons/"); QDir themeDir(themePath); QVERIFY(themeDir.removeRecursively()); } @@ -85,6 +101,7 @@ { QTest::addColumn<QString>("inputFileName"); QTest::addColumn<QString>("outputFileName"); + QTest::addColumn<QString>("themeName"); QTest::addColumn<bool>("xfail"); QString basePath = QFINDTESTDATA("emoticon-parser-testcases"); @@ -95,21 +112,24 @@ Q_FOREACH (const QString &fileName, inputFileNames) { QString outputFileName = fileName; outputFileName.replace("input", "output"); + const QString baseName = fileName.section("-", 0, 0); QTest::newRow(qPrintable(fileName.left(fileName.lastIndexOf('.')))) << basePath + QString::fromLatin1("/") + fileName << basePath + QString::fromLatin1("/") + outputFileName - << (fileName.section("-", 0, 0) == QLatin1String("broken")); + << (baseName == QLatin1String("xmpp") ? "xmpp-testtheme" : default_theme) + << (baseName == QLatin1String("broken")); } } void testEmoticonParser() { - KEmoticonsTheme emo = KEmoticons().theme(default_theme); - QFETCH(QString, inputFileName); QFETCH(QString, outputFileName); + QFETCH(QString, themeName); QFETCH(bool, xfail); + KEmoticonsTheme emo = KEmoticons().theme(themeName); + QFile inputFile(inputFileName); QFile expectedFile(outputFileName); if (! expectedFile.exists()) { @@ -123,7 +143,7 @@ QString result = emo.parseEmoticons(inputData, KEmoticonsTheme::RelaxedParse | KEmoticonsTheme::SkipHTML); - result.replace(themePath, QString()); + result.replace(themePath + themeName + '/', QString()); if (xfail) { QEXPECT_FAIL("", "Checking known-broken testcase", Continue); Files old/kemoticons-5.11.0/autotests/xmpp-testtheme/cuffs.png and new/kemoticons-5.12.0/autotests/xmpp-testtheme/cuffs.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.11.0/autotests/xmpp-testtheme/icondef.xml new/kemoticons-5.12.0/autotests/xmpp-testtheme/icondef.xml --- old/kemoticons-5.11.0/autotests/xmpp-testtheme/icondef.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/kemoticons-5.12.0/autotests/xmpp-testtheme/icondef.xml 2015-07-04 22:34:44.000000000 +0200 @@ -0,0 +1,33 @@ +<?xml version='1.0' encoding='UTF-8'?> +<icondef> + <meta> + <name>Stellar (default)</name> + <version>1.0</version> + <description>Default Psi 0.9.3 iconset</description> + <creation>2003-07-08</creation> + <home>http://psi.affinix.com</home> + <author email='[email protected]'>Jason Kim</author> + <author jid='[email protected]' email='[email protected]' www='http://maz.sf.net'>Michail Pishchagin (icondef.xml)</author> + </meta> + + <!-- Normal icons --> + <icon> + <text>:-)</text> + <text>:)</text> + + <object mime='image/png'>smile.png</object> + </icon> + + <icon> + <text>;-)</text> + <text>;)</text> + + <object mime='image/png'>wink.png</object> + </icon> + + <icon> + <text>(%)</text> + + <object mime='image/png'>cuffs.png</object> + </icon> +</icondef> Files old/kemoticons-5.11.0/autotests/xmpp-testtheme/smile.png and new/kemoticons-5.12.0/autotests/xmpp-testtheme/smile.png differ Files old/kemoticons-5.11.0/autotests/xmpp-testtheme/wink.png and new/kemoticons-5.12.0/autotests/xmpp-testtheme/wink.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.11.0/src/providers/adium/emoticonstheme_adium.desktop new/kemoticons-5.12.0/src/providers/adium/emoticonstheme_adium.desktop --- old/kemoticons-5.11.0/src/providers/adium/emoticonstheme_adium.desktop 2015-06-06 11:26:40.000000000 +0200 +++ new/kemoticons-5.12.0/src/providers/adium/emoticonstheme_adium.desktop 2015-07-04 22:34:44.000000000 +0200 @@ -3,6 +3,7 @@ Name=Adium Emoticons Theme Name[ar]=سمة ابتسامات Adium Name[as]=Adium Emoticons থিম +Name[ast]=Tema de fustaxes Adium Name[be@latin]=Matyŭ smajlikaŭ dla „Adium” Name[bg]=Тема с емоции Adium Name[bn]=অ্যাডিয়াম ইমোট-আইকন থীম @@ -82,6 +83,7 @@ Comment=Library to use Adium emoticons theme Comment[ar]=مكتبة لاستخدام سمة ابتسامات Adium Comment[as]=Adium emoticons থিম ব্যৱহাৰ কৰা লাইব্ৰেৰী +Comment[ast]=Bibilioteca pa usar el tema de fustaxes Adium Comment[be@latin]=Biblijateka dla matyvaŭ smajlikaŭ „Adium” Comment[bg]=Библиотека за темата с емоции Adium Comment[bn]=অ্যাডিয়াম ইমোট-আইকন থীম ব্যবহার করার লাইব্রেরী diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.11.0/src/providers/kde/emoticonstheme_kde.desktop new/kemoticons-5.12.0/src/providers/kde/emoticonstheme_kde.desktop --- old/kemoticons-5.11.0/src/providers/kde/emoticonstheme_kde.desktop 2015-06-06 11:26:40.000000000 +0200 +++ new/kemoticons-5.12.0/src/providers/kde/emoticonstheme_kde.desktop 2015-07-04 22:34:44.000000000 +0200 @@ -2,6 +2,7 @@ Type=Service Name=KDE Emoticons Theme Name[ar]=سمة ابتسامات كدي +Name[ast]=Tema de fustaxes KDE Name[bg]=Тема с емоции KDE Name[bn]=কে.ডি.ই. ইমোট-আইকনস থীম Name[bs]=KDE‑ova tema emotikona @@ -71,6 +72,7 @@ Comment=Library to use KDE emoticons theme Comment[ar]=مكتبة لاستخدام سمة ابتسامات كدي Comment[as]=KDE emoticons থিম ব্যৱহাৰ কৰা লাইব্ৰেৰী +Comment[ast]=Biblioteca pa usar el tema de fustaxes KDE Comment[be@latin]=Biblijateka dla matyvaŭ smajlikaŭ „KDE” Comment[bg]=Библиотека за тема с емоции KDE Comment[bn]=কে-ডি-ই ইমোট-আইকন থীম ব্যবহার করার লাইব্রেরী diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.11.0/src/providers/pidgin/emoticonstheme_pidgin.desktop new/kemoticons-5.12.0/src/providers/pidgin/emoticonstheme_pidgin.desktop --- old/kemoticons-5.11.0/src/providers/pidgin/emoticonstheme_pidgin.desktop 2015-06-06 11:26:40.000000000 +0200 +++ new/kemoticons-5.12.0/src/providers/pidgin/emoticonstheme_pidgin.desktop 2015-07-04 22:34:44.000000000 +0200 @@ -3,6 +3,7 @@ Name=Pidgin Emoticons Theme Name[ar]=سمة ابتسامات Pidgin Name[as]=Pidgin Emoticons থিম +Name[ast]=Tema de fustaxes Pidgin Name[be@latin]=Matyŭ smajlikaŭ dla „Pidgin” Name[bg]=Тема с емоции Pidgin Name[bn]=পিজিন ইমোট-আইকন থীম @@ -84,6 +85,7 @@ Comment=Library to use Pidgin emoticons theme Comment[ar]=مكتبة لاستخدام سمة ابتسامات Pidgin Comment[as]=Pidgin Emoticons থিম ব্যৱহাৰ কৰা লাইব্ৰেৰী +Comment[ast]=Biblioteca pa usar el tema de fustaxes Pidgin Comment[be@latin]=Biblijateka dla matyvaŭ smajlikaŭ „Pidgin” Comment[bg]=Библиотека за темата с емоции Pidgin Comment[bn]=পিজিন ইমোট-আইকন থীম ব্যবহার করার লাইব্রেরী diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.11.0/src/providers/xmpp/emoticonstheme_xmpp.desktop new/kemoticons-5.12.0/src/providers/xmpp/emoticonstheme_xmpp.desktop --- old/kemoticons-5.11.0/src/providers/xmpp/emoticonstheme_xmpp.desktop 2015-06-06 11:26:40.000000000 +0200 +++ new/kemoticons-5.12.0/src/providers/xmpp/emoticonstheme_xmpp.desktop 2015-07-04 22:34:44.000000000 +0200 @@ -3,6 +3,7 @@ Name=XMPP Emoticons Theme Name[ar]=سمة ابتسامات XMPP Name[as]=XMPP Emoticons থিম +Name[ast]=Tema de fustaxes XMPP Name[be@latin]=Matyŭ smajlikaŭ dla „XMPP” Name[bg]=Тема с емоции XMPP Name[bn]=এক্স-এম-পি-পি ইমোট-আইকন থীম @@ -83,6 +84,7 @@ Comment=Library to use XMPP emoticons theme Comment[ar]=مكتبة لاستخدام سمة ابتسامات XMPP Comment[as]=XMPP Emoticons থিম ব্যৱহাৰ কৰা লাইব্ৰেৰী +Comment[ast]=Biblioteca pa usar el tema de fustaxes XMPP Comment[be@latin]=Biblijateka dla matyvaŭ smajlikaŭ „XMPP” Comment[bg]=Библиотека за темата с емоции XMPP Comment[bn]=এক্স-এম-পি-পি ইমোট-আইকন থীম ব্যবহার করার লাইব্রেরী
