Hello community, here is the log from the commit of package kfilemetadata5 for openSUSE:Factory checked in at 2020-01-14 21:01:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kfilemetadata5 (Old) and /work/SRC/openSUSE:Factory/.kfilemetadata5.new.6675 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kfilemetadata5" Tue Jan 14 21:01:06 2020 rev:80 rq:763457 version:5.66.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kfilemetadata5/kfilemetadata5.changes 2019-12-18 14:42:44.197785432 +0100 +++ /work/SRC/openSUSE:Factory/.kfilemetadata5.new.6675/kfilemetadata5.changes 2020-01-14 21:04:28.630684934 +0100 @@ -1,0 +2,17 @@ +Sun Jan 5 09:02:08 UTC 2020 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.66.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.66.0.php +- Changes since 5.65.0: + * In qt5.15 QHash::insertMulti is deprecated now we need to use QMultiHash + * Port QRegExp to QRegularExpression + * partial fix for accentuated characters in file name on Windows + * Port deprecated QSet::toList method + * Update the obsolete projects.kde.org URL + * Remove unrequired private declarations for taglibextractor + * partial solution to accept accentuated characters on windows + * xattr: fix crash on dangling symlinks (kde#414227) + +------------------------------------------------------------------- Old: ---- kfilemetadata-5.65.0.tar.xz kfilemetadata-5.65.0.tar.xz.sig New: ---- kfilemetadata-5.66.0.tar.xz kfilemetadata-5.66.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kfilemetadata5.spec ++++++ --- /var/tmp/diff_new_pack.6aqMpT/_old 2020-01-14 21:04:29.734685444 +0100 +++ /var/tmp/diff_new_pack.6aqMpT/_new 2020-01-14 21:04:29.734685444 +0100 @@ -1,7 +1,7 @@ # # spec file for package kfilemetadata5 # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,7 +16,7 @@ # -%define _tar_path 5.65 +%define _tar_path 5.66 # 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.65.0 +Version: 5.66.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.65.0.tar.xz -> kfilemetadata-5.66.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.65.0/CMakeLists.txt new/kfilemetadata-5.66.0/CMakeLists.txt --- old/kfilemetadata-5.65.0/CMakeLists.txt 2019-12-12 23:37:05.000000000 +0100 +++ new/kfilemetadata-5.66.0/CMakeLists.txt 2020-01-04 11:07:42.000000000 +0100 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.65.0") # handled by release scripts -set(KF5_DEP_VERSION "5.65.0") # handled by release scripts +set(KF5_VERSION "5.66.0") # handled by release scripts +set(KF5_DEP_VERSION "5.66.0") # handled by release scripts project(KFileMetaData VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.65.0 NO_MODULE) -set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) +find_package(ECM 5.66.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) set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${ECM_MODULE_PATH}) @@ -33,7 +33,7 @@ SOVERSION 3) # Dependencies -set(REQUIRED_QT_VERSION 5.11.0) +set(REQUIRED_QT_VERSION 5.12.0) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG COMPONENTS Gui) set_package_properties(Qt5Gui PROPERTIES DESCRIPTION "Qt 5: Gui component" @@ -117,7 +117,7 @@ ) add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00) -add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x053f00) +add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054100) 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.65.0/autotests/extractorcollectiontest.cpp new/kfilemetadata-5.66.0/autotests/extractorcollectiontest.cpp --- old/kfilemetadata-5.65.0/autotests/extractorcollectiontest.cpp 2019-12-12 23:37:05.000000000 +0100 +++ new/kfilemetadata-5.66.0/autotests/extractorcollectiontest.cpp 2020-01-04 11:07:42.000000000 +0100 @@ -20,7 +20,7 @@ */ #include <QObject> -#include <QtTest> +#include <QTest> #include <QDebug> #include "extractorcollection.h" @@ -116,7 +116,7 @@ auto diff = propMimetypes - supportedMimetypes; if (!diff.isEmpty()) { - for (auto mimetype : diff.toList()) { + for (auto mimetype : diff.values()) { auto mimetypeProp = propMimetypesJson.toMap()[mimetype]; auto runtimedep = mimetypeProp.toMap()["HasRuntimeDependency"]; if (runtimedep.isValid() && runtimedep.toInt()) { @@ -127,7 +127,7 @@ if (!diff.isEmpty()) { qWarning() << exProperties["Name"].toString() << exProperties["Id"].toString() - << "has extraneous properties for these mimetypes:" << diff.toList().join(", "); + << "has extraneous properties for these mimetypes:" << diff.values().join(", "); } } @@ -135,7 +135,7 @@ if (!diff.isEmpty()) { qWarning() << exProperties["Name"].toString() << exProperties["Id"].toString() - << "has no properties for these mimetypes:" + diff.toList().join(", "); + << "has no properties for these mimetypes:" + diff.values().join(", "); } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.65.0/autotests/extractorcoveragetest.cpp new/kfilemetadata-5.66.0/autotests/extractorcoveragetest.cpp --- old/kfilemetadata-5.65.0/autotests/extractorcoveragetest.cpp 2019-12-12 23:37:05.000000000 +0100 +++ new/kfilemetadata-5.66.0/autotests/extractorcoveragetest.cpp 2020-01-04 11:07:42.000000000 +0100 @@ -20,7 +20,8 @@ */ #include <QObject> -#include <QtTest> +#include <QTest> +#include <QDirIterator> #include <QMimeDatabase> #include "mimeutils.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.65.0/autotests/indexerextractortests.cpp new/kfilemetadata-5.66.0/autotests/indexerextractortests.cpp --- old/kfilemetadata-5.65.0/autotests/indexerextractortests.cpp 2019-12-12 23:37:05.000000000 +0100 +++ new/kfilemetadata-5.66.0/autotests/indexerextractortests.cpp 2020-01-04 11:07:42.000000000 +0100 @@ -22,7 +22,8 @@ #include "indexerextractortests.h" -#include <QtTest> +#include <QTest> +#include <QTemporaryFile> #include "simpleextractionresult.h" #include "indexerextractortestsconfig.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.65.0/autotests/propertyinfotest.cpp new/kfilemetadata-5.66.0/autotests/propertyinfotest.cpp --- old/kfilemetadata-5.65.0/autotests/propertyinfotest.cpp 2019-12-12 23:37:05.000000000 +0100 +++ new/kfilemetadata-5.66.0/autotests/propertyinfotest.cpp 2020-01-04 11:07:42.000000000 +0100 @@ -21,7 +21,7 @@ #include "propertyinfotest.h" #include "propertyinfo.h" -#include <QtTest> +#include <QTest> using namespace KFileMetaData; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.65.0/autotests/taglibextractortest.cpp new/kfilemetadata-5.66.0/autotests/taglibextractortest.cpp --- old/kfilemetadata-5.65.0/autotests/taglibextractortest.cpp 2019-12-12 23:37:05.000000000 +0100 +++ new/kfilemetadata-5.66.0/autotests/taglibextractortest.cpp 2020-01-04 11:07:42.000000000 +0100 @@ -584,7 +584,7 @@ const auto excessKeys = resultKeys.toSet() - expectedKeys.toSet(); const auto missingKeys = expectedKeys.toSet() - resultKeys.toSet(); if (!excessKeys.isEmpty()) { - const auto propNames = propertyEnumNames(excessKeys.toList()).join(QLatin1String(", ")); + const auto propNames = propertyEnumNames(excessKeys.values()).join(QLatin1String(", ")); if (failMessage.isEmpty()) { const auto message = QStringLiteral("Excess properties: %1").arg(propNames); QWARN(qPrintable(message)); @@ -593,7 +593,7 @@ } } else if (!missingKeys.isEmpty()) { const auto message = QStringLiteral("Missing properties: %1") - .arg(propertyEnumNames(missingKeys.toList()).join(QLatin1String(", "))); + .arg(propertyEnumNames(missingKeys.values()).join(QLatin1String(", "))); QWARN(qPrintable(message)); } QCOMPARE(resultKeys, expectedKeys); @@ -601,7 +601,7 @@ auto excessKeys = resultKeys.toSet() - expectedKeys.toSet(); const auto message = QStringLiteral("%1: %2") .arg(failMessage) - .arg(propertyEnumNames(excessKeys.toList()).join(QLatin1String(", "))); + .arg(propertyEnumNames(excessKeys.values()).join(QLatin1String(", "))); QEXPECT_FAIL("", qPrintable(message), Continue); } QCOMPARE(resultKeys, expectedKeys); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.65.0/autotests/writercollectiontest.cpp new/kfilemetadata-5.66.0/autotests/writercollectiontest.cpp --- old/kfilemetadata-5.65.0/autotests/writercollectiontest.cpp 2019-12-12 23:37:05.000000000 +0100 +++ new/kfilemetadata-5.66.0/autotests/writercollectiontest.cpp 2020-01-04 11:07:42.000000000 +0100 @@ -21,7 +21,7 @@ */ #include <QObject> -#include <QtTest> +#include <QTest> #include <QDebug> #include "writercollection.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.65.0/autotests/xmlextractortest.cpp new/kfilemetadata-5.66.0/autotests/xmlextractortest.cpp --- old/kfilemetadata-5.65.0/autotests/xmlextractortest.cpp 2019-12-12 23:37:05.000000000 +0100 +++ new/kfilemetadata-5.66.0/autotests/xmlextractortest.cpp 2020-01-04 11:07:42.000000000 +0100 @@ -20,7 +20,8 @@ #include "xmlextractortest.h" -#include <QtTest> +#include <QTest> +#include <QTemporaryFile> #include <QMimeDatabase> #include "simpleextractionresult.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.65.0/po/de/kfilemetadata5.po new/kfilemetadata-5.66.0/po/de/kfilemetadata5.po --- old/kfilemetadata-5.65.0/po/de/kfilemetadata5.po 2019-12-12 23:37:05.000000000 +0100 +++ new/kfilemetadata-5.66.0/po/de/kfilemetadata5.po 2020-01-04 11:07:42.000000000 +0100 @@ -5,7 +5,7 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2019-07-19 02:55+0200\n" -"PO-Revision-Date: 2019-08-03 17:12+0200\n" +"PO-Revision-Date: 2019-12-13 08:11+0100\n" "Last-Translator: Burkhard Lück <lu...@hube-lueck.de>\n" "Language-Team: German <kde-i18n...@kde.org>\n" "Language: de\n" @@ -640,7 +640,7 @@ msgstr "" #: src/propertyinfo.cpp:439 -#, fuzzy, kde-format +#, kde-format msgctxt "@label" msgid "Compilation" msgstr "Kompilierung" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.65.0/po/et/kfilemetadata5.po new/kfilemetadata-5.66.0/po/et/kfilemetadata5.po --- old/kfilemetadata-5.65.0/po/et/kfilemetadata5.po 2019-12-12 23:37:05.000000000 +0100 +++ new/kfilemetadata-5.66.0/po/et/kfilemetadata5.po 2020-01-04 11:07:42.000000000 +0100 @@ -7,7 +7,7 @@ "Project-Id-Version: \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-22 11:53+0200\n" +"PO-Revision-Date: 2019-12-29 11:26+0200\n" "Last-Translator: Marek Laane <qiila...@gmail.com>\n" "Language-Team: Estonian <kde...@lists.linux.ee>\n" "Language: et\n" @@ -87,19 +87,19 @@ #, kde-format msgctxt "Description of photo flash" msgid "Fired, return light not detected" -msgstr "" +msgstr "Välguga, peegeldust ei tuvastatud" #: src/formatstrings.cpp:112 #, kde-format msgctxt "Description of photo flash" msgid "Fired, return light detected" -msgstr "" +msgstr "Välguga, tuvastati peegeldus" #: src/formatstrings.cpp:113 #, kde-format msgctxt "Description of photo flash" msgid "Yes, did not fire" -msgstr "" +msgstr "Jah, välku ei kasutatud" #: src/formatstrings.cpp:114 #, kde-format @@ -111,13 +111,13 @@ #, kde-format msgctxt "Description of photo flash" msgid "Yes, compulsory, return light not detected" -msgstr "" +msgstr "Jah, kohustuslik, peegeldust ei tuvastatud" #: src/formatstrings.cpp:116 #, kde-format msgctxt "Description of photo flash" msgid "Yes, compulsory, return light detected" -msgstr "" +msgstr "Jah, kohustuslik, tuvastati peegeldus" #: src/formatstrings.cpp:117 #, kde-format @@ -129,7 +129,7 @@ #, kde-format msgctxt "Description of photo flash" msgid "No, did not fire, return light not detected" -msgstr "" +msgstr "Ei, välguta, peegeldust ei tuvastatud" #: src/formatstrings.cpp:119 #, kde-format @@ -147,25 +147,25 @@ #, kde-format msgctxt "Description of photo flash" msgid "Yes, auto, return light not detected" -msgstr "" +msgstr "Jah, automaatne, peegeldust ei tuvastatud" #: src/formatstrings.cpp:122 #, kde-format msgctxt "Description of photo flash" msgid "Yes, auto, return light detected" -msgstr "" +msgstr "Jah, automaatne, tuvastati peegeldus" #: src/formatstrings.cpp:123 #, kde-format msgctxt "Description of photo flash" msgid "No flash function" -msgstr "" +msgstr "Välgufunktsioon puudub" #: src/formatstrings.cpp:124 #, kde-format msgctxt "Description of photo flash" msgid "No, no flash function" -msgstr "" +msgstr "Ei, välgufunktsioon puudub" #: src/formatstrings.cpp:125 #, kde-format @@ -177,31 +177,31 @@ #, kde-format msgctxt "Description of photo flash" msgid "Yes, red-eye reduction, return light not detected" -msgstr "" +msgstr "Jah, punasilmsuse vähendamine, peegeldust ei tuvastatud" #: src/formatstrings.cpp:127 #, kde-format msgctxt "Description of photo flash" msgid "Yes, red-eye reduction, return light detected" -msgstr "" +msgstr "Jah, punasilmsuse vähendamine, tuvastati peegeldus" #: src/formatstrings.cpp:128 #, kde-format msgctxt "Description of photo flash" msgid "Yes, compulsory, red-eye reduction" -msgstr "" +msgstr "Jah, kohustuslik, punasilmsuse vähendamine" #: src/formatstrings.cpp:129 #, kde-format msgctxt "Description of photo flash" msgid "Yes, compulsory, red-eye reduction, return light not detected" -msgstr "" +msgstr "Jah, kohustuslik, punasilmsuse vähendamine, peegeldust ei tuvastatud" #: src/formatstrings.cpp:130 #, kde-format msgctxt "Description of photo flash" msgid "Yes, compulsory, red-eye reduction, return light detected" -msgstr "" +msgstr "Jah, kohustuslik, punasilmsuse vähendamine, tuvastati peegeldus" #: src/formatstrings.cpp:131 #, kde-format @@ -225,13 +225,13 @@ #, kde-format msgctxt "Description of photo flash" msgid "Yes, auto, red-eye reduction, return light not detected" -msgstr "" +msgstr "Jah, automaatne, punasilmsuse vähendamine, peegeldust ei tuvastatud" #: src/formatstrings.cpp:135 #, kde-format msgctxt "Description of photo flash" msgid "Yes, auto, red-eye reduction, return light detected" -msgstr "" +msgstr "Jah, automaatne, punasilmsuse vähendamine, tuvastati peegeldus" #: src/formatstrings.cpp:140 #, kde-format @@ -663,7 +663,7 @@ #, kde-format msgctxt "@label" msgid "Opus" -msgstr "" +msgstr "Teos" #: src/propertyinfo.cpp:463 #, kde-format @@ -675,25 +675,25 @@ #, kde-format msgctxt "@label" msgid "Replay Gain Album Peak" -msgstr "" +msgstr "Albumi helitugevuse parandamise tipp" #: src/propertyinfo.cpp:476 #, kde-format msgctxt "@label" msgid "Replay Gain Album Gain" -msgstr "" +msgstr "Albumi helitugevuse parandamine" #: src/propertyinfo.cpp:483 #, kde-format msgctxt "@label" msgid "Replay Gain Track Peak" -msgstr "" +msgstr "Pala helitugevuse parandamise tipp" #: src/propertyinfo.cpp:490 #, kde-format msgctxt "@label" msgid "Replay Gain Track Gain" -msgstr "" +msgstr "Pala helitugevuse parandamine" #: src/propertyinfo.cpp:497 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.65.0/po/ia/kfilemetadata5.po new/kfilemetadata-5.66.0/po/ia/kfilemetadata5.po --- old/kfilemetadata-5.65.0/po/ia/kfilemetadata5.po 2019-12-12 23:37:05.000000000 +0100 +++ new/kfilemetadata-5.66.0/po/ia/kfilemetadata5.po 2020-01-04 11:07:42.000000000 +0100 @@ -2,15 +2,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Giovanni Sora <g.s...@tioscali.it>, 2014. -# G.Sora <g.s...@tiscali.it>, 2014, 2016, 2017. +# G.Sora <g.s...@tiscali.it>, 2014, 2016, 2017, 2019. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2019-07-19 02:55+0200\n" -"PO-Revision-Date: 2017-04-15 13:51+0100\n" -"Last-Translator: giovanni <g.s...@tiscali.it>\n" -"Language-Team: Interlingua <kde-i18n...@kde.org>\n" +"PO-Revision-Date: 2019-12-22 22:15+0100\n" +"Last-Translator: Giovanni Sora <g.s...@tiscali.it>\n" +"Language-Team: Interlingua <kde-i18n-...@kde.org>\n" "Language: ia\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,39 +22,37 @@ #, kde-format msgctxt "@label bitrate (per second)" msgid "%1/s" -msgstr "" +msgstr "%1/s" #: src/formatstrings.cpp:91 #, kde-format msgctxt "Description of image orientation" msgid "Unchanged" -msgstr "" +msgstr "Non modificate" #: src/formatstrings.cpp:92 #, kde-format msgctxt "Description of image orientation" msgid "Horizontally flipped" -msgstr "" +msgstr "Colpate horizontalmente" #: src/formatstrings.cpp:93 #, kde-format msgctxt "Description of image orientation" msgid "180° rotated" -msgstr "" +msgstr "Rotate de 180°" #: src/formatstrings.cpp:94 #, kde-format msgctxt "Description of image orientation" msgid "Vertically flipped" -msgstr "" +msgstr "Colpate verticalmente" #: src/formatstrings.cpp:95 -#, fuzzy, kde-format -#| msgctxt "@label number of translated strings" -#| msgid "Translations" +#, kde-format msgctxt "Description of image orientation" msgid "Transposed" -msgstr "Traductiones" +msgstr "Transponite" #: src/formatstrings.cpp:96 #, kde-format @@ -66,7 +64,7 @@ #, kde-format msgctxt "Description of image orientation" msgid "Transversed" -msgstr "" +msgstr "De modo oblique" #: src/formatstrings.cpp:98 #, kde-format @@ -75,12 +73,10 @@ msgstr "" #: src/formatstrings.cpp:109 -#, fuzzy, kde-format -#| msgctxt "@label EXIF" -#| msgid "Photo Flash" +#, kde-format msgctxt "Description of photo flash" msgid "No flash" -msgstr "Flash de photographia" +msgstr "Necun Fulgor (Flash)" #: src/formatstrings.cpp:110 #, kde-format @@ -241,7 +237,7 @@ #: src/formatstrings.cpp:140 #, kde-format msgid "Unknown" -msgstr "" +msgstr "Incognite" #: src/formatstrings.cpp:147 #, kde-format @@ -253,7 +249,7 @@ #, kde-format msgctxt "Focal length given in mm" msgid "%1 mm" -msgstr "" +msgstr "%1 mm" #: src/formatstrings.cpp:163 #, kde-format @@ -265,32 +261,32 @@ #, kde-format msgctxt "Time period given in seconds as rational number, denominator is given" msgid "1/%1 s" -msgstr "" +msgstr "1/%1 s" #: src/formatstrings.cpp:176 #, kde-format msgctxt "Time period given in seconds" msgid "%1 s" -msgstr "" +msgstr "%1 s" #: src/formatstrings.cpp:192 #, kde-format msgctxt "Exposure bias/compensation in exposure value (EV)" msgid "%1 EV" -msgstr "" +msgstr "%1 EV" #: src/formatstrings.cpp:206 #, kde-format msgctxt "" "Exposure compensation given as integral with fraction, in exposure value (EV)" msgid "%1 %2/%3 EV" -msgstr "" +msgstr "%1 %2/%3 EV" #: src/formatstrings.cpp:209 #, kde-format msgctxt "Exposure compensation given as rational, in exposure value (EV)" msgid "%1/%2 EV" -msgstr "" +msgstr "%1/%2 EV" #: src/formatstrings.cpp:214 #, kde-format @@ -302,7 +298,7 @@ #, kde-format msgctxt "F number for photographs" msgid "f/%1" -msgstr "" +msgstr "f/%1" #: src/propertyinfo.cpp:64 #, kde-format @@ -416,15 +412,13 @@ #, kde-format msgctxt "@label EXIF" msgid "Manufacturer" -msgstr "" +msgstr "Constructor" #: src/propertyinfo.cpp:194 -#, fuzzy, kde-format -#| msgctxt "@label EXIF" -#| msgid "Image Model" +#, kde-format msgctxt "@label EXIF" msgid "Model" -msgstr "Modello de imagine" +msgstr "Modello" #: src/propertyinfo.cpp:201 #, kde-format @@ -463,148 +457,112 @@ msgstr "Computo de pagina" #: src/propertyinfo.cpp:240 -#, fuzzy, kde-format -#| msgctxt "@label EXIF" -#| msgid "Photo Aperture Value" +#, kde-format msgctxt "@label EXIF" msgid "Aperture Value" -msgstr "Valor de apertura de photographia" +msgstr "Valor de apertura" #: src/propertyinfo.cpp:247 -#, fuzzy, kde-format -#| msgctxt "@label EXIF" -#| msgid "Photo Original Date Time" +#, kde-format msgctxt "@label EXIF" msgid "Original Date Time" -msgstr "Tempore de data original de photographia" +msgstr "Tempore de data original" #: src/propertyinfo.cpp:254 -#, fuzzy, kde-format -#| msgctxt "@label EXIF" -#| msgid "Photo Exposure Bias" +#, kde-format msgctxt "@label EXIF" msgid "Exposure Bias" -msgstr "Bias de exposition de photographia" +msgstr "Bias de exposition" #: src/propertyinfo.cpp:261 -#, fuzzy, kde-format -#| msgctxt "@label EXIF" -#| msgid "Photo Exposure Time" +#, kde-format msgctxt "@label EXIF" msgid "Exposure Time" -msgstr "Tempore de exposition de photographia" +msgstr "Tempore de exposition" #: src/propertyinfo.cpp:268 -#, fuzzy, kde-format -#| msgctxt "@label EXIF" -#| msgid "Photo Flash" +#, kde-format msgctxt "@label EXIF" msgid "Flash" -msgstr "Flash de photographia" +msgstr "Fulgor (Flash)" #: src/propertyinfo.cpp:275 -#, fuzzy, kde-format -#| msgctxt "@label music disc number" -#| msgid "Disc Number" +#, kde-format msgctxt "@label EXIF" msgid "F Number" -msgstr "Numero de disco" +msgstr "Numero F" #: src/propertyinfo.cpp:282 -#, fuzzy, kde-format -#| msgctxt "@label EXIF" -#| msgid "Photo Focal Length" +#, kde-format msgctxt "@label EXIF" msgid "Focal Length" -msgstr "Longitude focal de photographia" +msgstr "Longitude Focal" #: src/propertyinfo.cpp:289 -#, fuzzy, kde-format -#| msgctxt "@label EXIF" -#| msgid "Photo Focal Length 35mm" +#, kde-format msgctxt "@label EXIF" msgid "Focal Length 35mm" -msgstr "Longitude Focal 35 mm de photographia" +msgstr "Longitude Focal 35 mm" #: src/propertyinfo.cpp:296 -#, fuzzy, kde-format -#| msgctxt "@label EXIF" -#| msgid "Photo GPS Latitude" +#, kde-format msgctxt "@label EXIF" msgid "GPS Latitude" -msgstr "Latitude de Photo GPS" +msgstr "Latitude GPS" #: src/propertyinfo.cpp:303 -#, fuzzy, kde-format -#| msgctxt "@label EXIF" -#| msgid "Photo GPS Longitude" +#, kde-format msgctxt "@label EXIF" msgid "GPS Longitude" -msgstr "Longitude de Photo GPS" +msgstr "Longitude GPS" #: src/propertyinfo.cpp:310 -#, fuzzy, kde-format -#| msgctxt "@label EXIF" -#| msgid "Photo GPS Altitude" +#, kde-format msgctxt "@label EXIF" msgid "GPS Altitude" -msgstr "Altitude de Photo GPS" +msgstr "Altitude de GPS" #: src/propertyinfo.cpp:317 -#, fuzzy, kde-format -#| msgctxt "@label EXIF" -#| msgid "Photo ISO Speed Rating" +#, kde-format msgctxt "@label EXIF" msgid "ISO Speed Rating" -msgstr "Classification de velocitate ISO de photographia" +msgstr "Classification de velocitate ISO" #: src/propertyinfo.cpp:323 -#, fuzzy, kde-format -#| msgctxt "@label EXIF" -#| msgid "Photo Metering Mode" +#, kde-format msgctxt "@label EXIF" msgid "Metering Mode" -msgstr "Modo de metrar de photographia" +msgstr "Modo de Metrar" #: src/propertyinfo.cpp:329 -#, fuzzy, kde-format -#| msgctxt "@label EXIF" -#| msgid "Photo X Dimension" +#, kde-format msgctxt "@label EXIF" msgid "X Dimension" -msgstr "Dimension X de photographia" +msgstr "Dimension X" #: src/propertyinfo.cpp:335 -#, fuzzy, kde-format -#| msgctxt "@label EXIF" -#| msgid "Photo Y Dimension" +#, kde-format msgctxt "@label EXIF" msgid "Y Dimension" -msgstr "Dimension Y de photographia" +msgstr "Dimension Y" #: src/propertyinfo.cpp:341 -#, fuzzy, kde-format -#| msgctxt "@label" -#| msgid "Duration" +#, kde-format msgctxt "@label EXIF" msgid "Saturation" -msgstr "Duration" +msgstr "Saturation" #: src/propertyinfo.cpp:347 -#, fuzzy, kde-format -#| msgctxt "@label EXIF" -#| msgid "Photo Sharpness" +#, kde-format msgctxt "@label EXIF" msgid "Sharpness" -msgstr "Acuitate de photographia" +msgstr "Acutessa" #: src/propertyinfo.cpp:353 -#, fuzzy, kde-format -#| msgctxt "@label EXIF" -#| msgid "Photo White Balance" +#, kde-format msgctxt "@label EXIF" msgid "White Balance" -msgstr "Balancia del blanc de photographia" +msgstr "Balanciamento del blanc" #: src/propertyinfo.cpp:359 #, kde-format @@ -616,7 +574,7 @@ #, kde-format msgctxt "@label" msgid "Label" -msgstr "" +msgstr "Etiquetta" #: src/propertyinfo.cpp:371 #, kde-format @@ -655,18 +613,16 @@ msgstr "Numero de disco" #: src/propertyinfo.cpp:409 -#, fuzzy, kde-format -#| msgctxt "@label" -#| msgid "Duration" +#, kde-format msgctxt "@label" msgid "Location" -msgstr "Duration" +msgstr "Location" #: src/propertyinfo.cpp:415 #, kde-format msgctxt "@label" msgid "Performer" -msgstr "" +msgstr "Executor" #: src/propertyinfo.cpp:421 #, kde-format @@ -696,15 +652,13 @@ #, kde-format msgctxt "@label" msgid "License" -msgstr "" +msgstr "Licentia:" #: src/propertyinfo.cpp:451 -#, fuzzy, kde-format -#| msgctxt "@label" -#| msgid "Lyricist" +#, kde-format msgctxt "@label" msgid "Lyrics" -msgstr "Scriptor de parolas (Lyricist)" +msgstr "Parolas del Canto" #: src/propertyinfo.cpp:457 #, kde-format @@ -716,7 +670,7 @@ #, kde-format msgctxt "@label" msgid "Rating" -msgstr "" +msgstr "Evalutation" #: src/propertyinfo.cpp:469 #, kde-format @@ -791,9 +745,7 @@ msgstr "Creation de patrono" #: src/propertyinfo.cpp:555 -#, fuzzy, kde-format -#| msgctxt "@label the URL a file was originally downloded from" -#| msgid "Downloaded From" +#, kde-format msgctxt "@label the URL a file was originally downloaded from" msgid "Downloaded From" msgstr "Discargate ex" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.65.0/po/zh_TW/kfilemetadata5.po new/kfilemetadata-5.66.0/po/zh_TW/kfilemetadata5.po --- old/kfilemetadata-5.65.0/po/zh_TW/kfilemetadata5.po 2019-12-12 23:37:05.000000000 +0100 +++ new/kfilemetadata-5.66.0/po/zh_TW/kfilemetadata5.po 2020-01-04 11:07:42.000000000 +0100 @@ -11,7 +11,7 @@ "POT-Creation-Date: 2019-07-19 02:55+0200\n" "PO-Revision-Date: 2019-06-25 13:49+0800\n" "Last-Translator: pan93412 <pan93...@gmail.com>\n" -"Language-Team: Chinese <chinese-l...@googlegroups.com>\n" +"Language-Team: Chinese <zh-l...@lists.linux.org.tw>\n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.65.0/src/extractorcollection.cpp new/kfilemetadata-5.66.0/src/extractorcollection.cpp --- old/kfilemetadata-5.65.0/src/extractorcollection.cpp 2019-12-12 23:37:05.000000000 +0100 +++ new/kfilemetadata-5.66.0/src/extractorcollection.cpp 2020-01-04 11:07:42.000000000 +0100 @@ -37,7 +37,7 @@ class Q_DECL_HIDDEN ExtractorCollection::Private { public: - QHash<QString, Extractor*> m_mimeExtractors; + QMultiHash<QString, Extractor*> m_mimeExtractors; std::vector<Extractor> m_allExtractors; @@ -149,12 +149,12 @@ auto mimetypeProperties = pluginProperties[QLatin1String("MimeTypes")]; const auto mimetypes = mimetypeProperties.toMap().keys(); for (const QString &mimetype : mimetypes) { - m_mimeExtractors.insertMulti(mimetype, &extractor); + m_mimeExtractors.insert(mimetype, &extractor); } } else if (extractor.d->m_plugin) { const auto mimetypes = extractor.mimetypes(); for (const QString &mimetype : mimetypes) { - m_mimeExtractors.insertMulti(mimetype, &extractor); + m_mimeExtractors.insert(mimetype, &extractor); } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.65.0/src/extractors/officeextractor.cpp new/kfilemetadata-5.66.0/src/extractors/officeextractor.cpp --- old/kfilemetadata-5.65.0/src/extractors/officeextractor.cpp 2019-12-12 23:37:05.000000000 +0100 +++ new/kfilemetadata-5.66.0/src/extractors/officeextractor.cpp 2020-01-04 11:07:42.000000000 +0100 @@ -19,6 +19,7 @@ #include "officeextractor.h" +#include <QRegularExpression> #include <QStandardPaths> #include <QProcess> @@ -69,7 +70,7 @@ // Now that we have the plain text content, count words, lines and characters // (original code from plaintextextractor.cpp, authored by Vishesh Handa) int lines = contents.count(QLatin1Char('\n')); - int words = contents.count(QRegExp(QStringLiteral("\\b\\w+\\b"))); + int words = contents.count(QRegularExpression(QStringLiteral("\\b\\w+\\b"))); result->add(Property::WordCount, words); result->add(Property::LineCount, lines); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.65.0/src/extractors/taglibextractor.cpp new/kfilemetadata-5.66.0/src/extractors/taglibextractor.cpp --- old/kfilemetadata-5.65.0/src/extractors/taglibextractor.cpp 2019-12-12 23:37:05.000000000 +0100 +++ new/kfilemetadata-5.66.0/src/extractors/taglibextractor.cpp 2020-01-04 11:07:42.000000000 +0100 @@ -47,10 +47,7 @@ using namespace KFileMetaData; -TagLibExtractor::TagLibExtractor(QObject* parent) - : ExtractorPlugin(parent) -{ -} +namespace { const QStringList supportedMimeTypes = { QStringLiteral("audio/flac"), @@ -74,11 +71,6 @@ QStringLiteral("audio/x-wavpack"), }; -QStringList TagLibExtractor::mimetypes() const -{ - return supportedMimeTypes; -} - void extractAudioProperties(TagLib::File* file, ExtractionResult* result) { TagLib::AudioProperties* audioProp = file->audioProperties(); @@ -102,7 +94,7 @@ } } -void TagLibExtractor::readGenericProperties(const TagLib::PropertyMap &savedProperties, ExtractionResult* result) +void readGenericProperties(const TagLib::PropertyMap &savedProperties, ExtractionResult* result) { if (savedProperties.isEmpty()) { return; @@ -260,7 +252,7 @@ } } -void TagLibExtractor::extractId3Tags(TagLib::ID3v2::Tag* Id3Tags, ExtractionResult* result) +void extractId3Tags(TagLib::ID3v2::Tag* Id3Tags, ExtractionResult* result) { if (Id3Tags->isEmpty()) { return; @@ -309,7 +301,7 @@ } } -void TagLibExtractor::extractMp4Tags(TagLib::MP4::Tag* mp4Tags, ExtractionResult* result) +void extractMp4Tags(TagLib::MP4::Tag* mp4Tags, ExtractionResult* result) { if (mp4Tags->isEmpty()) { return; @@ -327,7 +319,7 @@ } } -void TagLibExtractor::extractAsfTags(TagLib::ASF::Tag* asfTags, ExtractionResult* result) +void extractAsfTags(TagLib::ASF::Tag* asfTags, ExtractionResult* result) { if (asfTags->isEmpty()) { return; @@ -374,13 +366,29 @@ } } +} // anonymous namespace + +TagLibExtractor::TagLibExtractor(QObject* parent) + : ExtractorPlugin(parent) +{ +} + +QStringList TagLibExtractor::mimetypes() const +{ + return supportedMimeTypes; +} + void TagLibExtractor::extract(ExtractionResult* result) { const QString fileUrl = result->inputUrl(); const QString mimeType = getSupportedMimeType(result->inputMimetype()); // Open the file readonly. Important if we're sandboxed. +#if defined Q_OS_WINDOWS + TagLib::FileStream stream(fileUrl.toLocal8Bit().constData(), true); +#else TagLib::FileStream stream(fileUrl.toUtf8().constData(), true); +#endif if (!stream.isOpen()) { qCWarning(KFILEMETADATA_LOG) << "Unable to open file readonly: " << fileUrl; return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.65.0/src/extractors/taglibextractor.h new/kfilemetadata-5.66.0/src/extractors/taglibextractor.h --- old/kfilemetadata-5.65.0/src/extractors/taglibextractor.h 2019-12-12 23:37:05.000000000 +0100 +++ new/kfilemetadata-5.66.0/src/extractors/taglibextractor.h 2020-01-04 11:07:42.000000000 +0100 @@ -23,20 +23,6 @@ #include "extractorplugin.h" -namespace TagLib -{ - namespace ASF { - class Tag; - } - namespace ID3v2 { - class Tag; - } - namespace MP4 { - class Tag; - } - class PropertyMap; -} - namespace KFileMetaData { @@ -52,13 +38,7 @@ void extract(ExtractionResult* result) override; QStringList mimetypes() const override; - -private: - void extractId3Tags(TagLib::ID3v2::Tag* Id3Tags, ExtractionResult* result); - void extractMp4Tags(TagLib::MP4::Tag* mp4Tags, ExtractionResult* result); - void extractAsfTags(TagLib::ASF::Tag* asfTags, ExtractionResult* result); - void readGenericProperties(const TagLib::PropertyMap &savedProperties, ExtractionResult* result); }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.65.0/src/writercollection.cpp new/kfilemetadata-5.66.0/src/writercollection.cpp --- old/kfilemetadata-5.65.0/src/writercollection.cpp 2019-12-12 23:37:05.000000000 +0100 +++ new/kfilemetadata-5.66.0/src/writercollection.cpp 2020-01-04 11:07:42.000000000 +0100 @@ -40,7 +40,7 @@ class Q_DECL_HIDDEN WriterCollection::WriterCollectionPrivate { public: - QHash<QString, Writer*> m_writers; + QMultiHash<QString, Writer*> m_writers; std::vector<Writer> m_allWriters; @@ -139,7 +139,7 @@ for (Writer& writer : m_allWriters) { const QStringList lst = writer.mimetypes(); for (const QString& type : lst) { - m_writers.insertMulti(type, &writer); + m_writers.insert(type, &writer); } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.65.0/src/writers/taglibwriter.cpp new/kfilemetadata-5.66.0/src/writers/taglibwriter.cpp --- old/kfilemetadata-5.65.0/src/writers/taglibwriter.cpp 2019-12-12 23:37:05.000000000 +0100 +++ new/kfilemetadata-5.66.0/src/writers/taglibwriter.cpp 2020-01-04 11:07:42.000000000 +0100 @@ -221,7 +221,11 @@ const PropertyMap properties = data.getAllProperties(); const QString mimeType = data.inputMimetype(); +#if defined Q_OS_WINDOWS + TagLib::FileStream stream(fileUrl.toLocal8Bit().constData(), true); +#else TagLib::FileStream stream(fileUrl.toUtf8().constData(), false); +#endif if (!stream.isOpen()) { qCWarning(KFILEMETADATA_LOG) << "Unable to open file in write mode: " << fileUrl; return;
