Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kiconthemes for openSUSE:Factory checked in at 2021-09-16 23:14:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiconthemes (Old) and /work/SRC/openSUSE:Factory/.kiconthemes.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiconthemes" Thu Sep 16 23:14:02 2021 rev:100 rq:919195 version:5.86.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kiconthemes/kiconthemes.changes 2021-08-16 10:12:01.567067521 +0200 +++ /work/SRC/openSUSE:Factory/.kiconthemes.new.1899/kiconthemes.changes 2021-09-16 23:15:54.019874631 +0200 @@ -1,0 +2,17 @@ +Wed Sep 15 08:24:08 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Drop the unneeded baselibs.conf. + +------------------------------------------------------------------- +Mon Sep 6 06:22:07 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 5.86.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.86.0 +- Changes since 5.85.0: + * We depend against c++-17 so we can use qOverload directly + * Add support for static builds + * replace "MacOSX" with "macOS" + +------------------------------------------------------------------- Old: ---- baselibs.conf kiconthemes-5.85.0.tar.xz kiconthemes-5.85.0.tar.xz.sig New: ---- kiconthemes-5.86.0.tar.xz kiconthemes-5.86.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiconthemes.spec ++++++ --- /var/tmp/diff_new_pack.TZGiuR/_old 2021-09-16 23:15:54.691875325 +0200 +++ /var/tmp/diff_new_pack.TZGiuR/_new 2021-09-16 23:15:54.695875329 +0200 @@ -17,14 +17,14 @@ %define lname libKF5IconThemes5 -%define _tar_path 5.85 +%define _tar_path 5.86 # 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: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_without lang Name: kiconthemes -Version: 5.85.0 +Version: 5.86.0 Release: 0 Summary: Icon GUI utilities License: LGPL-2.1-or-later AND GPL-2.0-or-later @@ -35,7 +35,6 @@ Source1: https://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz.sig Source2: frameworks.keyring %endif -Source99: baselibs.conf BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: fdupes BuildRequires: cmake(KF5Archive) >= %{_kf5_bugfix_version} ++++++ kiconthemes-5.85.0.tar.xz -> kiconthemes-5.86.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.85.0/.git-blame-ignore-revs new/kiconthemes-5.86.0/.git-blame-ignore-revs --- old/kiconthemes-5.85.0/.git-blame-ignore-revs 2021-08-06 11:05:22.000000000 +0200 +++ new/kiconthemes-5.86.0/.git-blame-ignore-revs 2021-09-04 19:01:30.000000000 +0200 @@ -1,3 +1,4 @@ -#clang-format +#clang-format/tidy 836655880f166ec3c586e6c24e86d6c9d82c6248 bc2d711ef356f70556ca72a1d22ffddb45aa933d +334add183be10ca73153e6fa9553cbe1f1986d42 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.85.0/CMakeLists.txt new/kiconthemes-5.86.0/CMakeLists.txt --- old/kiconthemes-5.85.0/CMakeLists.txt 2021-08-06 11:05:22.000000000 +0200 +++ new/kiconthemes-5.86.0/CMakeLists.txt 2021-09-04 19:01:30.000000000 +0200 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.85.0") # handled by release scripts -set(KF_DEP_VERSION "5.85.0") # handled by release scripts +set(KF_VERSION "5.86.0") # handled by release scripts +set(KF_DEP_VERSION "5.86.0") # handled by release scripts project(KIconThemes VERSION ${KF_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.85.0 NO_MODULE) +find_package(ECM 5.86.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -39,7 +39,7 @@ SOVERSION 5) # Dependencies -set(REQUIRED_QT_VERSION 5.15.0) +set(REQUIRED_QT_VERSION 5.15.2) find_package(Qt5Widgets ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) find_package(Qt5Svg ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) if (NOT ANDROID) @@ -55,7 +55,7 @@ remove_definitions(-DQT_NO_CAST_FROM_ASCII) remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY) -add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00) +add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02) add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055100) add_definitions(-DTRANSLATION_DOMAIN=\"kiconthemes5\") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.85.0/KF5IconThemesConfig.cmake.in new/kiconthemes-5.86.0/KF5IconThemesConfig.cmake.in --- old/kiconthemes-5.85.0/KF5IconThemesConfig.cmake.in 2021-08-06 11:05:22.000000000 +0200 +++ new/kiconthemes-5.86.0/KF5IconThemesConfig.cmake.in 2021-09-04 19:01:30.000000000 +0200 @@ -3,6 +3,21 @@ include(CMakeFindDependencyMacro) find_dependency(Qt5Widgets "@REQUIRED_QT_VERSION@") +if (NOT @BUILD_SHARED_LIBS@) + find_dependency(Qt5Widgets "@REQUIRED_QT_VERSION@") + find_dependency(Qt5Svg "@REQUIRED_QT_VERSION@") + + if (NOT ANDROID) + find_dependency(Qt5DBus "@REQUIRED_QT_VERSION@") + endif() + + find_dependency(KF5Archive "@KF_DEP_VERSION@") + find_dependency(KF5I18n "@KF_DEP_VERSION@") + find_dependency(KF5CoreAddons "@KF_DEP_VERSION@") + find_dependency(KF5ConfigWidgets "@KF_DEP_VERSION@") + find_dependency(KF5WidgetsAddons "@KF_DEP_VERSION@") + find_dependency(KF5ItemViews "@KF_DEP_VERSION@") +endif() include("${CMAKE_CURRENT_LIST_DIR}/KF5IconThemesTargets.cmake") @PACKAGE_INCLUDE_QCHTARGETS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.85.0/autotests/kiconloader_benchmark.cpp new/kiconthemes-5.86.0/autotests/kiconloader_benchmark.cpp --- old/kiconthemes-5.85.0/autotests/kiconloader_benchmark.cpp 2021-08-06 11:05:22.000000000 +0200 +++ new/kiconthemes-5.86.0/autotests/kiconloader_benchmark.cpp 2021-09-04 19:01:30.000000000 +0200 @@ -78,10 +78,11 @@ QStringLiteral("kde")}; QBENCHMARK { - for (const QString &iconName : qAsConst(icons)) { + for (const QString &iconName : std::as_const(icons)) { const QIcon icon = QIcon::fromTheme(iconName); - if (icon.isNull()) + if (icon.isNull()) { QSKIP("missing icons"); + } QVERIFY(!icon.pixmap(24, 24).isNull()); // QVERIFY(!icon.pixmap(512, 512).isNull()); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.85.0/metainfo.yaml new/kiconthemes-5.86.0/metainfo.yaml --- old/kiconthemes-5.85.0/metainfo.yaml 2021-08-06 11:05:22.000000000 +0200 +++ new/kiconthemes-5.86.0/metainfo.yaml 2021-09-04 19:01:30.000000000 +0200 @@ -6,7 +6,7 @@ - name: Linux - name: FreeBSD - name: Windows - - name: MacOSX + - name: macOS portingAid: false deprecated: false release: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.85.0/po/de/kiconthemes5.po new/kiconthemes-5.86.0/po/de/kiconthemes5.po --- old/kiconthemes-5.85.0/po/de/kiconthemes5.po 2021-08-06 11:05:22.000000000 +0200 +++ new/kiconthemes-5.86.0/po/de/kiconthemes5.po 2021-09-04 19:01:30.000000000 +0200 @@ -20,7 +20,6 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 19.12.3\n" #: kicondialog.cpp:306 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.85.0/po/zh_CN/kiconthemes5.po new/kiconthemes-5.86.0/po/zh_CN/kiconthemes5.po --- old/kiconthemes-5.85.0/po/zh_CN/kiconthemes5.po 2021-08-06 11:05:22.000000000 +0200 +++ new/kiconthemes-5.86.0/po/zh_CN/kiconthemes5.po 2021-09-04 19:01:30.000000000 +0200 @@ -17,7 +17,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-07-06 00:14+0000\n" -"PO-Revision-Date: 2021-07-26 13:47\n" +"PO-Revision-Date: 2021-08-30 11:43\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.85.0/src/kicondialog.cpp new/kiconthemes-5.86.0/src/kicondialog.cpp --- old/kiconthemes-5.85.0/src/kicondialog.cpp 2021-08-06 11:05:22.000000000 +0200 +++ new/kiconthemes-5.86.0/src/kicondialog.cpp 2021-09-04 19:01:30.000000000 +0200 @@ -340,7 +340,7 @@ ui.contextCombo->setMaxVisibleItems(ui.contextCombo->count()); ui.contextCombo->setFixedSize(ui.contextCombo->sizeHint()); - QObject::connect(ui.contextCombo, QOverload<int>::of(&QComboBox::activated), q, [this]() { + QObject::connect(ui.contextCombo, qOverload<int>(&QComboBox::activated), q, [this]() { const auto currentData = ui.contextCombo->currentData(); if (currentData.isValid()) { mContext = static_cast<KIconLoader::Context>(ui.contextCombo->currentData().toInt()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.85.0/src/kiconeffect.cpp new/kiconthemes-5.86.0/src/kiconeffect.cpp --- old/kiconthemes-5.85.0/src/kiconeffect.cpp 2021-08-06 11:05:22.000000000 +0200 +++ new/kiconthemes-5.86.0/src/kiconeffect.cpp 2021-09-04 19:01:30.000000000 +0200 @@ -58,7 +58,9 @@ { KSharedConfig::Ptr config = KSharedConfig::openConfig(); - int i, j, effect = -1; + int i; + int j; + int effect = -1; // FIXME: this really should be using KIconLoader::metaObject() to guarantee synchronization // performance wise it's also practically guaranteed to be faster QStringList groups; @@ -74,7 +76,8 @@ states += QStringLiteral("Active"); states += QStringLiteral("Disabled"); - QStringList::ConstIterator it, it2; + QStringList::ConstIterator it; + QStringList::ConstIterator it2; QString _togray(QStringLiteral("togray")); QString _colorize(QStringLiteral("colorize")); QString _desaturate(QStringLiteral("desaturate")); @@ -343,8 +346,13 @@ QRgb *data = ii.data; QRgb *end = data + ii.pixels; - float rcol = col.red(), gcol = col.green(), bcol = col.blue(); - unsigned char red, green, blue, gray; + float rcol = col.red(); + float gcol = col.green(); + float bcol = col.blue(); + unsigned char red; + unsigned char green; + unsigned char blue; + unsigned char gray; unsigned char val = (unsigned char)(255.0 * value); while (data != end) { gray = qGray(*data); @@ -381,7 +389,8 @@ QRgb *end = data + ii.pixels; // Step 1: determine the average brightness - double values = 0.0, sum = 0.0; + double values = 0.0; + double sum = 0.0; bool grayscale = true; while (data != end) { sum += qGray(*data) * qAlpha(*data) + 255 * (255 - qAlpha(*data)); @@ -395,36 +404,42 @@ // Step 2: Modify the image unsigned char val = (unsigned char)(255.0 * value); - int rw = white.red(), gw = white.green(), bw = white.blue(); - int rb = black.red(), gb = black.green(), bb = black.blue(); + int rw = white.red(); + int gw = white.green(); + int bw = white.blue(); + int rb = black.red(); + int gb = black.green(); + int bb = black.blue(); data = ii.data; if (grayscale) { while (data != end) { - if (qRed(*data) <= medium) + if (qRed(*data) <= medium) { *data = qRgba((val * rb + (0xFF - val) * qRed(*data)) >> 8, (val * gb + (0xFF - val) * qGreen(*data)) >> 8, (val * bb + (0xFF - val) * qBlue(*data)) >> 8, qAlpha(*data)); - else + } else { *data = qRgba((val * rw + (0xFF - val) * qRed(*data)) >> 8, (val * gw + (0xFF - val) * qGreen(*data)) >> 8, (val * bw + (0xFF - val) * qBlue(*data)) >> 8, qAlpha(*data)); + } ++data; } } else { while (data != end) { - if (qGray(*data) <= medium) + if (qGray(*data) <= medium) { *data = qRgba((val * rb + (0xFF - val) * qRed(*data)) >> 8, (val * gb + (0xFF - val) * qGreen(*data)) >> 8, (val * bb + (0xFF - val) * qBlue(*data)) >> 8, qAlpha(*data)); - else + } else { *data = qRgba((val * rw + (0xFF - val) * qRed(*data)) >> 8, (val * gw + (0xFF - val) * qGreen(*data)) >> 8, (val * bw + (0xFF - val) * qBlue(*data)) >> 8, qAlpha(*data)); + } ++data; } } @@ -441,7 +456,9 @@ QRgb *end = data + ii.pixels; QColor color; - int h, s, v; + int h; + int s; + int v; while (data != end) { color.setRgb(*data); color.getHsv(&h, &s, &v); @@ -570,9 +587,11 @@ return QImage(); } - int x, y; + int x; + int y; if (src.depth() == 32) { - QRgb *l1, *l2; + QRgb *l1; + QRgb *l2; for (y = 0; y < h; ++y) { l1 = (QRgb *)src.scanLine(y); l2 = (QRgb *)dst.scanLine(y * 2); @@ -623,7 +642,8 @@ overlay = overlay.convertToFormat(QImage::Format_ARGB32); } - int i, j; + int i; + int j; // We don't do 1 bpp @@ -661,7 +681,8 @@ } // Overwrite nontransparent pixels. - unsigned char *oline, *sline; + unsigned char *oline; + unsigned char *sline; for (i = 0; i < src.height(); ++i) { oline = overlay.scanLine(i); sline = src.scanLine(i); @@ -676,9 +697,16 @@ // Overlay at 32 bpp does use alpha blending if (src.depth() == 32) { - QRgb *oline, *sline; - int r1, g1, b1, a1; - int r2, g2, b2, a2; + QRgb *oline; + QRgb *sline; + int r1; + int g1; + int b1; + int a1; + int r2; + int g2; + int b2; + int a2; for (i = 0; i < src.height(); ++i) { oline = (QRgb *)overlay.scanLine(i); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.85.0/src/kiconloader.cpp new/kiconthemes-5.86.0/src/kiconloader.cpp --- old/kiconthemes-5.85.0/src/kiconloader.cpp 2021-08-06 11:05:22.000000000 +0200 +++ new/kiconthemes-5.86.0/src/kiconloader.cpp 2021-09-04 19:01:30.000000000 +0200 @@ -189,8 +189,8 @@ class KIconLoaderPrivate { public: - KIconLoaderPrivate(KIconLoader *q) - : q(q) + KIconLoaderPrivate(KIconLoader *qq) + : q(qq) { } @@ -1060,7 +1060,7 @@ // Once everyone uses that to look up mimetype icons, we can kill the fallback code // from this method. - for (KIconThemeNode *themeNode : qAsConst(links)) { + for (KIconThemeNode *themeNode : std::as_const(links)) { const QString path = themeNode->theme->iconPathByName(name, size, KIconLoader::MatchBest, scale); if (!path.isEmpty()) { return path; @@ -1072,7 +1072,7 @@ } bool genericFallback = false; QString path; - for (KIconThemeNode *themeNode : qAsConst(links)) { + for (KIconThemeNode *themeNode : std::as_const(links)) { QString currentName = name; while (!currentName.isEmpty()) { @@ -1156,7 +1156,7 @@ QString KIconLoaderPrivate::locate(const QString &fileName) { - for (const QString &dir : qAsConst(searchPaths)) { + for (const QString &dir : std::as_const(searchPaths)) { const QString path = dir + QLatin1Char('/') + fileName; if (QDir(dir).isAbsolute()) { if (QFileInfo::exists(path)) { @@ -1486,7 +1486,7 @@ QString path; - for (KIconThemeNode *themeNode : qAsConst(d->links)) { + for (KIconThemeNode *themeNode : std::as_const(d->links)) { path = themeNode->theme->iconPath(file, size, KIconLoader::MatchExact); if (!path.isEmpty()) { break; @@ -1494,7 +1494,7 @@ } if (path.isEmpty()) { - for (KIconThemeNode *themeNode : qAsConst(d->links)) { + for (KIconThemeNode *themeNode : std::as_const(d->links)) { path = themeNode->theme->iconPath(file, size, KIconLoader::MatchBest); if (!path.isEmpty()) { break; @@ -1607,13 +1607,14 @@ size = -group_or_size; } - for (KIconThemeNode *themeNode : qAsConst(d->links)) { + for (KIconThemeNode *themeNode : std::as_const(d->links)) { themeNode->queryIconsByContext(&result, size, context); } // Eliminate duplicate entries (same icon in different directories) QString name; - QStringList res2, entries; + QStringList res2; + QStringList entries; QStringList::ConstIterator it; for (it = result.constBegin(); it != result.constEnd(); ++it) { int n = (*it).lastIndexOf(QLatin1Char('/')); @@ -1647,13 +1648,14 @@ size = -group_or_size; } - for (KIconThemeNode *themeNode : qAsConst(d->links)) { + for (KIconThemeNode *themeNode : std::as_const(d->links)) { themeNode->queryIcons(&result, size, context); } // Eliminate duplicate entries (same icon in different directories) QString name; - QStringList res2, entries; + QStringList res2; + QStringList entries; QStringList::ConstIterator it; for (it = result.constBegin(); it != result.constEnd(); ++it) { int n = (*it).lastIndexOf(QLatin1Char('/')); @@ -1676,10 +1678,11 @@ { d->initIconThemes(); - for (KIconThemeNode *themeNode : qAsConst(d->links)) + for (KIconThemeNode *themeNode : std::as_const(d->links)) { if (themeNode->theme->hasContext(context)) { return true; } + } return false; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.85.0/src/kicontheme.cpp new/kiconthemes-5.86.0/src/kicontheme.cpp --- old/kiconthemes-5.85.0/src/kicontheme.cpp 2021-08-06 11:05:22.000000000 +0200 +++ new/kiconthemes-5.86.0/src/kicontheme.cpp 2021-09-04 19:01:30.000000000 +0200 @@ -285,7 +285,8 @@ // These are not in the icon spec, but e.g. GNOME puts some icons there anyway. icnlibs += QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("pixmaps"), QStandardPaths::LocateDirectory); - QString fileName, mainSection; + QString fileName; + QString mainSection; for (QStringList::ConstIterator it = icnlibs.constBegin(), total = icnlibs.constEnd(); it != total; ++it) { const QString cDir = *it + QLatin1Char('/') + name + QLatin1Char('/'); if (QDir(cDir).exists()) { @@ -541,10 +542,11 @@ QString KIconTheme::iconPathByName(const QString &iconName, int size, KIconLoader::MatchType match, qreal scale) const { - for (const QString ¤t : qAsConst(d->mExtensions)) { + for (const QString ¤t : std::as_const(d->mExtensions)) { const QString path = iconPath(iconName + current, size, match, scale); - if (!path.isEmpty()) + if (!path.isEmpty()) { return path; + } } return QString(); } @@ -630,7 +632,7 @@ // These are not in the icon spec, but e.g. GNOME puts some icons there anyway. icnlibs += QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("pixmaps"), QStandardPaths::LocateDirectory); - for (const QString &it : qAsConst(icnlibs)) { + for (const QString &it : std::as_const(icnlibs)) { QDir dir(it); const QStringList lst = dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot); for (QStringList::ConstIterator it2 = lst.begin(), total = lst.end(); it2 != total; ++it2) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiconthemes-5.85.0/src/tools/kiconfinder/kiconfinder.cpp new/kiconthemes-5.86.0/src/tools/kiconfinder/kiconfinder.cpp --- old/kiconthemes-5.85.0/src/tools/kiconfinder/kiconfinder.cpp 2021-08-06 11:05:22.000000000 +0200 +++ new/kiconthemes-5.86.0/src/tools/kiconfinder/kiconfinder.cpp 2021-09-04 19:01:30.000000000 +0200 @@ -24,8 +24,9 @@ parser.addHelpOption(); parser.process(app); - if (parser.positionalArguments().isEmpty()) + if (parser.positionalArguments().isEmpty()) { parser.showHelp(); + } for (const QString &iconName : parser.positionalArguments()) { const QString icon = KIconLoader::global()->iconPath(iconName, KIconLoader::Desktop /*TODO configurable*/, true);
