Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kfilemetadata5 for openSUSE:Factory checked in at 2023-05-14 16:30:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kfilemetadata5 (Old) and /work/SRC/openSUSE:Factory/.kfilemetadata5.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kfilemetadata5" Sun May 14 16:30:35 2023 rev:121 rq:1086925 version:5.106.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kfilemetadata5/kfilemetadata5.changes 2023-04-09 18:41:46.102006497 +0200 +++ /work/SRC/openSUSE:Factory/.kfilemetadata5.new.1533/kfilemetadata5.changes 2023-05-14 16:32:42.099481490 +0200 @@ -1,0 +2,18 @@ +Sat May 6 14:01:35 UTC 2023 - Christophe Marin <[email protected]> + +- Update to 5.106.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.106.0 +- Changes since 5.105.0: + * Test HEIF in Exiv2Extractor + * Test JXL in Exiv2Extractor, extend JPEG coverage + * Move static private helper out of Exiv2ExtractorTest class + * Clean up Exiv2/C++14 warning message + * Remove usage of deprecated MP4::ItemListMap in taglib extractor + * Disable external extractor/writer test on Windows + * Modernize and extend CMake check for Python3 + * Extend dignostics for taglib autotests + * Make fb2 extractor compilation dependent on KF5Archive + +------------------------------------------------------------------- Old: ---- kfilemetadata-5.105.0.tar.xz kfilemetadata-5.105.0.tar.xz.sig New: ---- kfilemetadata-5.106.0.tar.xz kfilemetadata-5.106.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kfilemetadata5.spec ++++++ --- /var/tmp/diff_new_pack.N8kcKN/_old 2023-05-14 16:32:42.627484043 +0200 +++ /var/tmp/diff_new_pack.N8kcKN/_new 2023-05-14 16:32:42.631484063 +0200 @@ -24,7 +24,7 @@ %bcond_without ffmpeg %bcond_without released Name: kfilemetadata5 -Version: 5.105.0 +Version: 5.106.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 ++++++ kfilemetadata-5.105.0.tar.xz -> kfilemetadata-5.106.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.105.0/CMakeLists.txt new/kfilemetadata-5.106.0/CMakeLists.txt --- old/kfilemetadata-5.105.0/CMakeLists.txt 2023-04-01 03:50:04.000000000 +0200 +++ new/kfilemetadata-5.106.0/CMakeLists.txt 2023-05-06 11:24:31.000000000 +0200 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.105.0") # handled by release scripts -set(KF_DEP_VERSION "5.105.0") # handled by release scripts +set(KF_VERSION "5.106.0") # handled by release scripts +set(KF_DEP_VERSION "5.106.0") # handled by release scripts project(KFileMetaData VERSION ${KF_VERSION}) include(FeatureSummary) -find_package(ECM 5.105.0 NO_MODULE) +find_package(ECM 5.106.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) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.105.0/autotests/CMakeLists.txt new/kfilemetadata-5.106.0/autotests/CMakeLists.txt --- old/kfilemetadata-5.105.0/autotests/CMakeLists.txt 2023-04-01 03:50:04.000000000 +0200 +++ new/kfilemetadata-5.106.0/autotests/CMakeLists.txt 2023-05-06 11:24:31.000000000 +0200 @@ -1,9 +1,9 @@ find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test) -find_package(PythonInterp) -set_package_properties(PythonInterp PROPERTIES DESCRIPTION "Python Interpreter" +find_package(Python3 COMPONENTS Interpreter) +set_package_properties(Python3 PROPERTIES DESCRIPTION "Python Interpreter" URL "https://www.python.org"; TYPE OPTIONAL - PURPOSE "Python interpreter is needed to execute test for external extractors or writers") + PURPOSE "Python interpreter is required for testing external extractors and writers") remove_definitions(-DQT_NO_CAST_FROM_ASCII) @@ -103,13 +103,15 @@ # # FictionBook2 # -ecm_add_test( - fb2extractortest.cpp - ../src/extractors/fb2extractor.cpp - ../src/kfilemetadata_debug.cpp - TEST_NAME "fb2extractortest" - LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test KF5::Archive KF5::FileMetaData -) +if(KF5Archive_FOUND) + ecm_add_test( + fb2extractortest.cpp + ../src/extractors/fb2extractor.cpp + ../src/kfilemetadata_debug.cpp + TEST_NAME "fb2extractortest" + LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test KF5::Archive KF5::FileMetaData + ) +endif() # # Property Info @@ -168,7 +170,8 @@ endif() -if(PYTHONINTERP_FOUND) +if(TARGET Python3::Interpreter AND NOT WIN32) + # Test relies on working she-bang, which does non exist on Windows configure_file(samplefiles/testexternalextractor/main.py samplefiles/testexternalextractor/main.py) configure_file(samplefiles/testexternalextractor/manifest.json samplefiles/testexternalextractor/manifest.json COPYONLY) @@ -284,7 +287,7 @@ ) endif() -if(PYTHONINTERP_FOUND) +if(TARGET Python3::Interpreter AND NOT WIN32) configure_file(samplefiles/testexternalwriter/main.py samplefiles/testexternalwriter/main.py) configure_file(samplefiles/testexternalwriter/manifest.json samplefiles/testexternalwriter/manifest.json COPYONLY) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.105.0/autotests/exiv2extractortest.cpp new/kfilemetadata-5.106.0/autotests/exiv2extractortest.cpp --- old/kfilemetadata-5.105.0/autotests/exiv2extractortest.cpp 2023-04-01 03:50:04.000000000 +0200 +++ new/kfilemetadata-5.106.0/autotests/exiv2extractortest.cpp 2023-05-06 11:24:31.000000000 +0200 @@ -14,13 +14,15 @@ #include <QMimeDatabase> using namespace KFileMetaData; -using namespace KFileMetaData::Property; -QString Exiv2ExtractorTest::testFilePath(const QString& fileName) const +namespace { +QString testFilePath(const QString& fileName) { return QLatin1String(INDEXER_TESTS_SAMPLE_FILES_PATH) + QLatin1Char('/') + fileName; } +} + void Exiv2ExtractorTest::testNoExtraction() { Exiv2Extractor plugin{this}; @@ -40,6 +42,8 @@ void Exiv2ExtractorTest::test() { + using namespace KFileMetaData::Property; + Exiv2Extractor plugin{this}; QString fileName = testFilePath(QStringLiteral("test.jpg")); @@ -61,6 +65,8 @@ void Exiv2ExtractorTest::testGPS() { + using namespace KFileMetaData::Property; + Exiv2Extractor plugin{this}; SimpleExtractionResult result(testFilePath("test.jpg"), "image/jpeg"); @@ -86,4 +92,127 @@ QCOMPARE(resultZero.properties().value(PhotoGpsAltitude).toDouble(), 0.0); } +void Exiv2ExtractorTest::testJpegJxlProperties() +{ + QFETCH(QString, fileName); + QFETCH(QString, mimeType); + +#ifndef EXV_ENABLE_BMFF + if (mimeType == QStringLiteral("image/jxl")) + QSKIP("BMFF support required"); +#endif + + Exiv2Extractor plugin{this}; + + SimpleExtractionResult result(testFilePath(fileName), mimeType); + plugin.extract(&result); + + QCOMPARE(result.types().size(), 1); + QCOMPARE(result.types().constFirst(), Type::Image); + + const auto properties = result.properties(); + QCOMPARE(properties.size(), 27); + + auto verifyProperty = [&properties](KFileMetaData::Property::Property prop, const QVariant &value) + { + if (value.canConvert<float>()) { + QCOMPARE(properties.value(prop).toFloat(), value.toFloat()); + } else { + QCOMPARE(properties.value(prop), value); + } + }; + + verifyProperty(Property::Artist, QStringLiteral("Artist")); + verifyProperty(Property::Description, QStringLiteral("Description")); + verifyProperty(Property::Copyright, QStringLiteral("Copyright")); + verifyProperty(Property::Generator, QStringLiteral("digikam-5.9.0")); + verifyProperty(Property::PhotoGpsLatitude, 41.411f); + verifyProperty(Property::PhotoGpsLongitude, 2.173f); + verifyProperty(Property::PhotoGpsAltitude, 12.2f); + verifyProperty(Property::Width, 8); + verifyProperty(Property::Height, 14); + verifyProperty(Property::Manufacturer, QStringLiteral("LGE")); + verifyProperty(Property::Model, QStringLiteral("Nexus 5")); + verifyProperty(Property::ImageDateTime, QDateTime(QDate(2014, 10, 04), QTime(13, 47, 43.000), Qt::UTC)); + verifyProperty(Property::PhotoFlash, 0); + verifyProperty(Property::PhotoPixelXDimension, 8); + verifyProperty(Property::PhotoPixelYDimension, 14); + verifyProperty(Property::PhotoDateTimeOriginal, QDateTime(QDate(2014, 10, 04), QTime(13, 47, 43.000), Qt::UTC)); + verifyProperty(Property::PhotoFocalLength, 4.f); + verifyProperty(Property::PhotoFocalLengthIn35mmFilm, 10.f); + verifyProperty(Property::PhotoExposureTime, 0.0027027f); + verifyProperty(Property::PhotoFNumber, 1.f); + verifyProperty(Property::PhotoApertureValue, 0.f); + verifyProperty(Property::PhotoExposureBiasValue, 0.f); + verifyProperty(Property::PhotoWhiteBalance, 0); + verifyProperty(Property::PhotoMeteringMode, 1); + verifyProperty(Property::PhotoISOSpeedRatings, 100); + verifyProperty(Property::PhotoSaturation, 0); + verifyProperty(Property::PhotoSharpness, 0); +} + +void Exiv2ExtractorTest::testJpegJxlProperties_data() +{ + QTest::addColumn<QString>("fileName"); + QTest::addColumn<QString>("mimeType"); + + QTest::addRow("jpeg") << QStringLiteral("test.jpg") << QStringLiteral("image/jpeg"); + QTest::addRow("jxl") << QStringLiteral("test.jxl") << QStringLiteral("image/jxl"); +} + +void Exiv2ExtractorTest::testHeifProperties() +{ +#ifndef EXV_ENABLE_BMFF + QSKIP("BMFF support required"); +#endif + + Exiv2Extractor plugin{this}; + + SimpleExtractionResult result(testFilePath("test.heif"), "image/heif"); + plugin.extract(&result); + + QCOMPARE(result.types().size(), 1); + QCOMPARE(result.types().constFirst(), Type::Image); + + const auto properties = result.properties(); + QCOMPARE(properties.size(), 23); + + auto verifyProperty = [&properties](KFileMetaData::Property::Property prop, const QVariant &value) + { + if (value.canConvert<float>()) { + QCOMPARE(properties.value(prop).toFloat(), value.toFloat()); + } else { + QCOMPARE(properties.value(prop), value); + } + }; + + verifyProperty(Property::Artist, QStringLiteral("Artist")); + verifyProperty(Property::Description, QStringLiteral("Description")); + verifyProperty(Property::Copyright, QStringLiteral("Copyright")); + verifyProperty(Property::Generator, QStringLiteral("digikam-5.9.0")); + verifyProperty(Property::PhotoGpsLatitude, 51.3331f); + verifyProperty(Property::PhotoGpsLongitude, -0.705575f); + verifyProperty(Property::PhotoGpsAltitude, 0.f); + verifyProperty(Property::Width, 750); + verifyProperty(Property::Height, 1000); + verifyProperty(Property::Manufacturer, QStringLiteral("samsung")); + verifyProperty(Property::Model, QStringLiteral("SM-J610N")); + verifyProperty(Property::ImageDateTime, QDateTime(QDate(2022, 03, 24), QTime(18, 20, 07.000), Qt::UTC)); + verifyProperty(Property::PhotoFlash, 0); + verifyProperty(Property::PhotoPixelXDimension, 750); + verifyProperty(Property::PhotoPixelYDimension, 1000); + verifyProperty(Property::PhotoDateTimeOriginal, QDateTime(QDate(2020, 03, 31), QTime(11, 14, 30.000), Qt::UTC)); + verifyProperty(Property::PhotoFocalLength, 3.6f); + verifyProperty(Property::PhotoFocalLengthIn35mmFilm, 26.f); + verifyProperty(Property::PhotoExposureTime, 0.00429185f); + verifyProperty(Property::PhotoFNumber, 1.9f); + verifyProperty(Property::PhotoApertureValue, 1.85f); + verifyProperty(Property::PhotoExposureBiasValue, 0.f); + verifyProperty(Property::PhotoWhiteBalance, 0); + verifyProperty(Property::PhotoMeteringMode, 2); + verifyProperty(Property::PhotoISOSpeedRatings, 40); + verifyProperty(Property::PhotoSaturation, 0); + verifyProperty(Property::PhotoSharpness, 0); +} + QTEST_GUILESS_MAIN(Exiv2ExtractorTest) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.105.0/autotests/exiv2extractortest.h new/kfilemetadata-5.106.0/autotests/exiv2extractortest.h --- old/kfilemetadata-5.105.0/autotests/exiv2extractortest.h 2023-04-01 03:50:04.000000000 +0200 +++ new/kfilemetadata-5.106.0/autotests/exiv2extractortest.h 2023-05-06 11:24:31.000000000 +0200 @@ -12,13 +12,14 @@ class Exiv2ExtractorTest : public QObject { Q_OBJECT -private: - QString testFilePath(const QString& fileName) const; private Q_SLOTS: void testNoExtraction(); void test(); void testGPS(); + void testJpegJxlProperties(); + void testJpegJxlProperties_data(); + void testHeifProperties(); }; #endif // EXIV2EXTRACTORTEST_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.105.0/autotests/samplefiles/testexternalextractor/main.py new/kfilemetadata-5.106.0/autotests/samplefiles/testexternalextractor/main.py --- old/kfilemetadata-5.105.0/autotests/samplefiles/testexternalextractor/main.py 2023-04-01 03:50:04.000000000 +0200 +++ new/kfilemetadata-5.106.0/autotests/samplefiles/testexternalextractor/main.py 2023-05-06 11:24:31.000000000 +0200 @@ -1,4 +1,4 @@ -#!@PYTHON_EXECUTABLE@ +#!@Python3_EXECUTABLE@ # # SPDX-FileCopyrightText: 2016 Varun Joshi <[email protected]> # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.105.0/autotests/samplefiles/testexternalwriter/main.py new/kfilemetadata-5.106.0/autotests/samplefiles/testexternalwriter/main.py --- old/kfilemetadata-5.105.0/autotests/samplefiles/testexternalwriter/main.py 2023-04-01 03:50:04.000000000 +0200 +++ new/kfilemetadata-5.106.0/autotests/samplefiles/testexternalwriter/main.py 2023-05-06 11:24:31.000000000 +0200 @@ -1,4 +1,4 @@ -#!@PYTHON_EXECUTABLE@ +#!@Python3_EXECUTABLE@ # # SPDX-FileCopyrightText: 2016 Varun Joshi <[email protected]> # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.105.0/autotests/taglibextractortest.cpp new/kfilemetadata-5.106.0/autotests/taglibextractortest.cpp --- old/kfilemetadata-5.105.0/autotests/taglibextractortest.cpp 2023-04-01 03:50:04.000000000 +0200 +++ new/kfilemetadata-5.106.0/autotests/taglibextractortest.cpp 2023-05-06 11:24:31.000000000 +0200 @@ -678,7 +678,8 @@ testAudioFile = testFilePath(fileName); const QString mimeType = mimeDb.mimeTypeForFile(testAudioFile).name(); - QVERIFY(plugin.mimetypes().contains(mimeType)); + QVERIFY2(!mimeType.isEmpty(), "Failed to determine mimetype"); + QVERIFY2(plugin.mimetypes().contains(mimeType), qPrintable(mimeType + " not supported by taglib")); SimpleExtractionResult result(testAudioFile, mimeType, ExtractionResult::ExtractImageData); plugin.extract(&result); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.105.0/po/de/kfilemetadata5.po new/kfilemetadata-5.106.0/po/de/kfilemetadata5.po --- old/kfilemetadata-5.105.0/po/de/kfilemetadata5.po 2023-04-01 03:50:04.000000000 +0200 +++ new/kfilemetadata-5.106.0/po/de/kfilemetadata5.po 2023-05-06 11:24:31.000000000 +0200 @@ -12,7 +12,7 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 22.04.1\n" #: src/formatstrings.cpp:64 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.105.0/po/fi/kfilemetadata5.po new/kfilemetadata-5.106.0/po/fi/kfilemetadata5.po --- old/kfilemetadata-5.105.0/po/fi/kfilemetadata5.po 2023-04-01 03:50:04.000000000 +0200 +++ new/kfilemetadata-5.106.0/po/fi/kfilemetadata5.po 2023-05-06 11:24:31.000000000 +0200 @@ -1,7 +1,7 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # Lasse Liehu <[email protected]>, 2014, 2015, 2016, 2017. -# Tommi Nieminen <[email protected]>, 2017, 2018, 2019, 2022. +# Tommi Nieminen <[email protected]>, 2017, 2018, 2019, 2022, 2023. # # msgid "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.105.0/po/gl/kfilemetadata5.po new/kfilemetadata-5.106.0/po/gl/kfilemetadata5.po --- old/kfilemetadata-5.105.0/po/gl/kfilemetadata5.po 2023-04-01 03:50:04.000000000 +0200 +++ new/kfilemetadata-5.106.0/po/gl/kfilemetadata5.po 2023-05-06 11:24:31.000000000 +0200 @@ -1,22 +1,23 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. -# # Marce Villarino <[email protected]>, 2014. # Adrián Chaves Fernández <[email protected]>, 2015, 2016, 2017. -# Adrián Chaves (Gallaecio) <[email protected]>, 2018, 2019. +# Adrián Chaves (Gallaecio) <[email protected]>, 2018, 2019, 2023. +# msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-06-09 02:02+0200\n" -"PO-Revision-Date: 2019-07-13 17:05+0200\n" +"PO-Revision-Date: 2023-04-28 19:14+0200\n" "Last-Translator: Adrián Chaves (Gallaecio) <[email protected]>\n" -"Language-Team: Galician <[email protected]>\n" +"Language-Team: Galician <[email protected]>\n" "Language: gl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 23.04.0\n" #: src/formatstrings.cpp:64 #, kde-format @@ -52,7 +53,7 @@ #, kde-format msgctxt "Description of image orientation" msgid "Transposed" -msgstr "Transposta" +msgstr "Trasposta" #: src/formatstrings.cpp:83 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.105.0/po/it/kfilemetadata5.po new/kfilemetadata-5.106.0/po/it/kfilemetadata5.po --- old/kfilemetadata-5.105.0/po/it/kfilemetadata5.po 2023-04-01 03:50:04.000000000 +0200 +++ new/kfilemetadata-5.106.0/po/it/kfilemetadata5.po 2023-05-06 11:24:31.000000000 +0200 @@ -2,7 +2,7 @@ # This file is distributed under the same license as the PACKAGE package. # Federico Zenith <[email protected]>, 2014. # Vincenzo Reale <[email protected]>, 2015, 2023. -# Paolo Zamponi <[email protected]>, 2017, 2018. +# Paolo Zamponi <[email protected]>, 2017, 2018. # Valter Mura <[email protected]>, 2019. # msgid "" @@ -10,7 +10,7 @@ "Project-Id-Version: kfilemetadata\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-06-09 02:02+0200\n" -"PO-Revision-Date: 2023-03-23 17:50+0100\n" +"PO-Revision-Date: 2023-04-24 10:02+0200\n" "Last-Translator: Vincenzo Reale <[email protected]>\n" "Language-Team: Italian <[email protected]>\n" "Language: it\n" @@ -18,7 +18,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 22.12.3\n" +"X-Generator: Lokalize 23.04.0\n" #: src/formatstrings.cpp:64 #, kde-format @@ -447,7 +447,7 @@ #, kde-format msgctxt "@label number of lines" msgid "Line Count" -msgstr "Conteggio righe" +msgstr "Numero di righe" #: src/propertyinfo.cpp:213 #, kde-format @@ -459,7 +459,7 @@ #, kde-format msgctxt "@label" msgid "Page Count" -msgstr "Conto delle pagine" +msgstr "Numero di pagine" #: src/propertyinfo.cpp:225 #, kde-format @@ -711,7 +711,7 @@ #, kde-format msgctxt "@label number of words" msgid "Word Count" -msgstr "Conto delle parole" +msgstr "Numero di parole" #: src/propertyinfo.cpp:495 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.105.0/po/ko/kfilemetadata5.po new/kfilemetadata-5.106.0/po/ko/kfilemetadata5.po --- old/kfilemetadata-5.105.0/po/ko/kfilemetadata5.po 2023-04-01 03:50:04.000000000 +0200 +++ new/kfilemetadata-5.106.0/po/ko/kfilemetadata5.po 2023-05-06 11:24:31.000000000 +0200 @@ -1,6 +1,6 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. -# Shinjo Park <[email protected]>, 2014, 2015, 2016, 2017, 2018, 2019, 2020. +# Shinjo Park <[email protected]>, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2023. # msgid "" msgstr "" @@ -15,7 +15,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Lokalize 19.04.3\n" +"X-Generator: Lokalize 22.12.3\n" #: src/formatstrings.cpp:64 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.105.0/po/zh_CN/kfilemetadata5.po new/kfilemetadata-5.106.0/po/zh_CN/kfilemetadata5.po --- old/kfilemetadata-5.105.0/po/zh_CN/kfilemetadata5.po 2023-04-01 03:50:04.000000000 +0200 +++ new/kfilemetadata-5.106.0/po/zh_CN/kfilemetadata5.po 2023-05-06 11:24:31.000000000 +0200 @@ -3,7 +3,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: 2023-03-27 11:59\n" +"PO-Revision-Date: 2023-04-29 08:34\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.105.0/src/extractors/CMakeLists.txt new/kfilemetadata-5.106.0/src/extractors/CMakeLists.txt --- old/kfilemetadata-5.105.0/src/extractors/CMakeLists.txt 2023-04-01 03:50:04.000000000 +0200 +++ new/kfilemetadata-5.106.0/src/extractors/CMakeLists.txt 2023-05-06 11:24:31.000000000 +0200 @@ -44,12 +44,13 @@ endif() configure_file(exiv2extractor.json.in exiv2extractor.json) - if (${LibExiv2_VERSION} VERSION_GREATER 0.27.4) - # exiv2 doesn't build [yet] with C++17 so force C++14 - message(AUTHOR_WARNING "hello developer of the future, please check if with > 0.27.4 we can stop forcing CXX_STANDARD 14") + set_target_properties(kfilemetadata_exiv2extractor PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/kf${QT_MAJOR_VERSION}/kfilemetadata") + + if (${LibExiv2_VERSION} VERSION_LESS 0.28.0) + # exiv2 0.27.x still uses std::auto_ptr, which is incompatible with C++17 + set_target_properties(kfilemetadata_exiv2extractor PROPERTIES CXX_STANDARD 14) endif() - set_target_properties(kfilemetadata_exiv2extractor PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/kf${QT_MAJOR_VERSION}/kfilemetadata" - CXX_STANDARD 14) + install( TARGETS kfilemetadata_exiv2extractor DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf${QT_MAJOR_VERSION}/kfilemetadata) @@ -270,14 +271,16 @@ # # FictionBook2 # -add_library(kfilemetadata_fb2extractor MODULE fb2extractor.cpp ) -target_link_libraries(kfilemetadata_fb2extractor - KF5::Archive - KF5::FileMetaData - Qt${QT_MAJOR_VERSION}::Core -) +if(KF5Archive_FOUND) + add_library(kfilemetadata_fb2extractor MODULE fb2extractor.cpp ) + target_link_libraries(kfilemetadata_fb2extractor + KF5::Archive + KF5::FileMetaData + Qt${QT_MAJOR_VERSION}::Core + ) -set_target_properties(kfilemetadata_fb2extractor PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/kf${QT_MAJOR_VERSION}/kfilemetadata") -install( -TARGETS kfilemetadata_fb2extractor -DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf${QT_MAJOR_VERSION}/kfilemetadata) + set_target_properties(kfilemetadata_fb2extractor PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/kf${QT_MAJOR_VERSION}/kfilemetadata") + install( + TARGETS kfilemetadata_fb2extractor + DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf${QT_MAJOR_VERSION}/kfilemetadata) +endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.105.0/src/extractors/taglibextractor.cpp new/kfilemetadata-5.106.0/src/extractors/taglibextractor.cpp --- old/kfilemetadata-5.105.0/src/extractors/taglibextractor.cpp 2023-04-01 03:50:04.000000000 +0200 +++ new/kfilemetadata-5.106.0/src/extractors/taglibextractor.cpp 2023-05-06 11:24:31.000000000 +0200 @@ -392,16 +392,15 @@ return; } - TagLib::MP4::ItemListMap allTags = mp4Tags->itemListMap(); + auto ratingItem = mp4Tags->item("rate"); /* * There is no standard regarding ratings. Mimic MediaMonkey's behavior * with a range of 0 to 100 (stored in steps of 10) and make it compatible * with baloo rating with a range from 0 to 10. */ - TagLib::MP4::ItemListMap::Iterator itRating = allTags.find("rate"); - if (itRating != allTags.end()) { - result->add(Property::Rating, itRating->second.toStringList().toString().toInt() / 10); + if (ratingItem.isValid()) { + result->add(Property::Rating, ratingItem.toStringList().toString().toInt() / 10); } }
