Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kfilemetadata5 for openSUSE:Factory checked in at 2021-09-16 23:14:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kfilemetadata5 (Old) and /work/SRC/openSUSE:Factory/.kfilemetadata5.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kfilemetadata5" Thu Sep 16 23:14:00 2021 rev:100 rq:919190 version:5.86.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kfilemetadata5/kfilemetadata5.changes 2021-08-16 10:11:55.711074391 +0200 +++ /work/SRC/openSUSE:Factory/.kfilemetadata5.new.1899/kfilemetadata5.changes 2021-09-16 23:15:47.919868315 +0200 @@ -1,0 +2,15 @@ +Wed Sep 15 08:24:05 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Drop the unneeded baselibs.conf. + +------------------------------------------------------------------- +Mon Sep 6 06:22:04 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- 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: + * replace "MacOSX" with "macOS" + +------------------------------------------------------------------- Old: ---- baselibs.conf kfilemetadata-5.85.0.tar.xz kfilemetadata-5.85.0.tar.xz.sig New: ---- kfilemetadata-5.86.0.tar.xz kfilemetadata-5.86.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kfilemetadata5.spec ++++++ --- /var/tmp/diff_new_pack.xqEPGe/_old 2021-09-16 23:15:48.483868900 +0200 +++ /var/tmp/diff_new_pack.xqEPGe/_new 2021-09-16 23:15:48.487868903 +0200 @@ -16,7 +16,7 @@ # -%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) @@ -24,7 +24,7 @@ %bcond_without ffmpeg %bcond_without lang Name: kfilemetadata5 -Version: 5.85.0 +Version: 5.86.0 Release: 0 Summary: Library for extracting Metadata License: GPL-2.0-or-later AND LGPL-2.1-or-later AND LGPL-3.0-only @@ -35,7 +35,6 @@ Source1: https://download.kde.org/stable/frameworks/%{_tar_path}/kfilemetadata-%{version}.tar.xz.sig Source2: frameworks.keyring %endif -Source99: baselibs.conf BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: kf5-filesystem BuildRequires: libattr-devel ++++++ kfilemetadata-5.85.0.tar.xz -> kfilemetadata-5.86.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.85.0/.git-blame-ignore-revs new/kfilemetadata-5.86.0/.git-blame-ignore-revs --- old/kfilemetadata-5.85.0/.git-blame-ignore-revs 1970-01-01 01:00:00.000000000 +0100 +++ new/kfilemetadata-5.86.0/.git-blame-ignore-revs 2021-09-04 19:00:18.000000000 +0200 @@ -0,0 +1,2 @@ +#clang-tidy +1f3b50bc1690704813b3073f4459b1a704304df1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.85.0/CMakeLists.txt new/kfilemetadata-5.86.0/CMakeLists.txt --- old/kfilemetadata-5.85.0/CMakeLists.txt 2021-08-06 11:04:11.000000000 +0200 +++ new/kfilemetadata-5.86.0/CMakeLists.txt 2021-09-04 19:00:18.000000000 +0200 @@ -1,11 +1,11 @@ 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(KFileMetaData VERSION ${KF_VERSION}) 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) @@ -33,7 +33,7 @@ SOVERSION 3) # Dependencies -set(REQUIRED_QT_VERSION 5.15.0) +set(REQUIRED_QT_VERSION 5.15.2) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG COMPONENTS Gui) set_package_properties(Qt5Gui PROPERTIES DESCRIPTION "Qt 5: Gui component" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.85.0/metainfo.yaml new/kfilemetadata-5.86.0/metainfo.yaml --- old/kfilemetadata-5.85.0/metainfo.yaml 2021-08-06 11:04:11.000000000 +0200 +++ new/kfilemetadata-5.86.0/metainfo.yaml 2021-09-04 19:00:18.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/kfilemetadata-5.85.0/po/zh_CN/kfilemetadata5.po new/kfilemetadata-5.86.0/po/zh_CN/kfilemetadata5.po --- old/kfilemetadata-5.85.0/po/zh_CN/kfilemetadata5.po 2021-08-06 11:04:11.000000000 +0200 +++ new/kfilemetadata-5.86.0/po/zh_CN/kfilemetadata5.po 2021-09-04 19:00:18.000000000 +0200 @@ -10,7 +10,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-06-09 02:02+0200\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/kfilemetadata-5.85.0/src/extractorplugin.cpp new/kfilemetadata-5.86.0/src/extractorplugin.cpp --- old/kfilemetadata-5.85.0/src/extractorplugin.cpp 2021-08-06 11:04:11.000000000 +0200 +++ new/kfilemetadata-5.86.0/src/extractorplugin.cpp 2021-09-04 19:00:18.000000000 +0200 @@ -111,21 +111,25 @@ cleanedString = cleanedString.remove(QLatin1Char('}')); QStringList contactStrings = string.split(QLatin1Char(','), Qt::SkipEmptyParts); - if (contactStrings.size() == 1) + if (contactStrings.size() == 1) { contactStrings = string.split(QLatin1Char(';'), Qt::SkipEmptyParts); + } - if (contactStrings.size() == 1) + if (contactStrings.size() == 1) { contactStrings = string.split(QStringLiteral(" ft "), Qt::SkipEmptyParts); + } - if (contactStrings.size() == 1) + if (contactStrings.size() == 1) { contactStrings = string.split(QStringLiteral(" feat. "), Qt::SkipEmptyParts); + } - if (contactStrings.size() == 1) + if (contactStrings.size() == 1) { contactStrings = string.split(QStringLiteral(" feat "), Qt::SkipEmptyParts); + } QStringList list; list.reserve(contactStrings.count()); - for (const QString& contactName : qAsConst(contactStrings)) { + for (const QString& contactName : std::as_const(contactStrings)) { list << contactName.trimmed(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.85.0/src/extractors/epubextractor.cpp new/kfilemetadata-5.86.0/src/extractors/epubextractor.cpp --- old/kfilemetadata-5.85.0/src/extractors/epubextractor.cpp 2021-08-06 11:04:11.000000000 +0200 +++ new/kfilemetadata-5.86.0/src/extractors/epubextractor.cpp 2021-09-04 19:00:18.000000000 +0200 @@ -38,8 +38,9 @@ for (int i = 0; i < size; i++) { // skip nullptr entries, can happen for broken xml files // also skip empty entries - if (!data[i] || !data[i][0]) + if (!data[i] || !data[i][0]) { continue; + } strList << QString::fromUtf8((char*)data[i]); free(data[i]); @@ -93,8 +94,9 @@ // Name is provided as "<name>(<file-as>)" when opf:file-as property // is specified, "<name>(<name>)" otherwise. Strip the last part int index = value.indexOf(QLatin1Char('(')); - if (index > 0) + if (index > 0) { value = value.mid(0, index); + } result->add(Property::Author, value); } @@ -142,8 +144,9 @@ if (auto iter = epub_get_iterator(ePubDoc, EITERATOR_SPINE, 0)) { do { char* curr = epub_it_get_curr(iter); - if (!curr) + if (!curr) { continue; + } QString html = QString::fromUtf8(curr); html.remove(QRegularExpression(QStringLiteral("<[^>]*>"))); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.85.0/src/extractors/exiv2extractor.cpp new/kfilemetadata-5.86.0/src/extractors/exiv2extractor.cpp --- old/kfilemetadata-5.85.0/src/extractors/exiv2extractor.cpp 2021-08-06 11:04:11.000000000 +0200 +++ new/kfilemetadata-5.86.0/src/extractors/exiv2extractor.cpp 2021-09-04 19:00:18.000000000 +0200 @@ -73,8 +73,9 @@ QString str(toString(value)); bool ok = false; int val = str.toInt(&ok); - if (ok) + if (ok) { return QVariant(val); + } return QVariant(); } @@ -89,8 +90,9 @@ QString str(toString(value)); bool ok = false; double val = str.toDouble(&ok); - if (ok) + if (ok) { return QVariant(val); + } return QVariant(); } @@ -98,8 +100,9 @@ QVariant toVariantString(const Exiv2::Value& value) { QString str = toString(value); - if (!str.isEmpty()) + if (!str.isEmpty()) { return QVariant(str); + } return QVariant(); } @@ -204,12 +207,14 @@ double altitude = fetchGpsAltitude(data); QByteArray latRef = fetchByteArray(data, "Exif.GPSInfo.GPSLatitudeRef"); - if (!latRef.isEmpty() && latRef[0] == 'S') + if (!latRef.isEmpty() && latRef[0] == 'S') { latitude *= -1; + } QByteArray longRef = fetchByteArray(data, "Exif.GPSInfo.GPSLongitudeRef"); - if (!longRef.isEmpty() && longRef[0] == 'W') + if (!longRef.isEmpty() && longRef[0] == 'W') { longitude *= -1; + } if (!std::isnan(latitude)) { result->add(Property::PhotoGpsLatitude, latitude); @@ -231,8 +236,9 @@ Exiv2::ExifData::const_iterator it = data.findKey(Exiv2::ExifKey(name)); if (it != data.end()) { QVariant value = toVariant(it->value(), type); - if (!value.isNull()) + if (!value.isNull()) { result->add(prop, value); + } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.85.0/src/extractors/ffmpegextractor.cpp new/kfilemetadata-5.86.0/src/extractors/ffmpegextractor.cpp --- old/kfilemetadata-5.85.0/src/extractors/ffmpegextractor.cpp 2021-08-06 11:04:11.000000000 +0200 +++ new/kfilemetadata-5.86.0/src/extractors/ffmpegextractor.cpp 2021-09-04 19:00:18.000000000 +0200 @@ -104,17 +104,21 @@ codec->height * avSampleAspectRatio.den, 1024*1024); double displayAspectRatio = avDisplayAspectRatio.num; - if (avDisplayAspectRatio.den) + if (avDisplayAspectRatio.den) { displayAspectRatio /= avDisplayAspectRatio.den; - if (displayAspectRatio) + } + if (displayAspectRatio) { result->add(Property::AspectRatio, displayAspectRatio); + } AVRational avFrameRate = av_guess_frame_rate(fmt_ctx, stream, nullptr); double frameRate = avFrameRate.num; - if (avFrameRate.den) + if (avFrameRate.den) { frameRate /= avFrameRate.den; - if (frameRate) + } + if (frameRate) { result->add(Property::FrameRate, frameRate); + } } } @@ -158,8 +162,9 @@ bool ok = false; int track = value.toInt(&ok); - if (ok && track) + if (ok && track) { result->add(Property::TrackNumber, track); + } } entry = av_dict_get(dict, "year", nullptr, 0); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.85.0/src/extractors/odfextractor.cpp new/kfilemetadata-5.86.0/src/extractors/odfextractor.cpp --- old/kfilemetadata-5.85.0/src/extractors/odfextractor.cpp 2021-08-06 11:04:11.000000000 +0200 +++ new/kfilemetadata-5.86.0/src/extractors/odfextractor.cpp 2021-09-04 19:00:18.000000000 +0200 @@ -130,8 +130,9 @@ result->add(Property::Generator, e.text()); } else if (localName == QLatin1String("creation-date")) { QDateTime dt = ExtractorPlugin::dateTimeFromString(e.text()); - if (!dt.isNull()) + if (!dt.isNull()) { result->add(Property::CreationDate, dt); + } } } } @@ -169,7 +170,8 @@ result->append(str); } - if (xml.hasError() || xml.isEndDocument()) + if (xml.hasError() || xml.isEndDocument()) { break; + } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.85.0/src/extractors/office2007extractor.cpp new/kfilemetadata-5.86.0/src/extractors/office2007extractor.cpp --- old/kfilemetadata-5.85.0/src/extractors/office2007extractor.cpp 2021-08-06 11:04:11.000000000 +0200 +++ new/kfilemetadata-5.86.0/src/extractors/office2007extractor.cpp 2021-09-04 19:00:18.000000000 +0200 @@ -179,8 +179,9 @@ if (rootEntries.contains(QStringLiteral("word"))) { result->addType(Type::Document); - if (!extractPlainText) + if (!extractPlainText) { return; + } const KArchiveEntry* wordEntry = rootDir->entry(QStringLiteral("word")); if (!wordEntry->isDirectory()) { @@ -205,8 +206,9 @@ result->addType(Type::Document); result->addType(Type::Spreadsheet); - if (!extractPlainText) + if (!extractPlainText) { return; + } const KArchiveEntry* xlEntry = rootDir->entry(QStringLiteral("xl")); if (!xlEntry->isDirectory()) { @@ -222,8 +224,9 @@ result->addType(Type::Document); result->addType(Type::Presentation); - if (!extractPlainText) + if (!extractPlainText) { return; + } const KArchiveEntry* pptEntry = rootDir->entry(QStringLiteral("ppt")); if (!pptEntry->isDirectory()) { @@ -247,8 +250,9 @@ result->append(str); } - if (xml.isEndDocument() || xml.hasError()) + if (xml.isEndDocument() || xml.hasError()) { break; + } } } @@ -288,7 +292,8 @@ } } - if (xml.isEndDocument() || xml.hasError()) + if (xml.isEndDocument() || xml.hasError()) { break; + } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.85.0/src/extractors/officeextractor.cpp new/kfilemetadata-5.86.0/src/extractors/officeextractor.cpp --- old/kfilemetadata-5.85.0/src/extractors/officeextractor.cpp 2021-08-06 11:04:11.000000000 +0200 +++ new/kfilemetadata-5.86.0/src/extractors/officeextractor.cpp 2021-09-04 19:00:18.000000000 +0200 @@ -77,8 +77,9 @@ contents = textFromFile(fileUrl, m_catppt, args); } - if (contents.isEmpty()) + if (contents.isEmpty()) { return; + } result->append(contents); @@ -96,8 +97,9 @@ process.start(command, arguments, QIODevice::ReadOnly); process.waitForFinished(); - if (process.exitStatus() != QProcess::NormalExit || process.exitCode() != 0) + if (process.exitStatus() != QProcess::NormalExit || process.exitCode() != 0) { return QString(); - else + } else { return QString::fromUtf8(process.readAll()); + } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.85.0/src/extractors/poextractor.cpp new/kfilemetadata-5.86.0/src/extractors/poextractor.cpp --- old/kfilemetadata-5.85.0/src/extractors/poextractor.cpp 2021-08-06 11:04:11.000000000 +0200 +++ new/kfilemetadata-5.86.0/src/extractors/poextractor.cpp 2021-09-04 19:00:18.000000000 +0200 @@ -51,9 +51,13 @@ void POExtractor::handleLine(const char* data, quint32 length) { - if (state == ERROR) return; + if (state == ERROR) { + return; + } if (state == WHITESPACE) { - if (length == 0) return; + if (length == 0) { + return; + } if (data[0] != '#') { state = COMMENT; //this allows PO files w/o comments } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.85.0/src/extractors/taglibextractor.cpp new/kfilemetadata-5.86.0/src/extractors/taglibextractor.cpp --- old/kfilemetadata-5.85.0/src/extractors/taglibextractor.cpp 2021-08-06 11:04:11.000000000 +0200 +++ new/kfilemetadata-5.86.0/src/extractors/taglibextractor.cpp 2021-09-04 19:00:18.000000000 +0200 @@ -357,7 +357,7 @@ TagLib::ID3v2::FrameList lstID3v2 = Id3Tags->frameListMap()["APIC"]; using PictureFrame = TagLib::ID3v2::AttachedPictureFrame; - for (const auto& frame : qAsConst(lstID3v2)) { + for (const auto& frame : std::as_const(lstID3v2)) { const auto *coverFrame = static_cast<PictureFrame *>(frame); const auto imageType = mapTaglibType<PictureFrame::Type>(coverFrame->type()); if (types & imageType) { @@ -377,7 +377,7 @@ return images; } - for (const auto& picture : qAsConst(picList)) { + for (const auto& picture : std::as_const(picList)) { const auto imageType = mapTaglibType<TagLib::FLAC::Picture::Type>(picture->type()); if (types & imageType) { images.insert(imageType, QByteArray(picture->data().data(), picture->data().size())); @@ -509,7 +509,7 @@ TagLib::ASF::AttributeList lstASF = asfTags->attribute("WM/Picture"); using Picture = TagLib::ASF::Picture; - for (const auto& attribute: qAsConst(lstASF)) { + for (const auto& attribute: std::as_const(lstASF)) { Picture picture = attribute.toPicture(); const auto imageType = mapTaglibType<Picture::Type>(picture.type()); if (types & imageType) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.85.0/src/writercollection.cpp new/kfilemetadata-5.86.0/src/writercollection.cpp --- old/kfilemetadata-5.85.0/src/writercollection.cpp 2021-08-06 11:04:11.000000000 +0200 +++ new/kfilemetadata-5.86.0/src/writercollection.cpp 2021-09-04 19:00:18.000000000 +0200 @@ -65,8 +65,9 @@ } // Make sure the same plugin is not loaded twice, even if it // installed in two different locations - if (plugins.contains(fileName)) + if (plugins.contains(fileName)) { continue; + } plugins << fileName; pluginPaths << dir.absoluteFilePath(fileName); @@ -81,15 +82,16 @@ if (!QLibrary::isLibrary(externalPlugin)) { continue; } - if (externalPlugins.contains(externalPlugin)) + if (externalPlugins.contains(externalPlugin)) { continue; + } externalPlugins << externalPlugin; externalPluginPaths << externalPluginDir.absoluteFilePath(externalPlugin); } externalPlugins.clear(); - for (const QString& pluginPath : qAsConst(pluginPaths)) { + for (const QString& pluginPath : std::as_const(pluginPaths)) { QPluginLoader loader(pluginPath); if (!loader.load()) { @@ -117,7 +119,7 @@ } } - for (const QString& externalPluginPath : qAsConst(externalPluginPaths)) { + for (const QString& externalPluginPath : std::as_const(externalPluginPaths)) { ExternalWriter *plugin = new ExternalWriter(externalPluginPath); Writer writer; writer.d->m_plugin = plugin; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.85.0/src/writers/taglibwriter.cpp new/kfilemetadata-5.86.0/src/writers/taglibwriter.cpp --- old/kfilemetadata-5.85.0/src/writers/taglibwriter.cpp 2021-08-06 11:04:11.000000000 +0200 +++ new/kfilemetadata-5.86.0/src/writers/taglibwriter.cpp 2021-09-04 19:00:18.000000000 +0200 @@ -195,7 +195,7 @@ // Update existing covers TagLib::ID3v2::FrameList lstID3v2 = id3Tags->frameListMap()["APIC"]; - for (auto& frame : qAsConst(lstID3v2)) { + for (auto& frame : std::as_const(lstID3v2)) { auto* coverFrame = static_cast<PictureFrame *>(frame); const auto kfmType = mapTaglibType<PictureFrame::Type>(coverFrame->type()); if (kfmType & wantedTypes) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.85.0/tests/dump.cpp new/kfilemetadata-5.86.0/tests/dump.cpp --- old/kfilemetadata-5.85.0/tests/dump.cpp 2021-08-06 11:04:11.000000000 +0200 +++ new/kfilemetadata-5.86.0/tests/dump.cpp 2021-09-04 19:00:18.000000000 +0200 @@ -49,7 +49,7 @@ QTextStream out(stdout); out << url << " " << mimetype << "\n"; - for (KFileMetaData::Extractor* ex : qAsConst(exList)) { + for (KFileMetaData::Extractor* ex : std::as_const(exList)) { out << "\tExtractor For: " << ex->mimetypes().join(QLatin1Char(' ')) << "\n"; KFileMetaData::SimpleExtractionResult result(url, mimetype, extractionLevel);
