Hello community, here is the log from the commit of package kfilemetadata5 for openSUSE:Factory checked in at 2020-02-14 16:32:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kfilemetadata5 (Old) and /work/SRC/openSUSE:Factory/.kfilemetadata5.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kfilemetadata5" Fri Feb 14 16:32:34 2020 rev:81 rq:773258 version:5.67.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kfilemetadata5/kfilemetadata5.changes 2020-01-14 21:04:28.630684934 +0100 +++ /work/SRC/openSUSE:Factory/.kfilemetadata5.new.26092/kfilemetadata5.changes 2020-02-14 16:33:30.771456612 +0100 @@ -1,0 +2,15 @@ +Sun Feb 2 18:06:55 UTC 2020 - Christophe Giboudeaux <christo...@krop.fr> + +- Replace %make_jobs with %cmake_build. + +------------------------------------------------------------------- +Sun Feb 2 14:32:42 UTC 2020 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.67.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.67.0.php +- Changes since 5.66.0: + * Port away from deprecated QList::toSet() method + +------------------------------------------------------------------- Old: ---- kfilemetadata-5.66.0.tar.xz kfilemetadata-5.66.0.tar.xz.sig New: ---- kfilemetadata-5.67.0.tar.xz kfilemetadata-5.67.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kfilemetadata5.spec ++++++ --- /var/tmp/diff_new_pack.UEF4ap/_old 2020-02-14 16:33:31.463456998 +0100 +++ /var/tmp/diff_new_pack.UEF4ap/_new 2020-02-14 16:33:31.467457000 +0100 @@ -16,7 +16,7 @@ # -%define _tar_path 5.66 +%define _tar_path 5.67 # 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.66.0 +Version: 5.67.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 @@ -46,8 +46,8 @@ BuildRequires: cmake(KF5Archive) >= %{_kf5_bugfix_version} BuildRequires: cmake(KF5CoreAddons) >= %{_kf5_bugfix_version} BuildRequires: cmake(KF5I18n) >= %{_kf5_bugfix_version} -BuildRequires: cmake(Qt5Test) >= 5.11.0 -BuildRequires: cmake(Qt5Xml) >= 5.11.0 +BuildRequires: cmake(Qt5Test) >= 5.12.0 +BuildRequires: cmake(Qt5Xml) >= 5.12.0 BuildRequires: pkgconfig(poppler-qt5) Recommends: %{name}-lang %if %{with ffmpeg} @@ -64,7 +64,7 @@ Group: Development/Libraries/KDE Requires: %{name} = %{version} Requires: extra-cmake-modules >= %{_kf5_bugfix_version} -Requires: cmake(Qt5Core) >= 5.11.0 +Requires: cmake(Qt5Core) >= 5.12.0 %description devel A library for extracting file metadata. Development files @@ -76,7 +76,7 @@ %build %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} - %make_jobs + %cmake_build %install %kf5_makeinstall -C build ++++++ kfilemetadata-5.66.0.tar.xz -> kfilemetadata-5.67.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.66.0/CMakeLists.txt new/kfilemetadata-5.67.0/CMakeLists.txt --- old/kfilemetadata-5.66.0/CMakeLists.txt 2020-01-04 11:07:42.000000000 +0100 +++ new/kfilemetadata-5.67.0/CMakeLists.txt 2020-02-02 13:48:13.000000000 +0100 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.66.0") # handled by release scripts -set(KF5_DEP_VERSION "5.66.0") # handled by release scripts +set(KF5_VERSION "5.67.0") # handled by release scripts +set(KF5_DEP_VERSION "5.67.0") # handled by release scripts project(KFileMetaData VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.66.0 NO_MODULE) +find_package(ECM 5.67.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) @@ -117,7 +117,7 @@ ) add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00) -add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054100) +add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054200) add_definitions(-DTRANSLATION_DOMAIN=\"kfilemetadata5\") add_definitions(-DQT_NO_FOREACH) add_subdirectory(src) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.66.0/autotests/extractorcollectiontest.cpp new/kfilemetadata-5.67.0/autotests/extractorcollectiontest.cpp --- old/kfilemetadata-5.66.0/autotests/extractorcollectiontest.cpp 2020-01-04 11:07:42.000000000 +0100 +++ new/kfilemetadata-5.67.0/autotests/extractorcollectiontest.cpp 2020-02-02 13:48:13.000000000 +0100 @@ -104,9 +104,16 @@ // Verify properties for every supported mimetype auto propMimetypesJson = exProperties["MimeTypes"]; +#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) QSet<QString> propMimetypes = propMimetypesJson.toMap().keys().toSet(); QSet<QString> supportedMimetypes = extractor->mimetypes().toSet(); +#else + const QStringList propMimeList = propMimetypesJson.toMap().keys(); + QSet<QString> propMimetypes(propMimeList.begin(), propMimeList.end()); + const QStringList extractedMimes = extractor->mimetypes(); + QSet<QString> supportedMimetypes(extractedMimes.begin(), extractedMimes.end()); +#endif QVERIFY2(!exProperties["Name"].toString().isEmpty(), "Missing \"Name\" property"); QVERIFY2(!exProperties["Id"].toString().isEmpty(), "Missing \"Id\" property"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.66.0/autotests/taglibextractortest.cpp new/kfilemetadata-5.67.0/autotests/taglibextractortest.cpp --- old/kfilemetadata-5.66.0/autotests/taglibextractortest.cpp 2020-01-04 11:07:42.000000000 +0100 +++ new/kfilemetadata-5.67.0/autotests/taglibextractortest.cpp 2020-02-02 13:48:13.000000000 +0100 @@ -581,8 +581,17 @@ const auto resultList = extracted.properties(); const auto resultKeys = resultList.uniqueKeys(); - const auto excessKeys = resultKeys.toSet() - expectedKeys.toSet(); - const auto missingKeys = expectedKeys.toSet() - resultKeys.toSet(); +#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) + const QSet<KFileMetaData::Property::Property> resultKeySet = resultKeys.toSet(); + const QSet<KFileMetaData::Property::Property> expectedKeySet = expectedKeys.toSet(); +#else + const QSet<KFileMetaData::Property::Property> resultKeySet(resultKeys.begin(), resultKeys.end()); + const QSet<KFileMetaData::Property::Property> expectedKeySet(expectedKeys.begin(), expectedKeys.end()); +#endif + + const auto excessKeys = resultKeySet - expectedKeySet; + const auto missingKeys = expectedKeySet - resultKeySet; + if (!excessKeys.isEmpty()) { const auto propNames = propertyEnumNames(excessKeys.values()).join(QLatin1String(", ")); if (failMessage.isEmpty()) { @@ -598,7 +607,6 @@ } QCOMPARE(resultKeys, expectedKeys); if (!failMessage.isEmpty()) { - auto excessKeys = resultKeys.toSet() - expectedKeys.toSet(); const auto message = QStringLiteral("%1: %2") .arg(failMessage) .arg(propertyEnumNames(excessKeys.values()).join(QLatin1String(", "))); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.66.0/po/zh_CN/kfilemetadata5.po new/kfilemetadata-5.67.0/po/zh_CN/kfilemetadata5.po --- old/kfilemetadata-5.66.0/po/zh_CN/kfilemetadata5.po 2020-01-04 11:07:42.000000000 +0100 +++ new/kfilemetadata-5.67.0/po/zh_CN/kfilemetadata5.po 2020-02-02 13:48:13.000000000 +0100 @@ -10,15 +10,14 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2019-07-19 02:55+0200\n" -"PO-Revision-Date: 2019-11-19 23:01\n" -"Last-Translator: Guo Yunhe (guoyunhe)\n" +"PO-Revision-Date: 2020-01-20 21:48\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: crowdin.com\n" "X-Crowdin-Project: kdeorg\n" "X-Crowdin-Language: zh-CN\n" "X-Crowdin-File: /kf5-trunk/messages/frameworks/kfilemetadata5.pot\n"
