Hello community, here is the log from the commit of package kiconthemes for openSUSE:Factory checked in at 2015-09-02 07:46:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiconthemes (Old) and /work/SRC/openSUSE:Factory/.kiconthemes.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiconthemes" Changes: -------- --- /work/SRC/openSUSE:Factory/kiconthemes/kiconthemes.changes 2015-07-14 17:27:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kiconthemes.new/kiconthemes.changes 2015-09-02 07:46:14.000000000 +0200 @@ -1,0 +2,13 @@ +Tue Aug 4 19:20:28 UTC 2015 - [email protected] + +- Update to 5.13.0 + * The Qt version requirement has been bumped from 5.2 to 5.3 + * Debug output has been ported to categorized output, for less + noise by default + * Docbook documentation has been reviewed and updated + * Remove temporary string allocations. + * Remove Theme tree debug entry + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.13.0.php + +------------------------------------------------------------------- Old: ---- kiconthemes-5.12.0.tar.xz New: ---- kiconthemes-5.13.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiconthemes.spec ++++++ --- /var/tmp/diff_new_pack.JBEVvy/_old 2015-09-02 07:46:15.000000000 +0200 +++ /var/tmp/diff_new_pack.JBEVvy/_new 2015-09-02 07:46:15.000000000 +0200 @@ -18,9 +18,9 @@ %bcond_without lang %define lname libKF5IconThemes5 -%define _tar_path 5.12 +%define _tar_path 5.13 Name: kiconthemes -Version: 5.12.0 +Version: 5.13.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 @@ -31,11 +31,11 @@ BuildRequires: ki18n-devel >= %{_tar_path} BuildRequires: kitemviews-devel >= %{_tar_path} BuildRequires: kwidgetsaddons-devel >= %{_tar_path} -BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 -BuildRequires: pkgconfig(Qt5DBus) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Svg) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Test) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0 +BuildRequires: cmake(Qt5Core) >= 5.3.0 +BuildRequires: cmake(Qt5DBus) >= 5.3.0 +BuildRequires: cmake(Qt5Svg) >= 5.3.0 +BuildRequires: cmake(Qt5Test) >= 5.3.0 +BuildRequires: cmake(Qt5Widgets) >= 5.3.0 Summary: Icon GUI utilities License: LGPL-2.1+ Group: System/GUI/KDE @@ -62,7 +62,7 @@ Group: Development/Libraries/KDE Requires: %lname = %{version} Requires: extra-cmake-modules -Requires: pkgconfig(Qt5Widgets) >= 5.2.0 +Requires: cmake(Qt5Widgets) >= 5.3.0 %description devel This library contains classes to improve the handling of icons ++++++ kiconthemes-5.12.0.tar.xz -> kiconthemes-5.13.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.12.0/CMakeLists.txt new/kiconthemes-5.13.0/CMakeLists.txt --- old/kiconthemes-5.12.0/CMakeLists.txt 2015-07-05 11:05:08.000000000 +0200 +++ new/kiconthemes-5.13.0/CMakeLists.txt 2015-08-04 13:01:18.000000000 +0200 @@ -4,7 +4,7 @@ # ECM setup include(FeatureSummary) -find_package(ECM 5.12.0 NO_MODULE) +find_package(ECM 5.13.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) @@ -19,8 +19,8 @@ include(ECMGenerateHeaders) include(ECMMarkNonGuiExecutable) -set(KF5_VERSION "5.12.0") # handled by release scripts -set(KF5_DEP_VERSION "5.12.0") # handled by release scripts +set(KF5_VERSION "5.13.0") # handled by release scripts +set(KF5_DEP_VERSION "5.13.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KICONTHEMES @@ -29,7 +29,7 @@ SOVERSION 5) # Dependencies -set(REQUIRED_QT_VERSION 5.2.0) +set(REQUIRED_QT_VERSION 5.3.0) find_package(Qt5Widgets ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) find_package(Qt5Svg ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) find_package(Qt5DBus ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.12.0/autotests/CMakeLists.txt new/kiconthemes-5.13.0/autotests/CMakeLists.txt --- old/kiconthemes-5.12.0/autotests/CMakeLists.txt 2015-07-05 11:05:08.000000000 +0200 +++ new/kiconthemes-5.13.0/autotests/CMakeLists.txt 2015-08-04 13:01:18.000000000 +0200 @@ -1,5 +1,5 @@ -find_package(Qt5 5.2.0 CONFIG REQUIRED Test) +find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test) include(ECMAddTests) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.12.0/po/ast/kiconthemes5.po new/kiconthemes-5.13.0/po/ast/kiconthemes5.po --- old/kiconthemes-5.12.0/po/ast/kiconthemes5.po 2015-07-05 11:05:08.000000000 +0200 +++ new/kiconthemes-5.13.0/po/ast/kiconthemes5.po 2015-08-04 13:01:18.000000000 +0200 @@ -7,9 +7,9 @@ "Project-Id-Version: kio4-v1\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2015-03-15 08:31+0000\n" -"PO-Revision-Date: 2015-04-06 15:19+0100\n" +"PO-Revision-Date: 2015-07-11 16:25+0100\n" "Last-Translator: enolp <[email protected]>\n" -"Language-Team: Asturian <[email protected]>\n" +"Language-Team: Asturian <[email protected]>\n" "Language: ast\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,22 +28,18 @@ msgstr "Fonte d'iconu" #: kicondialog.cpp:298 -#, fuzzy msgid "S&ystem icons:" msgstr "Iconos del s&istema:" #: kicondialog.cpp:305 -#, fuzzy msgid "O&ther icons:" msgstr "O&tros iconos:" #: kicondialog.cpp:308 -#, fuzzy msgid "&Browse..." -msgstr "&Restolar" +msgstr "&Restolar..." #: kicondialog.cpp:319 -#, fuzzy msgid "&Search:" msgstr "&Guetar:" @@ -52,32 +48,26 @@ msgstr "" #: kicondialog.cpp:356 -#, fuzzy msgid "Actions" msgstr "Aiciones" #: kicondialog.cpp:357 -#, fuzzy msgid "Animations" msgstr "Animaciones" #: kicondialog.cpp:358 -#, fuzzy msgid "Applications" msgstr "Aplicaciones" #: kicondialog.cpp:359 -#, fuzzy msgid "Categories" msgstr "Estayes" #: kicondialog.cpp:360 -#, fuzzy msgid "Devices" msgstr "Preseos" #: kicondialog.cpp:361 -#, fuzzy msgid "Emblems" msgstr "Emblemes" @@ -86,31 +76,25 @@ msgstr "" #: kicondialog.cpp:363 -#, fuzzy msgid "Filesystems" msgstr "Sistemes de ficheros" #: kicondialog.cpp:364 -#, fuzzy msgid "International" msgstr "Internacional" #: kicondialog.cpp:365 -#, fuzzy msgid "Mimetypes" msgstr "Tribes MIME" #: kicondialog.cpp:366 -#, fuzzy msgid "Places" msgstr "Llugares" #: kicondialog.cpp:367 -#, fuzzy msgid "Status" msgstr "Estáu" #: kicondialog.cpp:608 -#, fuzzy msgid "*.png *.xpm *.svg *.svgz|Icon Files (*.png *.xpm *.svg *.svgz)" msgstr "*.png *.xpm *.svg *.svgz|Ficheros d'iconu (*.png *.xpm *.svg *.svgz)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.12.0/src/debug.cpp new/kiconthemes-5.13.0/src/debug.cpp --- old/kiconthemes-5.12.0/src/debug.cpp 2015-07-05 11:05:08.000000000 +0200 +++ new/kiconthemes-5.13.0/src/debug.cpp 2015-08-04 13:01:18.000000000 +0200 @@ -15,4 +15,9 @@ #include "debug.h" +#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0) +// logging category for this framework, default: log stuff >= warning +Q_LOGGING_CATEGORY(KICONTHEMES, "kf5.kiconthemes", QtWarningMsg) +#else Q_LOGGING_CATEGORY(KICONTHEMES, "kf5.kiconthemes") +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.12.0/src/kiconloader.cpp new/kiconthemes-5.13.0/src/kiconloader.cpp --- old/kiconthemes-5.12.0/src/kiconloader.cpp 2015-07-05 11:05:08.000000000 +0200 +++ new/kiconthemes-5.13.0/src/kiconloader.cpp 2015-08-04 13:01:18.000000000 +0200 @@ -92,7 +92,6 @@ void queryIcons(QStringList *lst, int size, KIconLoader::Context context) const; void queryIconsByContext(QStringList *lst, int size, KIconLoader::Context context) const; QString findIcon(const QString &name, int size, KIconLoader::MatchType match) const; - void printTree(QString &dbgString) const; KIconTheme *theme; }; @@ -107,15 +106,6 @@ delete theme; } -void KIconThemeNode::printTree(QString &dbgString) const -{ - /* This method doesn't have much sense anymore, so maybe it should - be removed in the (near?) future */ - dbgString += '('; - dbgString += theme->name(); - dbgString += ')'; -} - void KIconThemeNode::queryIcons(QStringList *result, int size, KIconLoader::Context context) const { @@ -560,12 +550,6 @@ // These are not in the icon spec, but e.g. GNOME puts some icons there anyway. searchPaths.append("pixmaps"); // was xdgdata-pixmaps in KStandardDirs -#ifndef NDEBUG - QString dbgString = "Theme tree: "; - mpThemeRoot->printTree(dbgString); - qCDebug(KICONTHEMES) << dbgString; -#endif - return true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.12.0/src/kicontheme.cpp new/kiconthemes-5.13.0/src/kicontheme.cpp --- old/kiconthemes-5.12.0/src/kicontheme.cpp 2015-07-05 11:05:08.000000000 +0200 +++ new/kiconthemes-5.13.0/src/kicontheme.cpp 2015-08-04 13:01:18.000000000 +0200 @@ -127,7 +127,7 @@ // files are used.. if (!appName.isEmpty() && - (name == defaultThemeName() || name == "hicolor" || name == "locolor")) { + (name == defaultThemeName() || name == QLatin1String("hicolor") || name == QLatin1String("locolor"))) { const QStringList icnlibs = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation); for (QStringList::ConstIterator it = icnlibs.constBegin(); it != icnlibs.constEnd(); ++it) { const QString cDir = *it + '/' + appName + "/icons/" + name; @@ -182,7 +182,7 @@ d->mInherits = cfg.readEntry("Inherits", QStringList()); if (name != defaultThemeName()) { for (QStringList::Iterator it = d->mInherits.begin(); it != d->mInherits.end(); ++it) { - if (*it == "default" || *it == "hicolor") { + if (*it == QLatin1String("default") || *it == QLatin1String("hicolor")) { *it = defaultThemeName(); } } @@ -531,7 +531,7 @@ const QStringList lst = dir.entryList(QDir::Dirs); QStringList::ConstIterator it2; for (it2 = lst.begin(); it2 != lst.end(); ++it2) { - if ((*it2 == ".") || (*it2 == "..") || (*it2).startsWith(QLatin1String("default."))) { + if ((*it2 == QLatin1String(".")) || (*it2 == QLatin1String("..")) || (*it2).startsWith(QLatin1String("default."))) { continue; } if (!QFile::exists(it + QLatin1Char('/') + *it2 + QLatin1String("/index.desktop")) && @@ -612,53 +612,53 @@ return; } - QString tmp = config.readEntry("Context"); - if (tmp == "Devices") { + QString tmp = config.readEntry(QStringLiteral("Context")); + if (tmp == QLatin1String("Devices")) { mContext = KIconLoader::Device; - } else if (tmp == "MimeTypes") { + } else if (tmp == QLatin1String("MimeTypes")) { mContext = KIconLoader::MimeType; - } else if (tmp == "FileSystems") { + } else if (tmp == QLatin1String("FileSystems")) { mContext = KIconLoader::FileSystem; - } else if (tmp == "Applications") { + } else if (tmp == QLatin1String("Applications")) { mContext = KIconLoader::Application; - } else if (tmp == "Actions") { + } else if (tmp == QLatin1String("Actions")) { mContext = KIconLoader::Action; - } else if (tmp == "Animations") { + } else if (tmp == QLatin1String("Animations")) { mContext = KIconLoader::Animation; - } else if (tmp == "Categories") { + } else if (tmp == QLatin1String("Categories")) { mContext = KIconLoader::Category; - } else if (tmp == "Emblems") { + } else if (tmp == QLatin1String("Emblems")) { mContext = KIconLoader::Emblem; - } else if (tmp == "Emotes") { + } else if (tmp == QLatin1String("Emotes")) { mContext = KIconLoader::Emote; - } else if (tmp == "International") { + } else if (tmp == QLatin1String("International")) { mContext = KIconLoader::International; - } else if (tmp == "Places") { + } else if (tmp == QLatin1String("Places")) { mContext = KIconLoader::Place; - } else if (tmp == "Status") { + } else if (tmp == QLatin1String("Status")) { mContext = KIconLoader::StatusIcon; - } else if (tmp == "Stock") { // invalid, but often present context, skip warning + } else if (tmp == QLatin1String("Stock")) { // invalid, but often present context, skip warning return; } else { qWarning() << "Invalid Context=" << tmp << "line for icon theme: " << dir(); return; } - tmp = config.readEntry("Type"); - if (tmp == "Fixed") { + tmp = config.readEntry(QStringLiteral("Type")); + if (tmp == QLatin1String("Fixed")) { mType = KIconLoader::Fixed; - } else if (tmp == "Scalable") { + } else if (tmp == QLatin1String("Scalable")) { mType = KIconLoader::Scalable; - } else if (tmp == "Threshold") { + } else if (tmp == QLatin1String("Threshold")) { mType = KIconLoader::Threshold; } else { qWarning() << "Invalid Type=" << tmp << "line for icon theme: " << dir(); return; } if (mType == KIconLoader::Scalable) { - mMinSize = config.readEntry("MinSize", mSize); - mMaxSize = config.readEntry("MaxSize", mSize); + mMinSize = config.readEntry(QStringLiteral("MinSize"), mSize); + mMaxSize = config.readEntry(QStringLiteral("MaxSize"), mSize); } else if (mType == KIconLoader::Threshold) { - mThreshold = config.readEntry("Threshold", 2); + mThreshold = config.readEntry(QStringLiteral("Threshold"), 2); } mbValid = true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.12.0/tests/CMakeLists.txt new/kiconthemes-5.13.0/tests/CMakeLists.txt --- old/kiconthemes-5.12.0/tests/CMakeLists.txt 2015-07-05 11:05:08.000000000 +0200 +++ new/kiconthemes-5.13.0/tests/CMakeLists.txt 2015-08-04 13:01:18.000000000 +0200 @@ -1,7 +1,7 @@ include(ECMMarkAsTest) -find_package(Qt5 5.2.0 CONFIG REQUIRED Test) +find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test) macro(kiconthemes_executable_tests) foreach(_testname ${ARGN})
